diff --git a/build.gradle b/build.gradle index 8cd9a478d..07cca4635 100644 --- a/build.gradle +++ b/build.gradle @@ -71,6 +71,10 @@ repositories { name = 'ModMaven' url = 'https://modmaven.dev' } + maven { + name = "gt" + url = "https://gregtech.mechaenetia.com/" + } //maven { // name = "CurseForge" // url = "https://minecraft.curseforge.com/api/maven/" @@ -87,7 +91,8 @@ dependencies { implementation 'codechicken:NotEnoughItems:1.7.10-1.0.3.74:dev' compileOnly 'codechicken:NotEnoughItems:1.7.10-1.0.3.74:src' - //compileOnly 'inventory-tweaks:InventoryTweaks:1.62+beta.84:api' + compileOnly "inventorytweaks:InventoryTweaks:1.59-dev:deobf" + implementation "li.cil.oc:OpenComputers:MC1.7.10-1.5.+:api" } diff --git a/changelog b/changelog index 84822b6d3..787501c1a 100644 --- a/changelog +++ b/changelog @@ -6,6 +6,7 @@ * Power converter recipes have been updated * Soldering stations will no longer work if the recipe requires no input fluid while fluid is present * While this does complicate using the soldering station manually, as switching from milgrade to standard ICs requires emptying the solderer with a siphon, it does make automating easier, since soldering stations will no longer treat incomplete milgrade circuits as ICs +* Cement is now edible ## Fixed * Fixed some machines not sending fluid gauge syncs properly \ No newline at end of file diff --git a/src/main/java/com/hbm/inventory/RecipesCommon.java b/src/main/java/com/hbm/inventory/RecipesCommon.java index b9f428c98..85a43f6bf 100644 --- a/src/main/java/com/hbm/inventory/RecipesCommon.java +++ b/src/main/java/com/hbm/inventory/RecipesCommon.java @@ -117,6 +117,7 @@ public class RecipesCommon { return; } this.item = stack.getItem(); + if(this.item == null) this.item = ModItems.nothing; //i'm going to bash some fuckard's head in this.stacksize = stack.stackSize; this.meta = stack.getItemDamage(); } @@ -128,6 +129,7 @@ public class RecipesCommon { public ComparableStack(Item item) { this.item = item; + if(this.item == null) this.item = ModItems.nothing; this.stacksize = 1; this.meta = 0; } diff --git a/src/main/java/com/hbm/inventory/container/ContainerCrateDesh.java b/src/main/java/com/hbm/inventory/container/ContainerCrateDesh.java index b38021386..7a557eeba 100644 --- a/src/main/java/com/hbm/inventory/container/ContainerCrateDesh.java +++ b/src/main/java/com/hbm/inventory/container/ContainerCrateDesh.java @@ -4,6 +4,7 @@ import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; +@invtweaks.api.container.ChestContainer(rowSize = 13, isLargeChest = false) public class ContainerCrateDesh extends ContainerCrateBase { public ContainerCrateDesh(InventoryPlayer invPlayer, IInventory tedf) { @@ -15,7 +16,7 @@ public class ContainerCrateDesh extends ContainerCrateBase { } } - this.playerInv(invPlayer,44, 174, 232); + this.playerInv(invPlayer, 44, 174, 232); } } diff --git a/src/main/java/com/hbm/inventory/container/ContainerCrateIron.java b/src/main/java/com/hbm/inventory/container/ContainerCrateIron.java index 533e1b866..6c2a62671 100644 --- a/src/main/java/com/hbm/inventory/container/ContainerCrateIron.java +++ b/src/main/java/com/hbm/inventory/container/ContainerCrateIron.java @@ -5,7 +5,7 @@ import com.hbm.tileentity.machine.storage.TileEntityCrateIron; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Slot; -//@invtweaks.api.container.ChestContainer +@invtweaks.api.container.ChestContainer(rowSize = 9, isLargeChest = false) public class ContainerCrateIron extends ContainerCrateBase { public ContainerCrateIron(InventoryPlayer invPlayer, TileEntityCrateIron tedf) { diff --git a/src/main/java/com/hbm/inventory/container/ContainerCrateSteel.java b/src/main/java/com/hbm/inventory/container/ContainerCrateSteel.java index 1a2c74c2e..4e5969fb0 100644 --- a/src/main/java/com/hbm/inventory/container/ContainerCrateSteel.java +++ b/src/main/java/com/hbm/inventory/container/ContainerCrateSteel.java @@ -4,7 +4,7 @@ import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; -//@invtweaks.api.container.ChestContainer +@invtweaks.api.container.ChestContainer(rowSize = 9, isLargeChest = false) public class ContainerCrateSteel extends ContainerCrateBase { public ContainerCrateSteel(InventoryPlayer invPlayer, IInventory tedf) { @@ -16,6 +16,6 @@ public class ContainerCrateSteel extends ContainerCrateBase { } } - this.playerInv(invPlayer,8, 84 + (18 * 3) + 2, 142 + (18 * 3) + 2); + this.playerInv(invPlayer, 8, 84 + (18 * 3) + 2, 142 + (18 * 3) + 2); } } diff --git a/src/main/java/com/hbm/inventory/container/ContainerCrateTemplate.java b/src/main/java/com/hbm/inventory/container/ContainerCrateTemplate.java index 26c000a8e..553451df8 100644 --- a/src/main/java/com/hbm/inventory/container/ContainerCrateTemplate.java +++ b/src/main/java/com/hbm/inventory/container/ContainerCrateTemplate.java @@ -5,6 +5,7 @@ import com.hbm.tileentity.machine.storage.TileEntityCrateTemplate; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Slot; +@invtweaks.api.container.ChestContainer(rowSize = 9, isLargeChest = false) public class ContainerCrateTemplate extends ContainerCrateBase { public ContainerCrateTemplate(InventoryPlayer invPlayer, TileEntityCrateTemplate tedf) { @@ -16,6 +17,6 @@ public class ContainerCrateTemplate extends ContainerCrateBase { } } - this.playerInv(invPlayer,8, 86, 144); + this.playerInv(invPlayer, 8, 86, 144); } } \ No newline at end of file diff --git a/src/main/java/com/hbm/inventory/container/ContainerCrateTungsten.java b/src/main/java/com/hbm/inventory/container/ContainerCrateTungsten.java index 6cfde0672..55b2d3cfa 100644 --- a/src/main/java/com/hbm/inventory/container/ContainerCrateTungsten.java +++ b/src/main/java/com/hbm/inventory/container/ContainerCrateTungsten.java @@ -5,7 +5,7 @@ import com.hbm.tileentity.machine.storage.TileEntityCrateTungsten; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Slot; -//@invtweaks.api.container.ChestContainer +@invtweaks.api.container.ChestContainer(rowSize = 9, isLargeChest = false) public class ContainerCrateTungsten extends ContainerCrateBase { public ContainerCrateTungsten(InventoryPlayer invPlayer, TileEntityCrateTungsten te) { @@ -17,6 +17,6 @@ public class ContainerCrateTungsten extends ContainerCrateBase { } } - this.playerInv(invPlayer,8, 32 + 18 * 3, 90 + (18 * 3)); + this.playerInv(invPlayer, 8, 32 + 18 * 3, 90 + (18 * 3)); } } diff --git a/src/main/java/com/hbm/items/ModItems.java b/src/main/java/com/hbm/items/ModItems.java index b484b92c4..2dfa3aede 100644 --- a/src/main/java/com/hbm/items/ModItems.java +++ b/src/main/java/com/hbm/items/ModItems.java @@ -2698,7 +2698,7 @@ public class ModItems { cinnebar = new Item().setUnlocalizedName("cinnebar").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":cinnebar"); powder_ash = new ItemEnumMulti(EnumAshType.class, true, true).setUnlocalizedName("powder_ash").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":powder_ash"); powder_limestone = new Item().setUnlocalizedName("powder_limestone").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":powder_limestone"); - powder_cement = new Item().setUnlocalizedName("powder_cement").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":powder_cement"); + powder_cement = new ItemLemon(2, 0.5F, false).setUnlocalizedName("powder_cement").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":powder_cement"); ingot_gh336 = new ItemCustomLore().setRarity(EnumRarity.epic).setUnlocalizedName("ingot_gh336").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_gh336"); nugget_gh336 = new ItemCustomLore().setRarity(EnumRarity.epic).setUnlocalizedName("nugget_gh336").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_gh336"); diff --git a/src/main/resources/assets/hbm/textures/models/machines/uv_lamp.png b/src/main/resources/assets/hbm/textures/models/machines/uv_lamp.png deleted file mode 100644 index 73af545d4..000000000 Binary files a/src/main/resources/assets/hbm/textures/models/machines/uv_lamp.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/models/machines/zpe.png b/src/main/resources/assets/hbm/textures/models/machines/zpe.png deleted file mode 100644 index f11bb8995..000000000 Binary files a/src/main/resources/assets/hbm/textures/models/machines/zpe.png and /dev/null differ