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 b5dec84a7..fa3b67a73 100644 Binary files a/src/main/resources/assets/techreborn/textures/blocks/cables/copper_cable.png and b/src/main/resources/assets/techreborn/textures/blocks/cables/copper_cable.png differ 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 407eaa2ac..bb3515dc0 100644 Binary files a/src/main/resources/assets/techreborn/textures/blocks/cables/copper_insulated_cable.png and b/src/main/resources/assets/techreborn/textures/blocks/cables/copper_insulated_cable.png differ 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 9ccdf70d7..c2dd8823f 100644 Binary files a/src/main/resources/assets/techreborn/textures/blocks/cables/gold_insulated_cable.png and b/src/main/resources/assets/techreborn/textures/blocks/cables/gold_insulated_cable.png differ 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 530d44234..84fdc2693 100644 Binary files a/src/main/resources/assets/techreborn/textures/blocks/cables/hv_cable.png and b/src/main/resources/assets/techreborn/textures/blocks/cables/hv_cable.png differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/cables/hv_insulated_cable.png b/src/main/resources/assets/techreborn/textures/blocks/cables/hv_insulated_cable.png index 1b7f2f737..3fa64115a 100644 Binary files a/src/main/resources/assets/techreborn/textures/blocks/cables/hv_insulated_cable.png and b/src/main/resources/assets/techreborn/textures/blocks/cables/hv_insulated_cable.png differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/machine_blocks/highlyadvancedmachine.png b/src/main/resources/assets/techreborn/textures/blocks/machine/machine_blocks/highlyAdvancedMachine_machine_block.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machine/machine_blocks/highlyadvancedmachine.png rename to src/main/resources/assets/techreborn/textures/blocks/machine/machine_blocks/highlyAdvancedMachine_machine_block.png diff --git a/src/main/resources/assets/techreborn/textures/items/cables/copper.png b/src/main/resources/assets/techreborn/textures/items/cables/copper.png index 65f3f432d..7b6ca0e97 100644 Binary files a/src/main/resources/assets/techreborn/textures/items/cables/copper.png and b/src/main/resources/assets/techreborn/textures/items/cables/copper.png differ 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 b57d45fdf..876e07eb5 100644 Binary files a/src/main/resources/assets/techreborn/textures/items/cables/gold.png and b/src/main/resources/assets/techreborn/textures/items/cables/gold.png differ diff --git a/src/main/resources/assets/techreborn/textures/items/cables/hv.png b/src/main/resources/assets/techreborn/textures/items/cables/hv.png index 5930de11b..b746e79c3 100644 Binary files a/src/main/resources/assets/techreborn/textures/items/cables/hv.png and b/src/main/resources/assets/techreborn/textures/items/cables/hv.png differ 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 7e1d323f5..bfaf87dbf 100644 Binary files a/src/main/resources/assets/techreborn/textures/items/cables/insulatedcopper.png and b/src/main/resources/assets/techreborn/textures/items/cables/insulatedcopper.png differ diff --git a/src/main/resources/assets/techreborn/textures/items/cables/insulatedgold.png b/src/main/resources/assets/techreborn/textures/items/cables/insulatedgold.png index 8d295f901..3704e69bd 100644 Binary files a/src/main/resources/assets/techreborn/textures/items/cables/insulatedgold.png and b/src/main/resources/assets/techreborn/textures/items/cables/insulatedgold.png differ 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 b44707d70..5aff6386b 100644 Binary files a/src/main/resources/assets/techreborn/textures/items/cables/insulatedhv.png and b/src/main/resources/assets/techreborn/textures/items/cables/insulatedhv.png differ diff --git a/src/main/resources/assets/techreborn/textures/items/cables/tin.png b/src/main/resources/assets/techreborn/textures/items/cables/tin.png index b6f890534..c3629e67a 100644 Binary files a/src/main/resources/assets/techreborn/textures/items/cables/tin.png and b/src/main/resources/assets/techreborn/textures/items/cables/tin.png differ diff --git a/src/main/resources/assets/techreborn/textures/items/part/frequencyTransmitter.png b/src/main/resources/assets/techreborn/textures/items/part/frequencyTransmitter.png new file mode 100644 index 000000000..5ad9726d4 Binary files /dev/null and b/src/main/resources/assets/techreborn/textures/items/part/frequencyTransmitter.png differ diff --git a/src/main/resources/assets/techreborn/textures/items/part/rubber.png b/src/main/resources/assets/techreborn/textures/items/part/rubber.png index 5323c26f0..dfff1d91a 100644 Binary files a/src/main/resources/assets/techreborn/textures/items/part/rubber.png and b/src/main/resources/assets/techreborn/textures/items/part/rubber.png differ diff --git a/src/main/resources/assets/techreborn/textures/items/part/rubberSap.png b/src/main/resources/assets/techreborn/textures/items/part/rubberSap.png index a275ae81b..17f4dc1eb 100644 Binary files a/src/main/resources/assets/techreborn/textures/items/part/rubberSap.png and b/src/main/resources/assets/techreborn/textures/items/part/rubberSap.png differ diff --git a/src/main/resources/assets/techreborn/textures/items/upgrade/upgradeInvertRedstone.png b/src/main/resources/assets/techreborn/textures/items/upgrade/upgradeInvertRedstone.png deleted file mode 100644 index 2c89e793e..000000000 Binary files a/src/main/resources/assets/techreborn/textures/items/upgrade/upgradeInvertRedstone.png and /dev/null differ