Merge pull request #430 from GrowthcraftCE/development

2.7.2 Release

README.md

@@ -1,22 +1,22 @@
-Growthcraft 
+Growthcraft
 ===========
 
 [![Minecraft Version](http://img.shields.io/minecraft/1.7.10.png?color=green)](https://minecraft.net/)
-[![Growthcraft Version](http://img.shields.io/growthcraft/2.7.0.png?color=green)](https://github.com/GrowthcraftCE/Growthcraft-1.7)
+[![Growthcraft Version](http://img.shields.io/growthcraft/2.7.2.png?color=green)](https://github.com/GrowthcraftCE/Growthcraft-1.7)
 [![Forge Version](http://img.shields.io/forge/10.13.4.1566.png?color=green)](http://files.minecraftforge.net/)
 [![Java Version](http://img.shields.io/java/7.png?color=green)](https://www.java.com/en/)
-[![Build Status](https://travis-ci.org/GrowthcraftCE/Growthcraft-1.7.svg?branch=master)](https://travis-ci.org/GrowthcraftCE/Growthcraft-1.7) 
+[![Build Status](https://travis-ci.org/GrowthcraftCE/Growthcraft-1.7.svg?branch=master)](https://travis-ci.org/GrowthcraftCE/Growthcraft-1.7)
 
-This is a community fork of the original GrowthCraft developed by Gwafu. 
+This is a community fork of the original GrowthCraft developed by Gwafu.
 The original forum post can be found on the [Minecraft Forums mod page](http://www.minecraftforum.net/forums/mapping-and-modding/minecraft-mods/1286298-growthcraft-jul-15-2014-proper-1-7-10-release). We have created a [forum post](http://www.minecraftforum.net/forums/mapping-and-modding/minecraft-mods/wip-mods/2505072-growthcraft-community-edition-proper-1-7-10) for [Growthcraft CE](http://www.minecraftforum.net/forums/mapping-and-modding/minecraft-mods/wip-mods/2505072-growthcraft-community-edition-proper-1-7-10) for general discussions, announcements and feedback. Likewise this repository is on [Gitter](https://gitter.im/alatyami/Growthcraft-1.7) and we have an IRC channel on EsperNet (#growthcraft).
 
 ## Wiki
 
-We are using the [Gamepedia FTB Wiki](http://ftb.gamepedia.com/GrowthCraft) for publishing how the plugins work and tutorials. 
+We are using the [Gamepedia FTB Wiki](http://ftb.gamepedia.com/GrowthCraft) for publishing how the plugins work and tutorials.
 For technical details please read our [Github Wiki](https://github.com/GrowthcraftCE/Growthcraft-1.7/wiki).
 If you need to check the latest [User API](https://github.com/GrowthcraftCE/Growthcraft-1.7/wiki/User-API-(2.5.x))
 
-## Contributing 
+## Contributing
 
 For any contributions to this project, please refer to our [Contributing to Growthcraft](https://github.com/GrowthcraftCE/Growthcraft-1.7/wiki/Contributing-to-Growthcraft) wiki page and create a branch from our development branch. All pull requests need to be towards our development. Pull requests directly to the master branch will be closed without review.
 

gradle.properties

@@ -3,7 +3,7 @@ minecraft_version=1.7.10
 # Forge
 minecraft_forge_version=1.7.10-10.13.4.1566-1.7.10
 # GrowthCraft
-growthcraft_version=2.7.0
+growthcraft_version=2.7.2
 # Depdendencies
 applecore_version=1.3.0
 bc_version=7.1.17

src/java/growthcraft/core/common/tileentity/GrcTileInventoryBase.java

@@ -183,11 +183,13 @@ public boolean canInsertItem(int slot, ItemStack stack, int side)
 		return InventoryProcessor.instance().canInsertItem(this, stack, slot);
 	}
 
+	@Override
 	public boolean canExtractItem(int slot, ItemStack stack, int side)
 	{
 		return InventoryProcessor.instance().canExtractItem(this, stack, slot);
 	}
 
+	@Override
 	public int[] getAccessibleSlotsFromSide(int side)
 	{
 		return NO_SLOTS;

src/java/growthcraft/fishtrap/common/tileentity/TileEntityFishTrap.java

@@ -43,16 +43,17 @@
 
 public class TileEntityFishTrap extends GrcTileInventoryBase implements IInteractionObject
 {
-	private static final int[] trapSlots = new int[] {0,1,2,3,4,5};
-	private static final int[] baitSlots = new int[] {6};
+	private static final int[] TRAP_SLOTS = new int[] {0,1,2,3,4,5};
+	private static final int[] BAIT_SLOTS = new int[] {6};
+	private static final int[] ACCESSIBLE_SLOTS = new int[] {0,1,2,3,4,5,6};
 	public InventorySlice trapInventory;
 	public InventorySlice baitInventory;
 
 	public TileEntityFishTrap()
 	{
 		super();
-		this.trapInventory = new InventorySlice(this, trapSlots);
-		this.baitInventory = new InventorySlice(this, baitSlots);
+		this.trapInventory = new InventorySlice(this, TRAP_SLOTS);
+		this.baitInventory = new InventorySlice(this, BAIT_SLOTS);
 	}
 
 	@Override
@@ -73,6 +74,34 @@ public GrcInternalInventory createInventory()
 		return new GrcInternalInventory(this, 7);
 	}
 
+	@Override
+	public boolean canInsertItem(int slot, ItemStack stack, int facing)
+	{
+		// only insert into the bait slot
+		if (slot == 6) {
+			return super.canInsertItem(slot, stack, facing);
+		} else {
+			return false;
+		}
+	}
+
+	@Override
+	public boolean canExtractItem(int slot, ItemStack stack, int facing)
+	{
+		// only extract from the loot/trap slots
+		if (slot < 6) {
+			return super.canExtractItem(slot, stack, facing);
+		} else {
+			return false;
+		}
+	}
+
+	@Override
+	public int[] getAccessibleSlotsFromSide(int facing)
+	{
+		return ACCESSIBLE_SLOTS;
+	}
+
 	/**
 	 * Called after a successful catch, this will remove an item from the stack
 	 * of provided bait
@@ -106,17 +135,17 @@ public float applyBaitModifier(float f)
 
 	public int getBaitInventoryOffset()
 	{
-		return baitSlots[0];
+		return BAIT_SLOTS[0];
 	}
 
 	public int getTrapInventorySize()
 	{
-		return trapSlots.length;
+		return TRAP_SLOTS.length;
 	}
 
 	public int getBaitInventorySize()
 	{
-		return baitSlots.length;
+		return BAIT_SLOTS.length;
 	}
 
 	/**