From fa60933ae71936b37d3296e5f1485c3f0d30f9d9 Mon Sep 17 00:00:00 2001 From: HbmMods Date: Tue, 13 Nov 2018 21:43:11 +0100 Subject: [PATCH] pre-identified pipes, desaturated redstone recycling --- assets/hbm/lang/de_DE.lang | 2 + assets/hbm/lang/en_US.lang | 2 + assets/hbm/sounds.json | 1 + assets/hbm/sounds/block/pipePlaced.ogg | Bin 0 -> 21220 bytes assets/hbm/textures/items/duct.png | Bin 0 -> 295 bytes assets/hbm/textures/items/duct_overlay.png | Bin 0 -> 136 bytes .../hbm/textures/items/redstone_depleted.png | Bin 0 -> 276 bytes com/hbm/items/ModItems.java | 6 + com/hbm/items/tool/ItemFluidDuct.java | 163 ++++++++++++++++++ com/hbm/items/tool/ItemFluidIdentifier.java | 14 ++ com/hbm/main/CraftingManager.java | 22 ++- .../TileEntityMachineReactorSmall.java | 1 + 12 files changed, 210 insertions(+), 1 deletion(-) create mode 100644 assets/hbm/sounds/block/pipePlaced.ogg create mode 100644 assets/hbm/textures/items/duct.png create mode 100644 assets/hbm/textures/items/duct_overlay.png create mode 100644 assets/hbm/textures/items/redstone_depleted.png create mode 100644 com/hbm/items/tool/ItemFluidDuct.java diff --git a/assets/hbm/lang/de_DE.lang b/assets/hbm/lang/de_DE.lang index f285cf3d6..3f5c58202 100644 --- a/assets/hbm/lang/de_DE.lang +++ b/assets/hbm/lang/de_DE.lang @@ -384,6 +384,7 @@ tile.machine_chemplant.name=Chemiefabrik container.chemplant=Chemiefabrik tile.fluid_duct.name=Universelles Flüssigkeitsrohr tile.machine_fluidtank.name=Tank +item.fluid_duct.name=Flüssigkeitsrohr: container.fluidtank=Tank tile.machine_turbofan.name=Turbofan container.machineTurbofan=Turbofan @@ -782,6 +783,7 @@ item.powder_meteorite.name=Meteoritenstaub item.powder_meteorite_tiny.name=Kleiner Haufen Meteoritenstaub item.powder_yellowcake.name=Yellowcake item.powder_magic.name=Pulverisierte Verzauberung +item.redstone_depleted.name=Entsättigter Redstonestaub item.fragment_neodymium.name=Neodymfragment item.fragment_cobalt.name=Cobaltfragment diff --git a/assets/hbm/lang/en_US.lang b/assets/hbm/lang/en_US.lang index 879723203..5a2a3f7c6 100644 --- a/assets/hbm/lang/en_US.lang +++ b/assets/hbm/lang/en_US.lang @@ -384,6 +384,7 @@ tile.machine_chemplant.name=Chemical Plant container.chemplant=Chemical Plant tile.fluid_duct.name=Universal Fluid Duct tile.machine_fluidtank.name=Tank +item.fluid_duct.name=Fluid Duct: container.fluidtank=Tank tile.machine_turbofan.name=Turbofan container.machineTurbofan=Turbofan @@ -782,6 +783,7 @@ item.powder_meteorite.name=Meteorite Powder item.powder_meteorite_tiny.name=Tiny Pile of Meteorite Powder item.powder_yellowcake.name=Yellowcake item.powder_magic.name=Pulverized Enchantment +item.redstone_depleted.name=Desaturated Redstone Dust item.fragment_neodymium.name=Neodymium Fragment item.fragment_cobalt.name=Cobalt Fragment diff --git a/assets/hbm/sounds.json b/assets/hbm/sounds.json index 7c1321b22..20ef72648 100644 --- a/assets/hbm/sounds.json +++ b/assets/hbm/sounds.json @@ -27,6 +27,7 @@ "block.lockHang": {"category": "block", "sounds": [{"name": "block/lockHang", "stream": false}]}, "block.debris": {"category": "block", "sounds": ["block/debris1", "block/debris2", "block/debris3"]}, "block.centrifugeOperate": {"category": "block", "sounds": [{"name": "block/centrifugeOperate", "stream": false}]}, + "block.pipePlaced": {"category": "block", "sounds": [{"name": "block/pipePlaced", "stream": false}]}, "item.techBleep": {"category": "player", "sounds": [{"name": "tool/techBleep", "stream": false}]}, "item.techBoop": {"category": "player", "sounds": [{"name": "tool/techBoop", "stream": false}]}, diff --git a/assets/hbm/sounds/block/pipePlaced.ogg b/assets/hbm/sounds/block/pipePlaced.ogg new file mode 100644 index 0000000000000000000000000000000000000000..fe2c1857bb5fa9570d641593f456965aaa97fdca GIT binary patch literal 21220 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 literal 0 HcmV?d00001 diff --git a/assets/hbm/textures/items/duct.png b/assets/hbm/textures/items/duct.png new file mode 100644 index 0000000000000000000000000000000000000000..57406ff87aa4773a88d95356c9ca42ea214def2f GIT binary patch literal 295 zcmV+?0oeYDP)0U+V(W3Vq7 z)UFUx8J5a~VQVeUH>koWH*_4#^V40002ovPDHLkV1l*Idtd+n literal 0 HcmV?d00001 diff --git a/assets/hbm/textures/items/duct_overlay.png b/assets/hbm/textures/items/duct_overlay.png new file mode 100644 index 0000000000000000000000000000000000000000..d19f95073ad575fcf1bbccc0e71af25fa01fb149 GIT binary patch literal 136 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#VfXB~)z4*}Q$iB}_m?OG literal 0 HcmV?d00001 diff --git a/assets/hbm/textures/items/redstone_depleted.png b/assets/hbm/textures/items/redstone_depleted.png new file mode 100644 index 0000000000000000000000000000000000000000..1cc99895ca256fd9b5d42263aa6cd185076938b4 GIT binary patch literal 276 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf1$>&ymLjZH3M3D(m*4l?;nIJR^(#{``e7cHIUMzf&2RQtWv z_dl}#iw=#{1EO%-dsBbP9cS3n-ni{GUv+-^vt1etKYWBe1q$3AEx9#0+;b_zi>+lI zW-RW{LbK+r>^`Ju$Y}Phi|@k;BL=1W%LNZvo@;xcy3}x4Vn&wP(YVTP$wO@h6~_%Lzemk>Ec^RO`R4D<{a>nU8CS7J V>{`Enb`;QC44$rjF6*2UngHm~YDNG6 literal 0 HcmV?d00001 diff --git a/com/hbm/items/ModItems.java b/com/hbm/items/ModItems.java index 3f3a250c6..ae48cdc94 100644 --- a/com/hbm/items/ModItems.java +++ b/com/hbm/items/ModItems.java @@ -197,6 +197,7 @@ public class ModItems { public static Item powder_red_copper; public static Item powder_steel; public static Item powder_lithium; + public static Item redstone_depleted; public static Item powder_australium; public static Item powder_weidanium; @@ -682,6 +683,7 @@ public class ModItems { public static Item fluid_identifier; public static Item fluid_icon; public static Item siren_track; + public static Item fluid_duct; public static Item missile_assembly; public static Item missile_generic; @@ -1525,6 +1527,7 @@ public class ModItems { powder_red_copper = new Item().setUnlocalizedName("powder_red_copper").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":powder_red_copper"); powder_steel = new Item().setUnlocalizedName("powder_steel").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":powder_steel"); powder_lithium = new Item().setUnlocalizedName("powder_lithium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":powder_lithium"); + redstone_depleted = new Item().setUnlocalizedName("redstone_depleted").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":redstone_depleted"); powder_power = new ItemCustomLore().setUnlocalizedName("powder_power").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":powder_energy_alt"); powder_iodine = new ItemCustomLore().setUnlocalizedName("powder_iodine").setCreativeTab(null).setTextureName(RefStrings.MODID + ":powder_iodine"); powder_thorium = new ItemCustomLore().setUnlocalizedName("powder_thorium").setCreativeTab(null).setTextureName(RefStrings.MODID + ":powder_thorium"); @@ -2399,6 +2402,7 @@ public class ModItems { fluid_barrel_empty = new Item().setUnlocalizedName("fluid_barrel_empty").setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":fluid_barrel"); fluid_barrel_infinite = new Item().setUnlocalizedName("fluid_barrel_infinite").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":fluid_barrel_infinite"); siren_track = new ItemCassette().setUnlocalizedName("siren_track").setMaxStackSize(1).setCreativeTab(MainRegistry.templateTab).setTextureName(RefStrings.MODID + ":cassette"); + fluid_duct = new ItemFluidDuct().setUnlocalizedName("fluid_duct").setCreativeTab(MainRegistry.templateTab).setTextureName(RefStrings.MODID + ":duct"); euphemium_helmet = new ArmorEuphemium(MainRegistry.enumArmorMaterialEuphemium, 6, 0).setUnlocalizedName("euphemium_helmet").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":euphemium_helmet"); euphemium_plate = new ArmorEuphemium(MainRegistry.enumArmorMaterialEuphemium, 6, 1).setUnlocalizedName("euphemium_plate").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":euphemium_plate"); @@ -2806,6 +2810,7 @@ public class ModItems { GameRegistry.registerItem(powder_meteorite, powder_meteorite.getUnlocalizedName()); GameRegistry.registerItem(powder_euphemium, powder_euphemium.getUnlocalizedName()); GameRegistry.registerItem(powder_dineutronium, powder_dineutronium.getUnlocalizedName()); + GameRegistry.registerItem(redstone_depleted, redstone_depleted.getUnlocalizedName()); GameRegistry.registerItem(dust, dust.getUnlocalizedName()); GameRegistry.registerItem(powder_lithium_tiny, powder_lithium_tiny.getUnlocalizedName()); GameRegistry.registerItem(powder_neodymium_tiny, powder_neodymium_tiny.getUnlocalizedName()); @@ -3229,6 +3234,7 @@ public class ModItems { GameRegistry.registerItem(siren_track, siren_track.getUnlocalizedName()); GameRegistry.registerItem(fluid_identifier, fluid_identifier.getUnlocalizedName()); GameRegistry.registerItem(fluid_icon, fluid_icon.getUnlocalizedName()); + GameRegistry.registerItem(fluid_duct, fluid_duct.getUnlocalizedName()); GameRegistry.registerItem(assembly_template, assembly_template.getUnlocalizedName()); GameRegistry.registerItem(chemistry_template, chemistry_template.getUnlocalizedName()); GameRegistry.registerItem(chemistry_icon, chemistry_icon.getUnlocalizedName()); diff --git a/com/hbm/items/tool/ItemFluidDuct.java b/com/hbm/items/tool/ItemFluidDuct.java new file mode 100644 index 000000000..605d8e543 --- /dev/null +++ b/com/hbm/items/tool/ItemFluidDuct.java @@ -0,0 +1,163 @@ +package com.hbm.items.tool; + +import java.util.List; + +import com.hbm.blocks.ModBlocks; +import com.hbm.handler.FluidTypeHandler.FluidType; +import com.hbm.items.ModItems; +import com.hbm.tileentity.conductor.TileEntityFluidDuct; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.Blocks; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; +import net.minecraft.util.StatCollector; +import net.minecraft.world.World; + +public class ItemFluidDuct extends Item { + + IIcon overlayIcon; + + public ItemFluidDuct() + { + this.setHasSubtypes(true); + this.setMaxDamage(0); + } + + @Override + @SideOnly(Side.CLIENT) + public void getSubItems(Item item, CreativeTabs tabs, List list) + { + for (int i = 1; i < FluidType.values().length; ++i) + { + list.add(new ItemStack(item, 1, i)); + } + } + + /*public void onCreated(ItemStack stack, World world, EntityPlayer player) { + + if(stack != null) + player.inventory.addItemStackToInventory(new ItemStack(ModItems.fluid_identifier, 1, stack.getItemDamage())); + }*/ + + public String getItemStackDisplayName(ItemStack stack) + { + String s = ("" + StatCollector.translateToLocal(this.getUnlocalizedName() + ".name")).trim(); + String s1 = ("" + StatCollector.translateToLocal(FluidType.getEnum(stack.getItemDamage()).getUnlocalizedName())).trim(); + + if (s1 != null) + { + s = s + " " + s1; + } + + return s; + } + + @Override + @SideOnly(Side.CLIENT) + public boolean requiresMultipleRenderPasses() + { + return true; + } + + @Override + @SideOnly(Side.CLIENT) + public void registerIcons(IIconRegister p_94581_1_) + { + super.registerIcons(p_94581_1_); + this.overlayIcon = p_94581_1_.registerIcon("hbm:duct_overlay"); + } + + @Override + @SideOnly(Side.CLIENT) + public IIcon getIconFromDamageForRenderPass(int p_77618_1_, int p_77618_2_) + { + return p_77618_2_ == 1 ? this.overlayIcon : super.getIconFromDamageForRenderPass(p_77618_1_, p_77618_2_); + } + + @Override + @SideOnly(Side.CLIENT) + public int getColorFromItemStack(ItemStack stack, int p_82790_2_) + { + if (p_82790_2_ == 0) + { + return 16777215; + } + else + { + int j = FluidType.getEnum(stack.getItemDamage()).getMSAColor(); + + if (j < 0) + { + j = 16777215; + } + + return j; + } + } + + public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int i, float f0, float f1, float f2) + { + if (world.getBlock(x, y, z) != Blocks.snow_layer) + { + if (i == 0) + { + --y; + } + + if (i == 1) + { + ++y; + } + + if (i == 2) + { + --z; + } + + if (i == 3) + { + ++z; + } + + if (i == 4) + { + --x; + } + + if (i == 5) + { + ++x; + } + + if (!world.isAirBlock(x, y, z)) + { + return false; + } + } + + if (!player.canPlayerEdit(x, y, z, i, stack)) + { + return false; + } + else + { + --stack.stackSize; + world.setBlock(x, y, z, ModBlocks.fluid_duct); + + if(world.getTileEntity(x, y, z) instanceof TileEntityFluidDuct) { + ((TileEntityFluidDuct)world.getTileEntity(x, y, z)).type = FluidType.getEnum(stack.getItemDamage()); + } + + world.playSoundEffect(x, y, z, "hbm:block.pipePlaced", 1.0F, 0.65F + world.rand.nextFloat() * 0.2F); + + return true; + } + } + +} diff --git a/com/hbm/items/tool/ItemFluidIdentifier.java b/com/hbm/items/tool/ItemFluidIdentifier.java index 9ae28615e..eb2d1f1b6 100644 --- a/com/hbm/items/tool/ItemFluidIdentifier.java +++ b/com/hbm/items/tool/ItemFluidIdentifier.java @@ -2,6 +2,7 @@ package com.hbm.items.tool; import java.util.List; import com.hbm.handler.FluidTypeHandler.FluidType; +import com.hbm.items.ModItems; import com.hbm.tileentity.conductor.TileEntityFluidDuct; import cpw.mods.fml.relauncher.Side; @@ -32,6 +33,19 @@ public class ItemFluidIdentifier extends Item { int i = stack.getItemDamage(); return super.getUnlocalizedName() + "." + FluidType.getEnum(i).getName(); }*/ + + public ItemStack getContainerItem(ItemStack stack) { + return stack.copy(); + } + + public boolean hasContainerItem() { + return true; + } + + public boolean doesContainerItemLeaveCraftingGrid(ItemStack stack) + { + return false; + } @Override @SideOnly(Side.CLIENT) diff --git a/com/hbm/main/CraftingManager.java b/com/hbm/main/CraftingManager.java index 2aa0361e0..7ca35e58f 100644 --- a/com/hbm/main/CraftingManager.java +++ b/com/hbm/main/CraftingManager.java @@ -1322,7 +1322,27 @@ public class CraftingManager { GameRegistry.addShapelessRecipe(new ItemStack(Items.paper, 1), new Object[] { new ItemStack(ModItems.assembly_template, 1, OreDictionary.WILDCARD_VALUE) }); GameRegistry.addShapelessRecipe(new ItemStack(Items.paper, 1), new Object[] { new ItemStack(ModItems.chemistry_template, 1, OreDictionary.WILDCARD_VALUE) }); - + + for (int i = 1; i < FluidType.values().length; ++i) + { + GameRegistry.addShapelessRecipe(new ItemStack(ModItems.fluid_duct, 1, i), new Object[] { new ItemStack(ModBlocks.fluid_duct, 1), new ItemStack(ModItems.fluid_identifier, 1, i) }); + + GameRegistry.addShapelessRecipe(new ItemStack(ModItems.fluid_duct, 8, i), new Object[] { new ItemStack(ModBlocks.fluid_duct, 8), new ItemStack(ModBlocks.fluid_duct, 8), + new ItemStack(ModBlocks.fluid_duct, 8), new ItemStack(ModBlocks.fluid_duct, 8), new ItemStack(ModBlocks.fluid_duct, 8), + new ItemStack(ModBlocks.fluid_duct, 8), new ItemStack(ModBlocks.fluid_duct, 8), new ItemStack(ModBlocks.fluid_duct, 8), new ItemStack(ModItems.fluid_identifier, 1, i) }); + + GameRegistry.addShapelessRecipe(new ItemStack(ModItems.fluid_duct, 1, i), new Object[] { new ItemStack(ModItems.fluid_duct, 1, OreDictionary.WILDCARD_VALUE), new ItemStack(ModItems.fluid_identifier, 1, i) }); + + GameRegistry.addShapelessRecipe(new ItemStack(ModItems.fluid_duct, 8, i), new Object[] { new ItemStack(ModItems.fluid_duct, 8, OreDictionary.WILDCARD_VALUE), new ItemStack(ModItems.fluid_duct, 8, OreDictionary.WILDCARD_VALUE), + new ItemStack(ModItems.fluid_duct, 8, OreDictionary.WILDCARD_VALUE), new ItemStack(ModItems.fluid_duct, 8, OreDictionary.WILDCARD_VALUE), new ItemStack(ModItems.fluid_duct, 8, OreDictionary.WILDCARD_VALUE), + new ItemStack(ModItems.fluid_duct, 8, OreDictionary.WILDCARD_VALUE), new ItemStack(ModItems.fluid_duct, 8, OreDictionary.WILDCARD_VALUE), new ItemStack(ModItems.fluid_duct, 8, OreDictionary.WILDCARD_VALUE), new ItemStack(ModItems.fluid_identifier, 1, i) }); + } + + GameRegistry.addShapelessRecipe(new ItemStack(ModBlocks.fluid_duct, 1), new Object[] { new ItemStack(ModItems.fluid_duct, 1, OreDictionary.WILDCARD_VALUE) }); + + GameRegistry.addShapelessRecipe(new ItemStack(ModItems.redstone_depleted, 1), new Object[] { new ItemStack(ModItems.battery_su, 1, OreDictionary.WILDCARD_VALUE) }); + GameRegistry.addShapelessRecipe(new ItemStack(ModItems.redstone_depleted, 2), new Object[] { new ItemStack(ModItems.battery_su_l, 1, OreDictionary.WILDCARD_VALUE) }); + GameRegistry.addShapelessRecipe(new ItemStack(Items.redstone, 1), new Object[] { ModItems.redstone_depleted, ModItems.redstone_depleted }); } public static void AddSmeltingRec() diff --git a/com/hbm/tileentity/machine/TileEntityMachineReactorSmall.java b/com/hbm/tileentity/machine/TileEntityMachineReactorSmall.java index 39dfb20fa..058e8e1be 100644 --- a/com/hbm/tileentity/machine/TileEntityMachineReactorSmall.java +++ b/com/hbm/tileentity/machine/TileEntityMachineReactorSmall.java @@ -410,6 +410,7 @@ public class TileEntityMachineReactorSmall extends TileEntity } } + @SuppressWarnings("incomplete-switch") private void generateSteam() { //function of SHS produced per tick