diff --git a/CHANGELOG.md b/CHANGELOG.md index 2b413c21b..81b28668b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ #1.3 + Added a Machine Produce JEI Handler that shows what produces some of the machines + Fixed [#40](https://github.com/Buuz135/Industrial-Foregoing/issues/40) ++ Fixed [#19](https://github.com/Buuz135/Industrial-Foregoing/issues/19) #1.2.1 + Fixed issue [#37](https://github.com/Buuz135/Industrial-Foregoing/issues/37) diff --git a/gradle.properties b/gradle.properties index 5c91c0c51..d4bf72dd4 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,7 +3,7 @@ org.gradle.jvmargs=-Xmx3G mod_version=1.3 minecraft_version=1.12 -tesla_core_version=1.0.8 +tesla_core_version=1.0.9-snapshot tesla_version=1.0.60 jei_version=4.7.1.69 redstoneflux_version=2.0.1.2 \ No newline at end of file diff --git a/src/main/java/com/buuz135/industrial/tile/misc/BlackHoleUnitTile.java b/src/main/java/com/buuz135/industrial/tile/misc/BlackHoleUnitTile.java index e53ed97f9..33c221121 100644 --- a/src/main/java/com/buuz135/industrial/tile/misc/BlackHoleUnitTile.java +++ b/src/main/java/com/buuz135/industrial/tile/misc/BlackHoleUnitTile.java @@ -153,8 +153,9 @@ public void readFromNBT(NBTTagCompound compound) { else { Item item = Item.getByNameOrId(compound.getString(NBT_ITEMSTACK)); if (item != null) { - stack = new ItemStack(item, 1, compound.hasKey(NBT_META) ? compound.getInteger(NBT_META) : 0); - if (compound.hasKey(NBT_ITEM_NBT)) stack.setTagCompound(compound.getCompoundTag(NBT_ITEM_NBT)); + stack = new ItemStack(item, 1, compound.getInteger(NBT_META)); + NBTTagCompound nbttag = compound.getCompoundTag(NBT_ITEM_NBT); + if (!nbttag.hasNoTags()) stack.setTagCompound(nbttag); } } if (!compound.hasKey(NBT_AMOUNT)) amount = 0; diff --git a/src/main/java/com/buuz135/industrial/tile/misc/ResourcefulFurnaceTile.java b/src/main/java/com/buuz135/industrial/tile/misc/ResourcefulFurnaceTile.java index 759494b28..eab177621 100644 --- a/src/main/java/com/buuz135/industrial/tile/misc/ResourcefulFurnaceTile.java +++ b/src/main/java/com/buuz135/industrial/tile/misc/ResourcefulFurnaceTile.java @@ -34,8 +34,8 @@ public ResourcefulFurnaceTile() { @Override protected void initializeInventories() { super.initializeInventories(); - input = addSimpleInventory(3, "input", EnumDyeColor.BLUE, "Input", new BoundingRectangle(54, 25, 18, 18 * 3), (i, slot) -> !FurnaceRecipes.instance().getSmeltingResult(i).isEmpty(), (o, slot) -> false, false); - output = addSimpleInventory(3, "Output", EnumDyeColor.ORANGE, "Output", new BoundingRectangle(54 + 32 + 16, 25, 18, 18 * 3), (i, slot) -> !FurnaceRecipes.instance().getSmeltingResult(i).isEmpty(), (o, slot) -> false, false); + input = addSimpleInventory(3, "input", EnumDyeColor.BLUE, "Input", new BoundingRectangle(54, 25, 18, 18 * 3), (i, slot) -> !FurnaceRecipes.instance().getSmeltingResult(i).isEmpty(), (o, slot) -> false, false, null); + output = addSimpleInventory(3, "Output", EnumDyeColor.ORANGE, "Output", new BoundingRectangle(54 + 32 + 16, 25, 18, 18 * 3), (i, slot) -> !FurnaceRecipes.instance().getSmeltingResult(i).isEmpty(), (o, slot) -> false, false, null); tank = addSimpleFluidTank(8000, "Tank", EnumDyeColor.LIME, 128, 25, FluidTankType.OUTPUT, (o) -> null, (o) -> false); } diff --git a/src/main/java/com/buuz135/industrial/utils/IFFakePlayer.java b/src/main/java/com/buuz135/industrial/utils/IFFakePlayer.java index 8e91e5329..59071e084 100644 --- a/src/main/java/com/buuz135/industrial/utils/IFFakePlayer.java +++ b/src/main/java/com/buuz135/industrial/utils/IFFakePlayer.java @@ -10,9 +10,10 @@ public class IFFakePlayer extends FakePlayer { private static final UUID uuid = UUID.fromString("ec5b5875-ebb5-4b47-833b-0de37ac9e6d7"); - private static GameProfile PROFILE = new GameProfile(uuid, "[IFFarmer]"); + private static GameProfile PROFILE = new GameProfile(uuid, "[IF]"); public IFFakePlayer(WorldServer worldIn) { super(worldIn, PROFILE); } + }