From 2b914628b52657109709d1db4d5ba4bce24530f2 Mon Sep 17 00:00:00 2001 From: Boblet Date: Thu, 12 May 2022 17:00:04 +0200 Subject: [PATCH] watz connector + template fix --- src/main/java/com/hbm/blocks/ModBlocks.java | 2 +- .../hbm/blocks/generic/BlockCableConnect.java | 24 +++++++++++++++++++ .../gui/GUIScreenTemplateFolder.java | 8 +++++-- .../items/machine/ItemAssemblyTemplate.java | 4 +++- 4 files changed, 34 insertions(+), 4 deletions(-) create mode 100644 src/main/java/com/hbm/blocks/generic/BlockCableConnect.java diff --git a/src/main/java/com/hbm/blocks/ModBlocks.java b/src/main/java/com/hbm/blocks/ModBlocks.java index 089519869..ab66cda75 100644 --- a/src/main/java/com/hbm/blocks/ModBlocks.java +++ b/src/main/java/com/hbm/blocks/ModBlocks.java @@ -1972,7 +1972,7 @@ public class ModBlocks { watz_cooler = new BlockGeneric(Material.iron).setBlockName("watz_cooler").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":watz_cooler"); watz_end = new BlockGeneric(Material.iron).setBlockName("watz_end").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":watz_casing"); watz_hatch = new WatzHatch(Material.iron).setBlockName("watz_hatch").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":watz_hatch"); - watz_conductor = new BlockPillar(Material.iron, RefStrings.MODID + ":watz_conductor_top").setBlockName("watz_conductor").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":watz_conductor_side"); + watz_conductor = new BlockCableConnect(Material.iron).setBlockName("watz_conductor").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":watz_conductor_top"); watz_core = new WatzCore(Material.iron).setBlockName("watz_core").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":watz_computer"); watz = new Watz().setBlockName("watz").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":block_steel"); diff --git a/src/main/java/com/hbm/blocks/generic/BlockCableConnect.java b/src/main/java/com/hbm/blocks/generic/BlockCableConnect.java new file mode 100644 index 000000000..c4215befa --- /dev/null +++ b/src/main/java/com/hbm/blocks/generic/BlockCableConnect.java @@ -0,0 +1,24 @@ +package com.hbm.blocks.generic; + +import com.hbm.blocks.BlockBase; + +import api.hbm.energy.IEnergyConnectorBlock; +import net.minecraft.block.material.Material; +import net.minecraft.world.IBlockAccess; +import net.minecraftforge.common.util.ForgeDirection; + +public class BlockCableConnect extends BlockBase implements IEnergyConnectorBlock { + + public BlockCableConnect() { + super(); + } + + public BlockCableConnect(Material material) { + super(material); + } + + @Override + public boolean canConnect(IBlockAccess world, int x, int y, int z, ForgeDirection dir) { + return true; + } +} diff --git a/src/main/java/com/hbm/inventory/gui/GUIScreenTemplateFolder.java b/src/main/java/com/hbm/inventory/gui/GUIScreenTemplateFolder.java index ffdd5a32a..12aba8314 100644 --- a/src/main/java/com/hbm/inventory/gui/GUIScreenTemplateFolder.java +++ b/src/main/java/com/hbm/inventory/gui/GUIScreenTemplateFolder.java @@ -7,12 +7,14 @@ import java.util.List; import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.GL11; +import com.hbm.inventory.RecipesCommon.ComparableStack; import com.hbm.inventory.fluid.FluidType; import com.hbm.inventory.fluid.Fluids; import com.hbm.inventory.recipes.AssemblerRecipes; import com.hbm.inventory.recipes.ChemplantRecipes; import com.hbm.inventory.recipes.ChemplantRecipes.ChemRecipe; import com.hbm.items.ModItems; +import com.hbm.items.machine.ItemAssemblyTemplate; import com.hbm.items.machine.ItemCassette; import com.hbm.items.machine.ItemChemistryTemplate; import com.hbm.items.machine.ItemStamp; @@ -76,8 +78,10 @@ public class GUIScreenTemplateFolder extends GuiScreen { } // Assembly Templates for(int i = 0; i < AssemblerRecipes.recipeList.size(); i++) { - if(AssemblerRecipes.hidden.get(AssemblerRecipes.recipeList.get(i)) == null) { - allStacks.add(new ItemStack(ModItems.assembly_template, 1, i)); + + ComparableStack comp = AssemblerRecipes.recipeList.get(i); + if(AssemblerRecipes.hidden.get(comp) == null) { + allStacks.add(ItemAssemblyTemplate.writeType(new ItemStack(ModItems.assembly_template), comp)); } } // Chemistry Templates diff --git a/src/main/java/com/hbm/items/machine/ItemAssemblyTemplate.java b/src/main/java/com/hbm/items/machine/ItemAssemblyTemplate.java index f47da5ac4..f97e53b07 100644 --- a/src/main/java/com/hbm/items/machine/ItemAssemblyTemplate.java +++ b/src/main/java/com/hbm/items/machine/ItemAssemblyTemplate.java @@ -64,13 +64,15 @@ public class ItemAssemblyTemplate extends Item { this.hiddenIcon = reg.registerIcon(this.iconString + "_secret"); } - public static void writeType(ItemStack stack, ComparableStack comp) { + public static ItemStack writeType(ItemStack stack, ComparableStack comp) { if(!stack.hasTagCompound()) stack.stackTagCompound = new NBTTagCompound(); stack.stackTagCompound.setInteger("id", Item.getIdFromItem(comp.item)); stack.stackTagCompound.setByte("count", (byte)comp.stacksize); stack.stackTagCompound.setShort("meta", (short)comp.meta); + + return stack; } public static ComparableStack readType(ItemStack stack) {