From 58902f39016888cd53796adeaec10e74928d34cc Mon Sep 17 00:00:00 2001 From: Prospector Date: Tue, 29 Mar 2016 00:30:05 -0700 Subject: [PATCH] Quite a bit of fixes/additions --- .../blocks/BlockHighlyAdvancedMachine.java | 27 ------------------ .../techreborn/blocks/BlockMachineFrame.java | 2 +- .../transformers/BlockHVTransformer.java | 2 +- src/main/java/techreborn/init/ModBlocks.java | 5 ---- src/main/java/techreborn/init/ModItems.java | 8 +++--- src/main/java/techreborn/init/ModRecipes.java | 19 ++++++++---- src/main/java/techreborn/items/ItemParts.java | 2 +- .../java/techreborn/items/ItemUpgrades.java | 17 ++++++++++- .../assets/techreborn/lang/en_US.lang | 13 +++++---- .../textures/blocks/cables/copper_cable.png | Bin 504 -> 482 bytes .../blocks/cables/copper_insulated_cable.png | Bin 471 -> 470 bytes .../blocks/cables/gold_insulated_cable.png | Bin 445 -> 455 bytes .../textures/blocks/cables/hv_cable.png | Bin 447 -> 457 bytes .../blocks/cables/hv_insulated_cable.png | Bin 441 -> 468 bytes ...> highlyAdvancedMachine_machine_block.png} | Bin .../textures/items/cables/copper.png | Bin 312 -> 251 bytes .../techreborn/textures/items/cables/gold.png | Bin 312 -> 256 bytes .../techreborn/textures/items/cables/hv.png | Bin 274 -> 228 bytes .../textures/items/cables/insulatedcopper.png | Bin 343 -> 302 bytes .../textures/items/cables/insulatedgold.png | Bin 330 -> 307 bytes .../textures/items/cables/insulatedhv.png | Bin 320 -> 304 bytes .../techreborn/textures/items/cables/tin.png | Bin 298 -> 249 bytes .../items/part/frequencyTransmitter.png | Bin 0 -> 391 bytes .../techreborn/textures/items/part/rubber.png | Bin 349 -> 258 bytes .../textures/items/part/rubberSap.png | Bin 481 -> 474 bytes .../items/upgrade/upgradeInvertRedstone.png | Bin 518 -> 0 bytes 26 files changed, 43 insertions(+), 52 deletions(-) delete mode 100644 src/main/java/techreborn/blocks/BlockHighlyAdvancedMachine.java rename src/main/resources/assets/techreborn/textures/blocks/machine/machine_blocks/{highlyadvancedmachine.png => highlyAdvancedMachine_machine_block.png} (100%) create mode 100644 src/main/resources/assets/techreborn/textures/items/part/frequencyTransmitter.png delete mode 100644 src/main/resources/assets/techreborn/textures/items/upgrade/upgradeInvertRedstone.png diff --git a/src/main/java/techreborn/blocks/BlockHighlyAdvancedMachine.java b/src/main/java/techreborn/blocks/BlockHighlyAdvancedMachine.java deleted file mode 100644 index 759ad0ad3..000000000 --- a/src/main/java/techreborn/blocks/BlockHighlyAdvancedMachine.java +++ /dev/null @@ -1,27 +0,0 @@ -package techreborn.blocks; - -import net.minecraft.block.material.Material; -import net.minecraft.block.state.IBlockState; -import net.minecraft.util.EnumFacing; -import reborncore.common.blocks.BlockMachineBase; -import techreborn.client.TechRebornCreativeTab; - -public class BlockHighlyAdvancedMachine extends BlockMachineBase -{ - - private final String prefix = "techreborn:blocks/machine/machine_blocks/"; - - public BlockHighlyAdvancedMachine(Material material) - { - super(); - setUnlocalizedName("techreborn.highlyAdvancedMachine"); - setCreativeTab(TechRebornCreativeTab.instance); - } - - @Override - public String getTextureNameFromState(IBlockState BlockStateContainer, EnumFacing facing) - { - return prefix + "highlyadvancedmachine"; - } - -} diff --git a/src/main/java/techreborn/blocks/BlockMachineFrame.java b/src/main/java/techreborn/blocks/BlockMachineFrame.java index 632affcab..bf91e5d5f 100644 --- a/src/main/java/techreborn/blocks/BlockMachineFrame.java +++ b/src/main/java/techreborn/blocks/BlockMachineFrame.java @@ -21,7 +21,7 @@ import techreborn.init.ModBlocks; public class BlockMachineFrame extends BaseBlock implements ITexturedBlock { public static final String[] types = new String[] { "aluminum", "iron", "bronze", "brass", "steel", "titanium", - "machine", "advancedMachine" }; + "machine", "advancedMachine", "highlyAdvancedMachine" }; public PropertyInteger METADATA; public BlockMachineFrame(Material material) diff --git a/src/main/java/techreborn/blocks/transformers/BlockHVTransformer.java b/src/main/java/techreborn/blocks/transformers/BlockHVTransformer.java index 5041e8dbc..a3e1a58eb 100644 --- a/src/main/java/techreborn/blocks/transformers/BlockHVTransformer.java +++ b/src/main/java/techreborn/blocks/transformers/BlockHVTransformer.java @@ -59,7 +59,7 @@ public class BlockHVTransformer extends BlockLVTransformer @Override public String getBottom() { - return prefix + "hv_transformer_bottom"; + return prefix + "hv_transformer_side"; } @Override public void breakBlock(World world, BlockPos pos, IBlockState state) diff --git a/src/main/java/techreborn/init/ModBlocks.java b/src/main/java/techreborn/init/ModBlocks.java index d4aae7069..e20d3ca5e 100644 --- a/src/main/java/techreborn/init/ModBlocks.java +++ b/src/main/java/techreborn/init/ModBlocks.java @@ -13,7 +13,6 @@ import techreborn.blocks.BlockDigitalChest; import techreborn.blocks.BlockElectricCraftingTable; import techreborn.blocks.BlockFusionCoil; import techreborn.blocks.BlockFusionControlComputer; -import techreborn.blocks.BlockHighlyAdvancedMachine; import techreborn.blocks.BlockIronFence; import techreborn.blocks.BlockMachineCasing; import techreborn.blocks.BlockMachineFrame; @@ -155,7 +154,6 @@ public class ModBlocks public static Block ImplosionCompressor; public static Block MatterFabricator; public static Block ChunkLoader; - public static Block HighAdvancedMachineBlock; public static Block Dragoneggenergysiphoner; public static Block Magicenergeyconverter; public static Block AssemblyMachine; @@ -290,9 +288,6 @@ public class ModBlocks storage2 = new BlockStorage2(Material.iron); GameRegistry.registerBlock(storage2, ItemBlockStorage2.class, "techreborn.storage2"); - HighAdvancedMachineBlock = new BlockHighlyAdvancedMachine(Material.rock); - GameRegistry.registerBlock(HighAdvancedMachineBlock, "highlyadvancedmachine"); - Dragoneggenergysiphoner = new BlockDragonEggSiphoner(Material.rock); GameRegistry.registerBlock(Dragoneggenergysiphoner, "dragoneggenergsiphon"); GameRegistry.registerTileEntity(TileDragonEggSiphoner.class, "TileDragonEggSiphonerTR"); diff --git a/src/main/java/techreborn/init/ModItems.java b/src/main/java/techreborn/init/ModItems.java index b35ca0f83..acca497ce 100644 --- a/src/main/java/techreborn/init/ModItems.java +++ b/src/main/java/techreborn/init/ModItems.java @@ -31,6 +31,7 @@ import techreborn.items.ItemPlates; import techreborn.items.ItemReBattery; import techreborn.items.ItemScrapBox; import techreborn.items.ItemUUmatter; +import techreborn.items.ItemUpgrades; import techreborn.items.armor.ItemLapotronPack; import techreborn.items.armor.ItemLithiumBatpack; import techreborn.items.armor.ItemTRArmour; @@ -343,8 +344,6 @@ public class ModItems GameRegistry.registerItem(peridotLeggings, "peridotLeggings"); peridotBoots = new ItemTRArmour(Reference.PERIDOT_ARMOUR, EntityEquipmentSlot.FEET); GameRegistry.registerItem(peridotBoots, "peridotBoots"); - - //sword|axe|shovel|spade|hoe|helmet|chestplate|leggings|boots hammer = new ItemHammer(100); GameRegistry.registerItem(hammer, "hammer"); @@ -358,8 +357,8 @@ public class ModItems scrapBox = new ItemScrapBox(); GameRegistry.registerItem(scrapBox, "scrapbox"); - // upgrades = new ItemUpgrade(); - // GameRegistry.registerItem(upgrades, "upgrades"); + upgrades = new ItemUpgrades(); + GameRegistry.registerItem(upgrades, "upgrades"); cloakingDevice = PoweredItem.createItem(ItemCloakingDevice.class); GameRegistry.registerItem(cloakingDevice, "cloakingdevice"); @@ -797,6 +796,7 @@ public class ModItems OreUnifier.registerOre("ingotTungstensteel", ItemIngots.getIngotByName("tungstensteel")); OreUnifier.registerOre("ingotHotTungstenSteel", ItemIngots.getIngotByName("hotTungstensteel")); OreUnifier.registerOre("ingotZinc", ItemIngots.getIngotByName("zinc")); + OreUnifier.registerOre("ingotRefinedIron", ItemIngots.getIngotByName("refinedIron")); // Nuggets OreUnifier.registerOre("nuggetAluminum", ItemNuggets.getNuggetByName("aluminum")); diff --git a/src/main/java/techreborn/init/ModRecipes.java b/src/main/java/techreborn/init/ModRecipes.java index fe14891a4..633c6259a 100644 --- a/src/main/java/techreborn/init/ModRecipes.java +++ b/src/main/java/techreborn/init/ModRecipes.java @@ -27,6 +27,8 @@ import techreborn.api.recipe.machines.*; import techreborn.blocks.*; import techreborn.config.ConfigTechReborn; import techreborn.items.*; +import techreborn.parts.CableMultipart; +import techreborn.parts.ItemCables; import techreborn.parts.ItemStandaloneCables; import techreborn.utils.RecipeUtils; import techreborn.utils.StackWIPHandler; @@ -546,7 +548,7 @@ public class ModRecipes { CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.Supercondensator), "EOE", "SAS", "EOE", 'E', ItemParts.getPartByName("energyFlowCircuit"), 'O', ModItems.lapotronicOrb, 'S', - ItemParts.getPartByName("superconductor"), 'A', ModBlocks.HighAdvancedMachineBlock); + ItemParts.getPartByName("superconductor"), 'A', BlockMachineFrame.getFrameByName("highlyAdvancedMachine", 1)); CraftingHelper.addShapedOreRecipe(ItemParts.getPartByName("diamondSawBlade"), "DSD", "S S", "DSD", 'S', "plateSteel", 'D', "dustDiamond"); @@ -555,7 +557,11 @@ public class ModRecipes { "plateTungsten", 'S', "plateSteel", 'B', "blockSteel"); CraftingHelper.addShapedOreRecipe(ItemParts.getPartByName("destructoPack"), "CIC", "IBI", "CIC", 'C', - ItemParts.getPartByName("basicCircuitBoard"), 'I', "ingotAluminum", 'B', + ItemParts.getPartByName("advancedCircuit"), 'I', "ingotAluminum", 'B', + new ItemStack(Items.lava_bucket)); + + CraftingHelper.addShapedOreRecipe(ItemParts.getPartByName("destructoPack"), "CIC", "IBI", "CIC", 'C', + ItemParts.getPartByName("advancedCircuit"), 'I', "ingotRefinedIron", 'B', new ItemStack(Items.lava_bucket)); CraftingHelper.addShapedOreRecipe(new ItemStack(ModItems.cloakingDevice), "CIC", "IOI", "CIC", 'C', @@ -664,6 +670,7 @@ public class ModRecipes { } GameRegistry.addShapelessRecipe(new ItemStack(ModBlocks.rubberPlanks, 4), ModBlocks.rubberLog); + GameRegistry.addShapelessRecipe(ItemParts.getPartByName("frequencyTransmitter"), ItemStandaloneCables.getCableByName("insulatedcopper"), ItemParts.getPartByName("electronicCircuit")); for (String name : ItemDustsSmall.types) { GameRegistry.addShapelessRecipe(ItemDustsSmall.getSmallDustByName(name, 4), ItemDusts.getDustByName(name)); @@ -1812,7 +1819,7 @@ public class ModRecipes { CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.MatterFabricator), "ETE", "AOA", "ETE", 'E', ItemParts.getPartByName("energyFlowCircuit"), 'T', ModBlocks.Extractor, 'A', - ModBlocks.HighAdvancedMachineBlock, 'O', ModItems.lapotronicOrb); + BlockMachineFrame.getFrameByName("highlyAdvancedMachine", 1), 'O', ModItems.lapotronicOrb); CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.heatGenerator), "III", "IHI", "CGC", 'I', "plateIron", 'H', new ItemStack(Blocks.iron_bars), 'C', "circuitBasic", 'G', ModBlocks.Generator); @@ -1926,7 +1933,7 @@ public class ModRecipes { CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.Lesu), " L ", "CBC", " M ", 'L', ModBlocks.lvt, 'C', ItemParts.getPartByName("advancedCircuit"), 'M', ModBlocks.mvt, 'B', ModBlocks.LesuStorage); - CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.HighAdvancedMachineBlock), "CTC", "TBT", "CTC", 'C', + CraftingHelper.addShapedOreRecipe(BlockMachineFrame.getFrameByName("highlyAdvancedMachine", 1), "CTC", "TBT", "CTC", 'C', "ingotChrome", 'T', "ingotTitanium", 'B', TechRebornAPI.recipeCompact.getItem("advancedMachine")); CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.MachineCasing, 4, 0), "III", "CBC", "III", 'I', @@ -1936,11 +1943,11 @@ public class ModRecipes { "plateSteel", 'C', "circuitAdvanced", 'B', TechRebornAPI.recipeCompact.getItem("advancedMachine")); CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.MachineCasing, 4, 2), "HHH", "CBC", "HHH", 'H', - "ingotChrome", 'C', "circuitElite", 'B', ModBlocks.HighAdvancedMachineBlock); + "ingotChrome", 'C', "circuitElite", 'B', BlockMachineFrame.getFrameByName("highlyAdvancedMachine", 1)); CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.quantumChest), "DCD", "ATA", "DQD", 'D', ItemParts.getPartByName("dataOrb"), 'C', ItemParts.getPartByName("computerMonitor"), 'A', - ModBlocks.HighAdvancedMachineBlock, 'Q', ModBlocks.digitalChest, 'T', ModBlocks.Compressor); + BlockMachineFrame.getFrameByName("highlyAdvancedMachine", 1), 'Q', ModBlocks.digitalChest, 'T', ModBlocks.Compressor); CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.PlasmaGenerator), "PPP", "PTP", "CGC", 'P', ItemPlates.getPlateByName("tungstensteel"), 'T', TechRebornAPI.recipeCompact.getItem("hvTransformer"), diff --git a/src/main/java/techreborn/items/ItemParts.java b/src/main/java/techreborn/items/ItemParts.java index ea8f8193b..85db41ffb 100644 --- a/src/main/java/techreborn/items/ItemParts.java +++ b/src/main/java/techreborn/items/ItemParts.java @@ -25,7 +25,7 @@ public class ItemParts extends ItemTextureBase "doubleThoriumCell", "quadThoriumCell", "plutoniumCell", "doublePlutoniumCell", "quadPlutoniumCell", "destructoPack", "iridiumNeutronReflector", "massHoleDevice", "computerMonitor", "machineParts", "thickNeutronReflector", "neutronReflector", "electronicCircuit", "advancedCircuit", "rubberSap", "rubber", - "scrap", "pump", "teleporter", "advancedAlloy", "mixedmetalingot", "carbonmesh", "carbonfiber" }; + "scrap", "pump", "teleporter", "advancedAlloy", "mixedmetalingot", "carbonmesh", "carbonfiber", "frequencyTransmitter" }; public ItemParts() { diff --git a/src/main/java/techreborn/items/ItemUpgrades.java b/src/main/java/techreborn/items/ItemUpgrades.java index 19477d5ed..0248f56f8 100644 --- a/src/main/java/techreborn/items/ItemUpgrades.java +++ b/src/main/java/techreborn/items/ItemUpgrades.java @@ -3,7 +3,10 @@ package techreborn.items; import java.security.InvalidParameterException; import java.util.List; +import me.modmuss50.jsonDestroyer.api.ITexturedItem; +import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import techreborn.api.recipe.RecipeCrafter; @@ -11,7 +14,7 @@ import techreborn.api.upgrade.IMachineUpgrade; import techreborn.client.TechRebornCreativeTabMisc; import techreborn.init.ModItems; -public class ItemUpgrades extends ItemTR implements IMachineUpgrade +public class ItemUpgrades extends ItemTextureBase implements IMachineUpgrade, ITexturedItem { public static final String[] types = new String[] { "Overclock", "Transformer", "EnergyStorage" }; @@ -86,4 +89,16 @@ public class ItemUpgrades extends ItemTR implements IMachineUpgrade crafter.addPowerMulti(1); } } + + @Override + public int getMaxMeta() + { + return types.length; + } + + @Override + public String getTextureName(int damage) + { + return "techreborn:items/upgrade/upgrade"+types[damage]; + } } \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/lang/en_US.lang b/src/main/resources/assets/techreborn/lang/en_US.lang index 3277b6d3a..7621df827 100644 --- a/src/main/resources/assets/techreborn/lang/en_US.lang +++ b/src/main/resources/assets/techreborn/lang/en_US.lang @@ -15,7 +15,6 @@ tile.techreborn.rollingmachine.name=Rolling Machine tile.techreborn.machineCasing.standard.name=Standard Machine Casing tile.techreborn.machineCasing.reinforced.name=Reinforced Machine Casing tile.techreborn.machineCasing.advanced.name=Advanced Machine Casing -tile.techreborn.highlyAdvancedMachine.name=Highly Advanced Machine Block tile.techreborn.blastfurnace.name=Industrial Blast Furnace tile.techreborn.alloysmelter.name=Electric Alloy Furnace tile.techreborn.matterfabricator.name=Matter Fabricator @@ -61,6 +60,7 @@ tile.techreborn.extractor.name=Extractor tile.techreborn.grinder.name=Grinder tile.techreborn.compressor.name=Compressor tile.techreborn.electricfurnace.name=Electric Furnace +tile.techreborn.machineFrame.highlyAdvancedMachine.name=Highly Advanced Machine Block tile.techreborn.machineFrame.advancedMachine.name=Advanced Machine Block tile.techreborn.machineFrame.machine.name=Machine Block tile.techreborn.ore2.Copper.name=Copper Ore @@ -135,11 +135,12 @@ tile.techreborn.storage2.sapphire.name=Block of Sapphire tile.techreborn.storage2.peridot.name=Block of Peridot tile.techreborn.storage2.yellowGarnet.name=Block of Yellow Garnet tile.techreborn.storage2.redGarnet.name=Block of Red Garnet +tile.techreborn.storage2.refinedIron.name=Block of Refined Iron tile.techreborn.farm.name=Farm #Fluids -tile.techreborn.berylium.name=Berylium Source +tile.techreborn.berylium.name=Beryllium Source tile.techreborn.calcium.name=Calcium Source tile.techreborn.calciumcarbonate.name=Calciumcarbonate Source tile.techreborn.chlorite.name=Chlorite Source @@ -163,7 +164,7 @@ tile.techreborn.sodiumpersulfate.name=Sodiumpersulfate Source tile.techreborn.tritium.name=Tritium Source tile.techreborn.wolframium.name=Wolframium Source tile.techreborn.supercondensator.name=Supercondensator -fluid.fluid.fluidberylium=Berylium +fluid.fluid.fluidberylium=Beryllium fluid.fluid.fluidcalcium=Calcium fluid.fluid.fluidcalciumcarbonate=Calciumcarbonate fluid.fluid.fluidchlorite=Chlorite @@ -187,7 +188,7 @@ fluid.fluid.fluidsodiumpersulfate=Sodiumpersulfate fluid.fluid.fluidtritium=Tritium fluid.fluid.fluidwolframium=Wolframium fluid.tile.techreborn.glyceryl=Glyceryl -fluid.tile.techreborn.berylium=Berylium +fluid.tile.techreborn.berylium=Beryllium fluid.tile.techreborn.chlorite=Chlorite fluid.tile.techreborn.helium3=Helium3 fluid.tile.techreborn.deuterium=Deuterium @@ -391,7 +392,7 @@ item.techreborn.dustsmall.Galena.name=Small Pile of Galena Dust item.techreborn.dustsmall.Olivine.name=Small Pile of Olivine Dust #Cells -item.techreborn.cell.Berylium.name=Berylium Cell +item.techreborn.cell.Beryllium.name=Beryllium Cell item.techreborn.cell.biomass.name=Biomass Cell item.techreborn.cell.calciumCarbonate.name=Calcium Carbonate Cell item.techreborn.cell.calcium.name=Calcium Cell @@ -685,7 +686,7 @@ item.peridotLeggings.name=Peridot Leggings item.peridotBoots.name=Peridot Boots #Buckets -item.bucketberylium.name=Berylium Bucket +item.bucketberylium.name=Beryllium Bucket item.bucketcalcium.name=Calcium Bucket item.bucketcalciumcarbonate.name=Calciumcarbonate Bucket item.bucketchlorite.name=Chlorite Bucket diff --git a/src/main/resources/assets/techreborn/textures/blocks/cables/copper_cable.png b/src/main/resources/assets/techreborn/textures/blocks/cables/copper_cable.png index b5dec84a765b1af7458a708262431735b2162eb4..fa3b67a73f906cae5d8640d0e589fb5a6ce2880c 100644 GIT binary patch delta 396 zcmV;70dxNN1L6aaJPL6D01|Nl^W1ulkwzzfU`a$lR5(walIc#uP!NUtF3^GqngFr} zeJVi876>MavdU}7+5#^8P}y2uhBr9Q-1e7&1bUN`-Z`Cqow;|U{eFK?^Rgf2YYIju z3BBaOp&ZshlQk^|V02U1v->5i`K-CPmCSW;-elm#dSu?F3fMIQ1IF zvK|sWGvK}AvtdDuvTpjof{PsTxILD4G|nj)WE8xm-56$E;NCUWgE2h^88`am4Q!ud z&grLJl<&fbV(HkL(Igt3gqQ_B6Wcz0Spe${#yQym;NKwG_UTJ6_^@e2uzm?cFE{{b qs@J+1t|0FKFu9k-b+V2FB#)A!gysY?OBsr3Q z`=pS|Ou4bF2Jl_cFi4)zK`-vWtf=9u9Dt>}2+4iyv!G)7nQ(}D-@`E!hP1#H)jVAsBb-MYfIPG_dJ=Ow=g+%`j^9#Vka3X7V1?8b!{ zF7J-58(}PJ*K}4t7G<9}GY^>L_A{7&mwf2O8GUdmYT+R^EAGVx2`9QSCtjlpdND?3 z2es_NAg&Ns(79*mk~rrz_jIC+{0x2Cv%l7uUgEYH7H@&iQYQoq9~5z&^O6Sh&j7}L00y(@qm)Yyq1XTb N002ovPDHLkV1kru$F2YX diff --git a/src/main/resources/assets/techreborn/textures/blocks/cables/copper_insulated_cable.png b/src/main/resources/assets/techreborn/textures/blocks/cables/copper_insulated_cable.png index 407eaa2ac690f0bdb6a4858ce0ea59739382ff4a..bb3515dc014aaf90f1c4be2b6f07b118a5a279e0 100644 GIT binary patch delta 384 zcmV-`0e}A21J(nOJPL6D01|Nl^W1ulkwzzfR7pfZR5(wale0~&+yBC)`Q#ZM*R>0CC9Gkrw{eax{mrR^hXWlqyBhBIw-azL#4rrZ z=W}6&z|?u)E+Twh7kIyn@qGLvOgJfRnx;_J>viv=WOL@=<0{4LxsR8V9TD?9Pgr)B zO?yY^a<`}B@leOpk%8OBXH4D>-v_B{stO7>+?`_T{)cdhtRtLY3eka<$zd4E=RC?C z1qiRSu`N*)Nq>|(3VegIEXA8}97h!UzTXpQnh3f@UD}Nk{#ZOp=lkyhBuNrsSF4p2 eYjd^&f$|0BU~K0LZ&k_w0000 zLM|k^JCcz5lMpUdK8mfNAU0Zxm5m^Feh+KqKy0-2DjPxUY@hd*+mK|_oW+kB-oBaL zolOJ)4Z|>?NRkAe=gGY3Bbq>H9*@UxT^F<2tZdfw5ltX8`@UZmuHC@4ZFD-F|2Lq2 zx!di^A~sTa(?^8kILNXLQ50b?7{D~m+OAdTRj`IyZQ?w-%0I5QF+UY}JQA3n2&r){ z#Ih{(dOaCsgSPvA-R|M{;Sk?<`*^$9tgZ2+jMM29B2ClUqGEBqgP;2YeBSKh{c=lc zK@iBu-PNYGD^z(t7I--mcs<|1(=w-Qre25N2PujIf)lQuqV4^gaEPoUJV6_B2S%FX zI98vt=G6qkCtb#p(P*S{&8rD3kmtGlCi?xpEDpnPy#{LHgg+LqQduw2gcY)IGMUIY f91c~phR+axnF^i!2U*oW00000NkvXXu0mjfooBf^ diff --git a/src/main/resources/assets/techreborn/textures/blocks/cables/gold_insulated_cable.png b/src/main/resources/assets/techreborn/textures/blocks/cables/gold_insulated_cable.png index 9ccdf70d7a4cf869d94040070f238a3d2e0e9c98..c2dd8823f169bbbe4de69398e6a873915dd4bfb0 100644 GIT binary patch delta 369 zcmV-%0gnE?1IGi9JPL3C01|KkA)A$j_-BLVa><5a{NDh@i^W1jFjDKW7?5p$ z+gua{M^VH<5U{T6gRXs0tAGZ%!Njq3wSGAgpPq@22ja&Yk{sp&Ow(k`vLuSZ+<9M5 z#9yBmTz{N*1`6yHal73z<#|5%s5m{5h~MAN_;B4CgkdNV-Br`U5&AqdqPr{N+dc99 zWow{r2k!$^RmFq}_jfUO|6?#j=m2(HFo$$NL~$I)>N!tpCkcQnZDL1~Bx*gWog{wX z-EJpu!uNd4M3Wv5?8C0GV5wugNVKXJd$+c3HBNk P00000NkvXXu0mjfy0)$A delta 359 zcmV-t0hs>B1HA)~JPL6D01|Nl^W1ulkwzzfJ4r-AR5(walig~AKoEte(2Kr@Mp4nI zsQ8cQm9L(bUX-?>KLn(dLQ5%qf@#hsE9&MZz4(}AJacAub|q$3&@_!DRaLR)d1AfP z0VM$-&hwmI*X6ctN3*34CZ(=?oa zBnbyWz`Cx_x=w*sf*Ryz6UWx&`fW!%yb|xW#Lssma+nJ+O_Ocg7Eu_SI`8{H{QGmo z-(Q!bfdo56EX$IquIt%H$?!s=`19j}x3>p_D2hZxciD7ygegz^qK6ye`wj8q^}#^i z4&Ddo`<@9Cp6=q*{V%}~Q3tStQ-}^yh!Ce~Dxb5WRT2PKx{o7SmdUlERT4+I>pJl! zeBT$vaU7p#ASVv+W8o;1?;}d$h$t+ILc}l(rP)HK(I1Meqf;idQ&Io`002ovPDHLk FV1m!7sx1Hj diff --git a/src/main/resources/assets/techreborn/textures/blocks/cables/hv_cable.png b/src/main/resources/assets/techreborn/textures/blocks/cables/hv_cable.png index 530d442343c8e7c14c7f91eb12d7dafcd9503387..84fdc2693402cb8cc639e0323a239bf02941a2dd 100644 GIT binary patch delta 371 zcmV-(0gV2?1IYuBJPL3C01|KkA)AYsIh4h5-Cxef*;UO|o;7X%wkH@~vMv@oj<(l&Sv9jHvPKuGG{5mfQ9-6Oe z%-&U>f9S5>wv=DzB>_=0{gKkWp^k%!rTjWC3CMuxmB~W4wb)XAotFehg;1&Po1WW$ zeI4XVmh$VoB)F_JR2)uK9?f*$=vd0HGuKheb^4|nyLwN9NN}uQIs;J(XRLV?o^!IJ zPo^-KC|-WKk`&!|~jC9>7P_rCVP` zO?QFE&~TCR$j3Ldz zkna0FZnqom_dAj#86Z7RZ8jTGIt)YUcePr97}tlx0c?e5T=P-lJZE*(N#%KtzVBsZ zRGkM!QOKq1^(ymUf^0v{uX7ug=G zQ?uC&p69_Z3@OnxP04Oq7N*mw;EX&}d&kLSg7tbWT=ko6w_CJrE2Cu3BmBKF!&?JZ zIl|xD=SLdh?~Nnk$bQE4SEGYf zh-jqNRWUJq-^X-1MHEHo_xotIT3XjKtW{9MoHlVDU9HbIZ#a8+!O8j&$G3Nq<6Ma2 zIPg4Aq8K#Ym!iwf7K^7>94>FPJ)V?tG#bH}OeWf<;`II*tM^Y_Z$EIfT1zerLy7FJ znrc@lb8vBm{hYnUQX+Heb@+Xd`Fsv(gA*>FqUrssaER0qo}dZoz{uh_j@9Q}tF0vn zpEQpJNs_2_t+tl<0khdmzKLG1C*r|ipc&*%gtDkiF>%5li&rV_|879iG?f?xfif#< cz6~Pd3kjip7Ei4_c>n+a07*qoM6N<$f`x&zIsgCw delta 355 zcmV-p0i6ES1Gxi`JPL6D01|Nl^W1ulkwzzfH%UZ6R5(walh4Y6KorG&7t=^lD>BSK zA-3{SBZ9Vp3!xHPxbTTi-?=oRj+?&4k2{<>_s-0n83TZZX_`=ESq9(tWjyr}O&~PK zaSYG%P!vU9Z0aMLKxhtvpilg{z-qOEWm*3(K(lSzlEgx4JoOR7bzS6nj{Sa*&1Qpt z#bPm9bqKu*=1?1ToLg7prfKkeK2g^-s;Ux=eId)`5{~0Ylmc_-Wzzfo#_RRM?RFc@ zai@%Fn!-39kE2P&$N0@ zVfb4C)p5d)#iI=7doxLe7wJ^RFk(hWv%) QE(}26>FVdQ&MBb@0G>uhGXMYp delta 225 zcmey(xPxhe4c9>i2EK!gJ0@noo#>`szs=LdF~q_@`N#kN_O24E6*RG8pF49G{r>+g zXQHQ8Ap$Z-!AFVdQ&MBb@05XPX A&Hw-a diff --git a/src/main/resources/assets/techreborn/textures/items/cables/gold.png b/src/main/resources/assets/techreborn/textures/items/cables/gold.png index b57d45fdfd7517d6f85c66a06e5a4313c8f51b69..876e07eb57e47fba72cef54c4eef2a0bb5b50f3f 100644 GIT binary patch delta 169 zcmdnN)W9^shU)+W1K$D0tZSW|6W!G7>pWc?LoEE4o>AmG6d>YqF>e(c5AT%?EGoQR zv5y0mDAc`pT&St2qSEtX$)lbfNm>bFlCnltDJ3UfOt`4HIC)Or8C%OY5B9azeSTh< zE$QX#;(TnDj<($2Nv~Jd?Jp5nY*WMcNyESHXsV;-_5010FpbV`?LC(R_cDkuTCl8k Tdink`0}yz+`njxgN@xNAE}}?B delta 225 zcmZo*+QBrzhU*{$1K&Z$9TT(PPIObR-{$G!7-HeS^qe7gQ-Z*;!u>%O*RBbOMs`?U zk?^(p5_p?i=SsD*)`znlBGpw}H!536)tUc!*tePCPiwDG&Xk13EYhksG!D9TriEPP z3KeANw_LDXe%{XhNADKt#D*+w|6_Ed@VeRRXAQZxcf1t1uG3&=eIb&=_wV|Q%LmKu zI{ECqT~lDC~Sas0@X|5$|kwBJOR=uHd(2di~YeQhuu{pxYJYVizjQSmz z{daQlvC`P@mwz|c-VgM0^x`x;=6>#T%Xhigy14>Q4TfzN&-bm_nliWlu|ia~#?lvh nxoR7ZN#{&SfEs!1`G#7C;JbYPYSRLF7=Xaj)z4*}Q$iB}5IIoZ diff --git a/src/main/resources/assets/techreborn/textures/items/cables/insulatedcopper.png b/src/main/resources/assets/techreborn/textures/items/cables/insulatedcopper.png index 7e1d323f5cc9fdd504f62cd2d2f6cc0a1c928212..bfaf87dbf64d8afa3a5c2f6848afe99e91ff87c7 100644 GIT binary patch delta 215 zcmcc4w2oJNHxu991`xZP-%sWeC z3+>-CztC=P+gCU*UFYV Mr>mdKI;Vst0RFyPqW}N^ delta 256 zcmV+b0ssE40@nhNJPN=701m(bYSxJfkwzzf)k#D_R5(wik39~8Koo>If)xjlA0ZF| z1PT%o2qaWo!V_3|0~>GR6|Af+Jk#jBWH*|;!qwv2d2g~a+4TVYg=)H>nl7lO3##dY zYPw*DAP7K;q7W_1Qq(YxBi415IZe}7W?sdQa{bh_OOU`Y>lMxT*cvsF+(>WbfRO9xk>G;!z*O|S#j62vpG*5fGn^q=Y zHaQxZU1+_2=Yy}BS6lZ4X7eWdoGM%$r1jKdeci*@PuvKbmi&?HP@nF;ME!5YCIJQ@ N@O1TaS?83{1OUM1VFv&J delta 243 zcmdnYbc$($4c7q%2EGG~S=Tx_C%UQEpYU{X46*QE+V9QP>>%K>w_9GsHKat5qpL|^ zLX3+0xqGotJ@Q*rrS<}!Ni3POPVv{?SMGb<&va?q+LY_1lY$D~s9V~+6PMX;+?E)}F!!@g zX}X@#_ty=()}?+k&zR*VCiB?h*UY77N@FKJ->LIi$NWLNh-+izyuU(;nIf)6pYNVY rja0ciPydH#XjH&bRv_{8yFvxii{C2*bNZtL7=Xaj)z4*}Q$iB}P+Mm% diff --git a/src/main/resources/assets/techreborn/textures/items/cables/insulatedhv.png b/src/main/resources/assets/techreborn/textures/items/cables/insulatedhv.png index b44707d709fdacdf9ca9048bee2259cdde2c44cd..5aff6386bc6854dfaa2b50afcad62c7af62f4025 100644 GIT binary patch delta 217 zcmX@Ww1H`Y4cC4K2EP4_7OcT46W!G7*Lk`)hFJJ7?c2z8SV5qTHE>cxf*A8jp@ZM+ zCpf*Fx3IFIF+D+NyFbhWdkEoNJ~WfD$5Wwr0#?J7-z(KHmIQ zvj9_&*Na{2u9zg;l#9s!uJpMjE5es{2CbQE1)aatyH Q4+9W*y85}Sb4q9e0JTnIod5s; delta 233 zcmVA>0JPN=701m(bYSxJfkwzzfzDYzuR5(wik4*}MFcgEmi$5rqqM{2y zP!wEwa}S`mc{2&LIPezpW)`1Gg9&XSB7dQV7Szy!8d^|83u;c)0Id;HPP#h8&~ej3V?@ zJWpxcmOkE~>pB(!^E^k7QRu$!Qr9)hIP(Vh0Oy>n>l#Y{qgj^Gw+03g zNy#9J7Mmtnh@~WSnHj&fbytVz;Kj4SyFZ)&z#wGgAR`AEImpOCMh-G^_@!*0IJO;% zx<^{wzhvhQdDY`^dH6f4tidGN+o$#eAq3LmhHYL$>c;L@ELHi_I93>i3%Iv_0=YRp zVJ0=ASYw(P`}^*LYsQ~N(jc6#?OpYrz%4_Nk%NpJWaJ!lvI6;>1s;*b z3=DjSK$uZf!>a)(C{f}XQ4*Y=R#Ki=l*&+$n3-3imzP?iV4`QBXPIMM=f}Xn$m;3h z7-HeSbkgpuRtJH$^Rt)uR4b(3vI(9Q!XC8bRCEMqRF`>(z@uIV0apD53XA6Ue@IV1 zeP)hRPz_Jb=l5?m?G|VF?=&S{;OXb%+qLd^cU;<*8@gk z_o8xf`!}r9&UkTO<{(R8sOY!aK+}ziCZhfn!fh<^ZVT!MHQWW_Zw=Zb0#1j|ujS2A@F| ZhzsPaQvxP#9oYZ?002ovPDHLkV1j&aMrZ&4 delta 262 zcmV+h0r~!d0^I_TJPL9E01|QmUS(V3kwzzf+et)0R5(w~kh=~lI&GSsCt-U80mu2C)4UyzL&$*=Eo_}ka zCLU~>hWfszFbuiUG`)tXMkK~@Om$sT5CmK*WE{sG0weyhZQG9#!(yze>HtZSgt9Dg zqbQ2r5ZktC7zQ51$FoVQEK71-mpsoS!!StK^?eIKumM(-bQR+JJ{3j5@9X&Y8=N5k zz=%X7Uz$aL;7DE9aWagKOKwAM4kjJwx}N2e zO5cCk7b+~#cDhNfG^Gm^YNx!GAro!W30Gd;VjbN0OUx3rR~gHokVY-+BDL*74>gbs zmYct!P#Mdh(89HF+75>v*lK}D9SL8tr9@>cgF=fo!g(*8G{br|cXO3I1V0}$Gh+@) zTBP0xw!yIxjyQOp$>-W%L~5;yqhVn&e_d~|-wGE7drn>!N{LSh;^Tt*Kp{*0xfDd* zaM@)PRG?26a5gG<^a+*+1&aeY6i8_sE?!q_cnSy-V@B8rPIX$tQr{Lx#fAhSuVB8< lpeH*l^!g~dZv+4U002ovPDHLkV1i&Ls9692 delta 396 zcmV;70dxM^1K|UZBnkm@Qb$4nuFf3kks%ujbN~PnbOGLGA9#^QCx22&L_t(IPo9ORSZx3JMA;Eoq!# z9>(cTam$%}We0wj|Kr?qxh4Sr;_EQTXrdVPIcvAjsHPd*?7B($hX88UsN_Ppk57@Z z&j9ga1-0BfDSu`Z>VMTW%?R0P)K3=i!p`9NV4RHfdwNILG{bWNye7P;5h`&X8R_@* zj;^7InE=#65PZS~i5&sY`SBPXBdZ<*l)@|;c|Vl23qryUf%D-hHbGV$0;r^X5HfjP zPJ2*~S|O(#kdM50V;S7;ICbWh0gcOLptJym^+1f-ASE5BCu!Z}3!^AUhPwx-r*n8O zEN2bZe?^J zG%heMIczh2P5=M_gh@m}R5(wale~}u+qfNN=CI*{wfTJRjQyf0 zbgk~M?&)8*+m%fWkOK^dLm3PP5=D_(zu(ur(P*UmtYH}HGphqoI?i}JmLLc;fEAx- zKnM(K=V;P2^|U7(GLR9A<5<`4MnisEEftvo#?a^tk|c30kcA*J{xqBN^?E4$K58{r z9We%=`lT6IW&oe{y1YH_$l|3f@1Cb(TCgOp0s|nn60PsWzYwuOCzHui1+?z~h_PO; zr@_{g4iz98lZYeHNfuA_vQ9v*8zc3B``F46S++|CM1|=-}mLF zvn|<kb7b3@aMF2T*V}G1o$tWlNtkZ)WxLX3w7OEYEZA5Btn~q