From 20193b562a1f88f184cc45f2907dad0ed2869d4b Mon Sep 17 00:00:00 2001 From: ProfessorProspector Date: Fri, 9 Dec 2016 17:01:19 -0800 Subject: [PATCH] Switch frequency transmitter, chainsaws, drills, and jackhammers to jsons --- .../techreborn/client/RegisterItemJsons.java | 26 +++-- .../items/ItemFrequencyTransmitter.java | 42 ++++---- .../items/tools/ItemAdvancedChainsaw.java | 9 -- .../items/tools/ItemAdvancedDrill.java | 9 -- .../items/tools/ItemAdvancedJackhammer.java | 10 -- .../techreborn/items/tools/ItemChainsaw.java | 94 ++++++------------ .../items/tools/ItemDiamondChainsaw.java | 11 +- .../items/tools/ItemDiamondDrill.java | 9 -- .../items/tools/ItemDiamondJackhammer.java | 10 -- .../techreborn/items/tools/ItemDrill.java | 46 +-------- .../items/tools/ItemJackhammer.java | 38 +------ .../items/tools/ItemSteelChainsaw.java | 10 -- .../items/tools/ItemSteelDrill.java | 10 -- .../items/tools/ItemSteelJackhammer.java | 10 -- .../models/item/frequencytransmitter.json | 14 +++ .../item/frequencytransmittercoords.json | 6 ++ .../models/item/tool/advanced_chainsaw.json | 14 +++ .../models/item/tool/advanced_drill.json | 6 ++ .../models/item/tool/advanced_jackhammer.json | 6 ++ .../models/item/tool/diamond_chainsaw.json | 14 +++ .../models/item/tool/diamond_drill.json | 6 ++ .../models/item/tool/diamond_jackhammer.json | 6 ++ .../override/advanced_chainsaw_animated.json | 6 ++ .../override/diamond_chainsaw_animated.json | 6 ++ .../override/steel_chainsaw_animated.json | 6 ++ .../models/item/tool/steel_chainsaw.json | 14 +++ .../models/item/tool/steel_drill.json | 6 ++ .../models/item/tool/steel_jackhammer.json | 6 ++ ...ncedchainsaw.png => advanced_chainsaw.png} | Bin .../items/tool/advanced_chainsaw_animated.png | Bin 0 -> 728 bytes .../advanced_chainsaw_animated.png.mcmeta | 5 + .../{advanceddrill.png => advanced_drill.png} | Bin ...jackhammer.png => advanced_jackhammer.png} | Bin ...amondchainsaw.png => diamond_chainsaw.png} | Bin .../items/tool/diamond_chainsaw_animated.png | Bin 0 -> 718 bytes .../tool/diamond_chainsaw_animated.png.mcmeta | 5 + .../{diamonddrill.png => diamond_drill.png} | Bin ...djackhammer.png => diamond_jackhammer.png} | Bin .../items/tool/frequency_transmitter.png | Bin 524 -> 494 bytes .../tool/frequency_transmitter_coords.png | Bin 0 -> 540 bytes .../{steelchainsaw.png => steel_chainsaw.png} | Bin .../items/tool/steel_chainsaw_animated.png | Bin 0 -> 735 bytes .../tool/steel_chainsaw_animated.png.mcmeta | 5 + .../tool/{steeldrill.png => steel_drill.png} | Bin ...eeljackhammer.png => steel_jackhammer.png} | Bin 45 files changed, 211 insertions(+), 254 deletions(-) create mode 100644 src/main/resources/assets/techreborn/models/item/frequencytransmitter.json create mode 100644 src/main/resources/assets/techreborn/models/item/frequencytransmittercoords.json create mode 100644 src/main/resources/assets/techreborn/models/item/tool/advanced_chainsaw.json create mode 100644 src/main/resources/assets/techreborn/models/item/tool/advanced_drill.json create mode 100644 src/main/resources/assets/techreborn/models/item/tool/advanced_jackhammer.json create mode 100644 src/main/resources/assets/techreborn/models/item/tool/diamond_chainsaw.json create mode 100644 src/main/resources/assets/techreborn/models/item/tool/diamond_drill.json create mode 100644 src/main/resources/assets/techreborn/models/item/tool/diamond_jackhammer.json create mode 100644 src/main/resources/assets/techreborn/models/item/tool/override/advanced_chainsaw_animated.json create mode 100644 src/main/resources/assets/techreborn/models/item/tool/override/diamond_chainsaw_animated.json create mode 100644 src/main/resources/assets/techreborn/models/item/tool/override/steel_chainsaw_animated.json create mode 100644 src/main/resources/assets/techreborn/models/item/tool/steel_chainsaw.json create mode 100644 src/main/resources/assets/techreborn/models/item/tool/steel_drill.json create mode 100644 src/main/resources/assets/techreborn/models/item/tool/steel_jackhammer.json rename src/main/resources/assets/techreborn/textures/items/tool/{advancedchainsaw.png => advanced_chainsaw.png} (100%) create mode 100644 src/main/resources/assets/techreborn/textures/items/tool/advanced_chainsaw_animated.png create mode 100644 src/main/resources/assets/techreborn/textures/items/tool/advanced_chainsaw_animated.png.mcmeta rename src/main/resources/assets/techreborn/textures/items/tool/{advanceddrill.png => advanced_drill.png} (100%) rename src/main/resources/assets/techreborn/textures/items/tool/{advancedjackhammer.png => advanced_jackhammer.png} (100%) rename src/main/resources/assets/techreborn/textures/items/tool/{diamondchainsaw.png => diamond_chainsaw.png} (100%) create mode 100644 src/main/resources/assets/techreborn/textures/items/tool/diamond_chainsaw_animated.png create mode 100644 src/main/resources/assets/techreborn/textures/items/tool/diamond_chainsaw_animated.png.mcmeta rename src/main/resources/assets/techreborn/textures/items/tool/{diamonddrill.png => diamond_drill.png} (100%) rename src/main/resources/assets/techreborn/textures/items/tool/{diamondjackhammer.png => diamond_jackhammer.png} (100%) create mode 100644 src/main/resources/assets/techreborn/textures/items/tool/frequency_transmitter_coords.png rename src/main/resources/assets/techreborn/textures/items/tool/{steelchainsaw.png => steel_chainsaw.png} (100%) create mode 100644 src/main/resources/assets/techreborn/textures/items/tool/steel_chainsaw_animated.png create mode 100644 src/main/resources/assets/techreborn/textures/items/tool/steel_chainsaw_animated.png.mcmeta rename src/main/resources/assets/techreborn/textures/items/tool/{steeldrill.png => steel_drill.png} (100%) rename src/main/resources/assets/techreborn/textures/items/tool/{steeljackhammer.png => steel_jackhammer.png} (100%) diff --git a/src/main/java/techreborn/client/RegisterItemJsons.java b/src/main/java/techreborn/client/RegisterItemJsons.java index ce807dda3..f95ec7594 100644 --- a/src/main/java/techreborn/client/RegisterItemJsons.java +++ b/src/main/java/techreborn/client/RegisterItemJsons.java @@ -14,16 +14,30 @@ public class RegisterItemJsons { } private static void registerItems() { - register(ModItems.reBattery, "reBattery"); - register(ModItems.lithiumBattery, "lithiumBattery"); - register(ModItems.energyCrystal, "energyCrystal"); - register(ModItems.lapotronCrystal, "lapotronCrystal"); - register(ModItems.lapotronicOrb, "lapotronicOrb"); + register(ModItems.reBattery, "rebattery"); + register(ModItems.lithiumBattery, "lithiumbattery"); + register(ModItems.energyCrystal, "energycrystal"); + register(ModItems.lapotronCrystal, "lapotroncrystal"); + register(ModItems.lapotronicOrb, "lapotronicorb"); register(ModItems.nanosaber, "nanosaber"); + + register(ModItems.frequencyTransmitter, "frequencytransmitter"); + + register(ModItems.ironDrill, "tool/steel_drill"); + register(ModItems.diamondDrill, "tool/diamond_drill"); + register(ModItems.advancedDrill, "tool/advanced_drill"); + + register(ModItems.ironChainsaw, "tool/steel_chainsaw"); + register(ModItems.diamondChainsaw, "tool/diamond_chainsaw"); + register(ModItems.advancedChainsaw, "tool/advanced_chainsaw"); + + register(ModItems.steelJackhammer, "tool/steel_jackhammer"); + register(ModItems.diamondJackhammer, "tool/diamond_jackhammer"); + register(ModItems.advancedJackhammer, "tool/advanced_jackhammer"); } private static void registerBlocks() { - register(ModBlocks.ironFence, "ironFence"); + register(ModBlocks.ironFence, "ironfence"); } private static void register(Item item, int meta, String name) { diff --git a/src/main/java/techreborn/items/ItemFrequencyTransmitter.java b/src/main/java/techreborn/items/ItemFrequencyTransmitter.java index 343a97368..393c88a92 100644 --- a/src/main/java/techreborn/items/ItemFrequencyTransmitter.java +++ b/src/main/java/techreborn/items/ItemFrequencyTransmitter.java @@ -1,20 +1,19 @@ package techreborn.items; -import me.modmuss50.jsonDestroyer.api.ITexturedItem; +import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.IItemPropertyGetter; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.ActionResult; -import net.minecraft.util.EnumActionResult; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.EnumHand; +import net.minecraft.util.*; import net.minecraft.util.math.BlockPos; import net.minecraft.util.text.TextComponentString; import net.minecraft.util.text.TextFormatting; import net.minecraft.util.text.translation.I18n; import net.minecraft.world.World; import net.minecraftforge.common.DimensionManager; -import reborncore.RebornCore; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import reborncore.client.hud.StackInfoElement; import reborncore.client.hud.StackInfoHUD; import reborncore.common.util.ChatUtils; @@ -24,16 +23,29 @@ import techreborn.config.ConfigTechReborn; import techreborn.init.ModItems; import techreborn.lib.MessageIDs; +import javax.annotation.Nullable; import java.util.List; -public class ItemFrequencyTransmitter extends ItemTextureBase implements ITexturedItem { +public class ItemFrequencyTransmitter extends ItemTRNoDestroy { public ItemFrequencyTransmitter() { setUnlocalizedName("techreborn.frequencyTransmitter"); setCreativeTab(TechRebornCreativeTabMisc.instance); setMaxStackSize(1); - RebornCore.jsonDestroyer.registerObject(this); StackInfoHUD.registerElement(new StackInfoFreqTransmitter()); + this.addPropertyOverride(new ResourceLocation("techreborn:coords"), new IItemPropertyGetter() { + @SideOnly(Side.CLIENT) + public float apply(ItemStack stack, + @Nullable + World worldIn, + @Nullable + EntityLivingBase entityIn) { + if (stack != ItemStack.EMPTY && stack.hasTagCompound() && stack.getTagCompound() != null && stack.getTagCompound().hasKey("x") && stack.getTagCompound().hasKey("y") && stack.getTagCompound().hasKey("z") && stack.getTagCompound().hasKey("dim")) { + return 1.0F; + } + return 0.0F; + } + }); } @Override @@ -89,7 +101,7 @@ public class ItemFrequencyTransmitter extends ItemTextureBase implements ITextur public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean par4) { if (ConfigTechReborn.FreqTransmitterTooltip) { - if (stack.getTagCompound() != null) { + if (stack.hasTagCompound() && stack.getTagCompound() != null && stack.getTagCompound().hasKey("x") && stack.getTagCompound().hasKey("y") && stack.getTagCompound().hasKey("z") && stack.getTagCompound().hasKey("dim")) { int x = stack.getTagCompound().getInteger("x"); int y = stack.getTagCompound().getInteger("y"); int z = stack.getTagCompound().getInteger("z"); @@ -106,16 +118,6 @@ public class ItemFrequencyTransmitter extends ItemTextureBase implements ITextur } } - @Override - public int getMaxMeta() { - return 1; - } - - @Override - public String getTextureName(int arg0) { - return "techreborn:items/tool/frequency_transmitter"; - } - public static class StackInfoFreqTransmitter extends StackInfoElement { public StackInfoFreqTransmitter() { super(ModItems.frequencyTransmitter); @@ -127,7 +129,7 @@ public class ItemFrequencyTransmitter extends ItemTextureBase implements ITextur Color gold = Color.GOLD; Color grey = Color.GRAY; if (stack.getItem() instanceof ItemFrequencyTransmitter) { - if (stack.getTagCompound() != null && stack.getTagCompound().hasKey("x") && stack.getTagCompound().hasKey("y") && stack.getTagCompound().hasKey("z") && stack.getTagCompound().hasKey("dim")) { + if (stack.hasTagCompound() && stack.getTagCompound() != null && stack.getTagCompound().hasKey("x") && stack.getTagCompound().hasKey("y") && stack.getTagCompound().hasKey("z") && stack.getTagCompound().hasKey("dim")) { int coordX = stack.getTagCompound().getInteger("x"); int coordY = stack.getTagCompound().getInteger("y"); int coordZ = stack.getTagCompound().getInteger("z"); diff --git a/src/main/java/techreborn/items/tools/ItemAdvancedChainsaw.java b/src/main/java/techreborn/items/tools/ItemAdvancedChainsaw.java index 57c77dce7..764449bd6 100644 --- a/src/main/java/techreborn/items/tools/ItemAdvancedChainsaw.java +++ b/src/main/java/techreborn/items/tools/ItemAdvancedChainsaw.java @@ -38,13 +38,4 @@ public class ItemAdvancedChainsaw extends ItemChainsaw { return Items.DIAMOND_AXE.canHarvestBlock(blockIn); } - @Override - public String getTextureName(int damage) { - return "techreborn:items/tool/advancedChainsaw"; - } - - @Override - public int getMaxMeta() { - return 1; - } } diff --git a/src/main/java/techreborn/items/tools/ItemAdvancedDrill.java b/src/main/java/techreborn/items/tools/ItemAdvancedDrill.java index 79dc60a06..c3cbef4c2 100644 --- a/src/main/java/techreborn/items/tools/ItemAdvancedDrill.java +++ b/src/main/java/techreborn/items/tools/ItemAdvancedDrill.java @@ -38,13 +38,4 @@ public class ItemAdvancedDrill extends ItemDrill { return Items.DIAMOND_PICKAXE.canHarvestBlock(blockIn) || Items.DIAMOND_SHOVEL.canHarvestBlock(blockIn); } - @Override - public String getTextureName(int damage) { - return "techreborn:items/tool/advancedDrill"; - } - - @Override - public int getMaxMeta() { - return 1; - } } diff --git a/src/main/java/techreborn/items/tools/ItemAdvancedJackhammer.java b/src/main/java/techreborn/items/tools/ItemAdvancedJackhammer.java index 4bf47058e..ade1f0ce5 100644 --- a/src/main/java/techreborn/items/tools/ItemAdvancedJackhammer.java +++ b/src/main/java/techreborn/items/tools/ItemAdvancedJackhammer.java @@ -31,14 +31,4 @@ public class ItemAdvancedJackhammer extends ItemJackhammer { itemList.add(uncharged); itemList.add(charged); } - - @Override - public String getTextureName(int damage) { - return "techreborn:items/tool/advancedJackhammer"; - } - - @Override - public int getMaxMeta() { - return 1; - } } diff --git a/src/main/java/techreborn/items/tools/ItemChainsaw.java b/src/main/java/techreborn/items/tools/ItemChainsaw.java index 2fa133fd3..573641f89 100644 --- a/src/main/java/techreborn/items/tools/ItemChainsaw.java +++ b/src/main/java/techreborn/items/tools/ItemChainsaw.java @@ -1,28 +1,26 @@ package techreborn.items.tools; -import me.modmuss50.jsonDestroyer.api.IHandHeld; -import me.modmuss50.jsonDestroyer.api.ITexturedItem; -import net.minecraft.client.renderer.block.model.ModelResourceLocation; +import net.minecraft.block.state.IBlockState; +import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.Enchantments; +import net.minecraft.item.IItemPropertyGetter; import net.minecraft.item.ItemAxe; import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumActionResult; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.EnumHand; +import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import reborncore.RebornCore; import reborncore.api.power.IEnergyItemInfo; import reborncore.common.powerSystem.PowerSystem; import reborncore.common.powerSystem.PoweredItem; -import reborncore.common.util.TorchHelper; import techreborn.client.TechRebornCreativeTab; -import techreborn.lib.ModInfo; -public class ItemChainsaw extends ItemAxe implements IEnergyItemInfo, ITexturedItem, IHandHeld { +import javax.annotation.Nullable; +import java.util.Random; + +public class ItemChainsaw extends ItemAxe implements IEnergyItemInfo { public static int tier = 1; public int maxCharge = 1; @@ -36,12 +34,24 @@ public class ItemChainsaw extends ItemAxe implements IEnergyItemInfo, ITexturedI efficiencyOnProperMaterial = 20F; setCreativeTab(TechRebornCreativeTab.instance); setMaxStackSize(1); - setMaxDamage(240); setUnlocalizedName(unlocalizedName); - RebornCore.jsonDestroyer.registerObject(this); this.maxCharge = energyCapacity; this.tier = tier; this.unpoweredSpeed = unpoweredSpeed; + + this.addPropertyOverride(new ResourceLocation("techreborn:animated"), new IItemPropertyGetter() { + @SideOnly(Side.CLIENT) + public float apply(ItemStack stack, + @Nullable + World worldIn, + @Nullable + EntityLivingBase entityIn) { + if (stack != ItemStack.EMPTY && PoweredItem.canUseEnergy(cost, stack) && entityIn != null && entityIn.getHeldItemMainhand().isItemEqual(stack)) { + return 1.0F; + } + return 0.0F; + } + }); } @Override @@ -49,45 +59,19 @@ public class ItemChainsaw extends ItemAxe implements IEnergyItemInfo, ITexturedI return PowerSystem.getDisplayPower().colour; } - // @Override - // public boolean onBlockDestroyed(ItemStack stack, World worldIn, - // IBlockState blockIn, BlockPos pos, EntityLivingBase entityLiving) { - // Random rand = new Random(); - // if - // (rand.nextInt(EnchantmentHelper.getEnchantmentLevel(Enchantment.unbreaking.effectId, - // stack) + 1) == 0) { - // PoweredItem.useEnergy(cost, stack); - // } - // return true; - // } - - // @Override - // public float getDigSpeed(ItemStack stack, IBlockState state) { - // if (!PoweredItem.canUseEnergy(cost, stack)) { - // return unpoweredSpeed; - // } - // - // if (OreDictUtils.isOre(state, "treeLeaves") && - // PoweredItem.canUseEnergy(cost, stack)) { - // return 40F; - // } - // - // if (Items.wooden_axe.getDigSpeed(stack, state) > 1.0F) { - // return efficiencyOnProperMaterial; - // } else { - // return super.getDigSpeed(stack, state); - // } - // } - @Override - public boolean hitEntity(ItemStack itemstack, EntityLivingBase entityliving, EntityLivingBase entityliving1) { + public boolean onBlockDestroyed(ItemStack stack, World worldIn, IBlockState blockIn, BlockPos pos, + EntityLivingBase entityLiving) { + Random rand = new Random(); + if (rand.nextInt(EnchantmentHelper.getEnchantmentLevel(Enchantments.UNBREAKING, stack) + 1) == 0) { + PoweredItem.useEnergy(cost, stack); + } return true; } @Override - public EnumActionResult onItemUse(EntityPlayer playerIn, World worldIn, BlockPos pos, - EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ) { - return TorchHelper.placeTorch(playerIn.getHeldItem(hand), playerIn, worldIn, pos, facing, hitX, hitY, hitZ, hand); + public boolean hitEntity(ItemStack itemstack, EntityLivingBase entityliving, EntityLivingBase entityliving1) { + return true; } @Override @@ -131,20 +115,4 @@ public class ItemChainsaw extends ItemAxe implements IEnergyItemInfo, ITexturedI public boolean showDurabilityBar(ItemStack stack) { return true; } - - @Override - public String getTextureName(int damage) { - return "techreborn:items/tool/nullChainsaw"; - } - - @Override - public int getMaxMeta() { - return 1; - } - - @Override - @SideOnly(Side.CLIENT) - public ModelResourceLocation getModel(ItemStack stack, EntityPlayer player, int useRemaining) { - return new ModelResourceLocation(ModInfo.MOD_ID + ":" + getUnlocalizedName(stack).substring(5), "inventory"); - } } diff --git a/src/main/java/techreborn/items/tools/ItemDiamondChainsaw.java b/src/main/java/techreborn/items/tools/ItemDiamondChainsaw.java index ef3681cdd..51baefaf6 100644 --- a/src/main/java/techreborn/items/tools/ItemDiamondChainsaw.java +++ b/src/main/java/techreborn/items/tools/ItemDiamondChainsaw.java @@ -20,7 +20,6 @@ public class ItemDiamondChainsaw extends ItemChainsaw { this.cost = 250; } - @SuppressWarnings({ "rawtypes", "unchecked" }) @SideOnly(Side.CLIENT) public void getSubItems(Item item, @@ -33,18 +32,10 @@ public class ItemDiamondChainsaw extends ItemChainsaw { itemList.add(uncharged); itemList.add(charged); } + @Override public boolean canHarvestBlock(IBlockState blockIn) { return Items.DIAMOND_AXE.canHarvestBlock(blockIn); } - @Override - public String getTextureName(int damage) { - return "techreborn:items/tool/diamondChainsaw"; - } - - @Override - public int getMaxMeta() { - return 1; - } } diff --git a/src/main/java/techreborn/items/tools/ItemDiamondDrill.java b/src/main/java/techreborn/items/tools/ItemDiamondDrill.java index 7aa587708..2a355e1c6 100644 --- a/src/main/java/techreborn/items/tools/ItemDiamondDrill.java +++ b/src/main/java/techreborn/items/tools/ItemDiamondDrill.java @@ -38,13 +38,4 @@ public class ItemDiamondDrill extends ItemDrill { return Items.DIAMOND_PICKAXE.canHarvestBlock(state) || Items.DIAMOND_SHOVEL.canHarvestBlock(state); } - @Override - public String getTextureName(int damage) { - return "techreborn:items/tool/diamondDrill"; - } - - @Override - public int getMaxMeta() { - return 1; - } } diff --git a/src/main/java/techreborn/items/tools/ItemDiamondJackhammer.java b/src/main/java/techreborn/items/tools/ItemDiamondJackhammer.java index 73a9f3474..76b2ca6a0 100644 --- a/src/main/java/techreborn/items/tools/ItemDiamondJackhammer.java +++ b/src/main/java/techreborn/items/tools/ItemDiamondJackhammer.java @@ -31,14 +31,4 @@ public class ItemDiamondJackhammer extends ItemJackhammer { itemList.add(uncharged); itemList.add(charged); } - - @Override - public String getTextureName(int damage) { - return "techreborn:items/tool/diamondJackhammer"; - } - - @Override - public int getMaxMeta() { - return 1; - } } diff --git a/src/main/java/techreborn/items/tools/ItemDrill.java b/src/main/java/techreborn/items/tools/ItemDrill.java index b34b1e7ae..66f6aaa11 100644 --- a/src/main/java/techreborn/items/tools/ItemDrill.java +++ b/src/main/java/techreborn/items/tools/ItemDrill.java @@ -1,37 +1,22 @@ package techreborn.items.tools; -import me.modmuss50.jsonDestroyer.api.IHandHeld; -import me.modmuss50.jsonDestroyer.api.ITexturedItem; import net.minecraft.block.state.IBlockState; -import net.minecraft.client.renderer.block.model.ModelResourceLocation; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.enchantment.Enchantment; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.Enchantments; import net.minecraft.init.Items; -import net.minecraft.item.Item; import net.minecraft.item.ItemPickaxe; import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumActionResult; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.EnumHand; -import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; -import reborncore.RebornCore; import reborncore.api.power.IEnergyItemInfo; import reborncore.common.powerSystem.PowerSystem; import reborncore.common.powerSystem.PoweredItem; -import reborncore.common.util.TorchHelper; import techreborn.client.TechRebornCreativeTab; -import techreborn.lib.ModInfo; import java.util.Random; -public class ItemDrill extends ItemPickaxe implements IEnergyItemInfo, ITexturedItem, IHandHeld { +public class ItemDrill extends ItemPickaxe implements IEnergyItemInfo { public static int tier = 1; public int maxCharge = 1; @@ -44,9 +29,7 @@ public class ItemDrill extends ItemPickaxe implements IEnergyItemInfo, ITextured this.efficiencyOnProperMaterial = efficiencyOnProperMaterial; setCreativeTab(TechRebornCreativeTab.instance); setMaxStackSize(1); - setMaxDamage(240); setUnlocalizedName(unlocalizedName); - RebornCore.jsonDestroyer.registerObject(this); this.maxCharge = energyCapacity; this.tier = tier; this.unpoweredSpeed = unpoweredSpeed; @@ -61,7 +44,7 @@ public class ItemDrill extends ItemPickaxe implements IEnergyItemInfo, ITextured public boolean onBlockDestroyed(ItemStack stack, World worldIn, IBlockState blockIn, BlockPos pos, EntityLivingBase entityLiving) { Random rand = new Random(); - if (rand.nextInt(EnchantmentHelper.getEnchantmentLevel(Enchantment.getEnchantmentByID(34), stack) + 1) == 0) { + if (rand.nextInt(EnchantmentHelper.getEnchantmentLevel(Enchantments.UNBREAKING, stack) + 1) == 0) { PoweredItem.useEnergy(cost, stack); } return true; @@ -86,12 +69,6 @@ public class ItemDrill extends ItemPickaxe implements IEnergyItemInfo, ITextured return true; } - @Override - public EnumActionResult onItemUse(EntityPlayer playerIn, World worldIn, BlockPos pos, - EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ) { - return TorchHelper.placeTorch(playerIn.getHeldItem(hand), playerIn, worldIn, pos, facing, hitX, hitY, hitZ, hand); - } - @Override public boolean isRepairable() { return false; @@ -133,21 +110,4 @@ public class ItemDrill extends ItemPickaxe implements IEnergyItemInfo, ITextured public boolean showDurabilityBar(ItemStack stack) { return true; } - - @Override - public String getTextureName(int damage) { - return "techreborn:items/tool/nullDrill"; - } - - @Override - public int getMaxMeta() { - return 1; - } - - @Override - @SideOnly(Side.CLIENT) - public ModelResourceLocation getModel(ItemStack stack, EntityPlayer player, - int useRemaining) { - return new ModelResourceLocation(ModInfo.MOD_ID + ":" + getUnlocalizedName(stack).substring(5), "inventory"); - } } diff --git a/src/main/java/techreborn/items/tools/ItemJackhammer.java b/src/main/java/techreborn/items/tools/ItemJackhammer.java index 15ac00622..622cc3417 100644 --- a/src/main/java/techreborn/items/tools/ItemJackhammer.java +++ b/src/main/java/techreborn/items/tools/ItemJackhammer.java @@ -1,21 +1,14 @@ package techreborn.items.tools; -import me.modmuss50.jsonDestroyer.api.IHandHeld; -import me.modmuss50.jsonDestroyer.api.ITexturedItem; import net.minecraft.block.state.IBlockState; -import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.enchantment.Enchantment; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; +import net.minecraft.init.Enchantments; import net.minecraft.item.Item; import net.minecraft.item.ItemPickaxe; import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumActionResult; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; @@ -24,15 +17,13 @@ import reborncore.RebornCore; import reborncore.api.power.IEnergyItemInfo; import reborncore.common.powerSystem.PowerSystem; import reborncore.common.powerSystem.PoweredItem; -import reborncore.common.util.TorchHelper; import techreborn.client.TechRebornCreativeTab; -import techreborn.lib.ModInfo; import techreborn.utils.OreDictUtils; import java.util.List; import java.util.Random; -public class ItemJackhammer extends ItemPickaxe implements IEnergyItemInfo, ITexturedItem, IHandHeld { +public class ItemJackhammer extends ItemPickaxe implements IEnergyItemInfo { public static int tier = 1; public int maxCharge = 1; @@ -46,7 +37,6 @@ public class ItemJackhammer extends ItemPickaxe implements IEnergyItemInfo, ITex setMaxStackSize(1); setMaxDamage(240); setUnlocalizedName(unlocalizedName); - RebornCore.jsonDestroyer.registerObject(this); this.maxCharge = energyCapacity; this.tier = tier; } @@ -60,7 +50,7 @@ public class ItemJackhammer extends ItemPickaxe implements IEnergyItemInfo, ITex public boolean onBlockDestroyed(ItemStack stack, World worldIn, IBlockState blockIn, BlockPos pos, EntityLivingBase entityLiving) { Random rand = new Random(); - if (rand.nextInt(EnchantmentHelper.getEnchantmentLevel(Enchantment.getEnchantmentByID(34), stack) + 1) == 0) { + if (rand.nextInt(EnchantmentHelper.getEnchantmentLevel(Enchantments.UNBREAKING, stack) + 1) == 0) { PoweredItem.useEnergy(cost, stack); } return true; @@ -86,12 +76,6 @@ public class ItemJackhammer extends ItemPickaxe implements IEnergyItemInfo, ITex return true; } - @Override - public EnumActionResult onItemUse(EntityPlayer playerIn, World worldIn, BlockPos pos, - EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ) { - return TorchHelper.placeTorch(playerIn.getHeldItem(hand), playerIn, worldIn, pos, facing, hitX, hitY, hitZ, hand); - } - @Override public boolean isRepairable() { return false; @@ -147,20 +131,4 @@ public class ItemJackhammer extends ItemPickaxe implements IEnergyItemInfo, ITex public boolean showDurabilityBar(ItemStack stack) { return true; } - - @Override - public String getTextureName(int damage) { - return "techreborn:items/tool/nullJackhammer"; - } - - @Override - public int getMaxMeta() { - return 1; - } - - @Override - @SideOnly(Side.CLIENT) - public ModelResourceLocation getModel(ItemStack stack, EntityPlayer player, int useRemaining) { - return new ModelResourceLocation(ModInfo.MOD_ID + ":" + getUnlocalizedName(stack).substring(5), "inventory"); - } } diff --git a/src/main/java/techreborn/items/tools/ItemSteelChainsaw.java b/src/main/java/techreborn/items/tools/ItemSteelChainsaw.java index 80f5f9c70..60f83ed22 100644 --- a/src/main/java/techreborn/items/tools/ItemSteelChainsaw.java +++ b/src/main/java/techreborn/items/tools/ItemSteelChainsaw.java @@ -37,14 +37,4 @@ public class ItemSteelChainsaw extends ItemChainsaw { public boolean canHarvestBlock(IBlockState state) { return Items.IRON_AXE.canHarvestBlock(state); } - - @Override - public String getTextureName(int damage) { - return "techreborn:items/tool/steelChainsaw"; - } - - @Override - public int getMaxMeta() { - return 1; - } } diff --git a/src/main/java/techreborn/items/tools/ItemSteelDrill.java b/src/main/java/techreborn/items/tools/ItemSteelDrill.java index 8daaffbf4..4ed709300 100644 --- a/src/main/java/techreborn/items/tools/ItemSteelDrill.java +++ b/src/main/java/techreborn/items/tools/ItemSteelDrill.java @@ -37,14 +37,4 @@ public class ItemSteelDrill extends ItemDrill { public boolean canHarvestBlock(IBlockState state) { return Items.IRON_PICKAXE.canHarvestBlock(state) || Items.IRON_SHOVEL.canHarvestBlock(state); } - - @Override - public String getTextureName(int damage) { - return "techreborn:items/tool/steelDrill"; - } - - @Override - public int getMaxMeta() { - return 1; - } } diff --git a/src/main/java/techreborn/items/tools/ItemSteelJackhammer.java b/src/main/java/techreborn/items/tools/ItemSteelJackhammer.java index 18b3637ac..4906ded69 100644 --- a/src/main/java/techreborn/items/tools/ItemSteelJackhammer.java +++ b/src/main/java/techreborn/items/tools/ItemSteelJackhammer.java @@ -31,14 +31,4 @@ public class ItemSteelJackhammer extends ItemJackhammer { itemList.add(uncharged); itemList.add(charged); } - - @Override - public String getTextureName(int damage) { - return "techreborn:items/tool/steelJackhammer"; - } - - @Override - public int getMaxMeta() { - return 1; - } } diff --git a/src/main/resources/assets/techreborn/models/item/frequencytransmitter.json b/src/main/resources/assets/techreborn/models/item/frequencytransmitter.json new file mode 100644 index 000000000..d8ea1a7c3 --- /dev/null +++ b/src/main/resources/assets/techreborn/models/item/frequencytransmitter.json @@ -0,0 +1,14 @@ +{ + "parent": "techreborn:item/techrebornItem", + "textures": { + "layer0": "techreborn:items/tool/frequency_transmitter" + }, + "overrides": [ + { + "predicate": { + "techreborn:coords": 1 + }, + "model": "techreborn:item/frequencytransmittercoords" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/item/frequencytransmittercoords.json b/src/main/resources/assets/techreborn/models/item/frequencytransmittercoords.json new file mode 100644 index 000000000..8ba9d62c6 --- /dev/null +++ b/src/main/resources/assets/techreborn/models/item/frequencytransmittercoords.json @@ -0,0 +1,6 @@ +{ + "parent": "techreborn:item/techrebornItem", + "textures": { + "layer0": "techreborn:items/tool/frequency_transmitter_coords" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/item/tool/advanced_chainsaw.json b/src/main/resources/assets/techreborn/models/item/tool/advanced_chainsaw.json new file mode 100644 index 000000000..5323ff287 --- /dev/null +++ b/src/main/resources/assets/techreborn/models/item/tool/advanced_chainsaw.json @@ -0,0 +1,14 @@ +{ + "parent": "techreborn:item/techrebornItem", + "textures": { + "layer0": "techreborn:items/tool/advanced_chainsaw" + }, + "overrides": [ + { + "predicate": { + "techreborn:animated": 1 + }, + "model": "techreborn:item/tool/override/advanced_chainsaw_animated" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/item/tool/advanced_drill.json b/src/main/resources/assets/techreborn/models/item/tool/advanced_drill.json new file mode 100644 index 000000000..8a91f7db5 --- /dev/null +++ b/src/main/resources/assets/techreborn/models/item/tool/advanced_drill.json @@ -0,0 +1,6 @@ +{ + "parent": "techreborn:item/techrebornItem", + "textures": { + "layer0": "techreborn:items/tool/advanced_drill" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/item/tool/advanced_jackhammer.json b/src/main/resources/assets/techreborn/models/item/tool/advanced_jackhammer.json new file mode 100644 index 000000000..f8b7a7582 --- /dev/null +++ b/src/main/resources/assets/techreborn/models/item/tool/advanced_jackhammer.json @@ -0,0 +1,6 @@ +{ + "parent": "techreborn:item/techrebornItem", + "textures": { + "layer0": "techreborn:items/tool/advanced_jackhammer" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/item/tool/diamond_chainsaw.json b/src/main/resources/assets/techreborn/models/item/tool/diamond_chainsaw.json new file mode 100644 index 000000000..44eb57883 --- /dev/null +++ b/src/main/resources/assets/techreborn/models/item/tool/diamond_chainsaw.json @@ -0,0 +1,14 @@ +{ + "parent": "techreborn:item/techrebornItem", + "textures": { + "layer0": "techreborn:items/tool/diamond_chainsaw" + }, + "overrides": [ + { + "predicate": { + "techreborn:animated": 1 + }, + "model": "techreborn:item/tool/override/diamond_chainsaw_animated" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/item/tool/diamond_drill.json b/src/main/resources/assets/techreborn/models/item/tool/diamond_drill.json new file mode 100644 index 000000000..abeeb62e7 --- /dev/null +++ b/src/main/resources/assets/techreborn/models/item/tool/diamond_drill.json @@ -0,0 +1,6 @@ +{ + "parent": "techreborn:item/techrebornItem", + "textures": { + "layer0": "techreborn:items/tool/diamond_drill" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/item/tool/diamond_jackhammer.json b/src/main/resources/assets/techreborn/models/item/tool/diamond_jackhammer.json new file mode 100644 index 000000000..cbf2a7d7c --- /dev/null +++ b/src/main/resources/assets/techreborn/models/item/tool/diamond_jackhammer.json @@ -0,0 +1,6 @@ +{ + "parent": "techreborn:item/techrebornItem", + "textures": { + "layer0": "techreborn:items/tool/diamond_jackhammer" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/item/tool/override/advanced_chainsaw_animated.json b/src/main/resources/assets/techreborn/models/item/tool/override/advanced_chainsaw_animated.json new file mode 100644 index 000000000..09d33debb --- /dev/null +++ b/src/main/resources/assets/techreborn/models/item/tool/override/advanced_chainsaw_animated.json @@ -0,0 +1,6 @@ +{ + "parent": "techreborn:item/techrebornItem", + "textures": { + "layer0": "techreborn:items/tool/advanced_chainsaw_animated" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/item/tool/override/diamond_chainsaw_animated.json b/src/main/resources/assets/techreborn/models/item/tool/override/diamond_chainsaw_animated.json new file mode 100644 index 000000000..c06e0a187 --- /dev/null +++ b/src/main/resources/assets/techreborn/models/item/tool/override/diamond_chainsaw_animated.json @@ -0,0 +1,6 @@ +{ + "parent": "techreborn:item/techrebornItem", + "textures": { + "layer0": "techreborn:items/tool/diamond_chainsaw_animated" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/item/tool/override/steel_chainsaw_animated.json b/src/main/resources/assets/techreborn/models/item/tool/override/steel_chainsaw_animated.json new file mode 100644 index 000000000..875f63f10 --- /dev/null +++ b/src/main/resources/assets/techreborn/models/item/tool/override/steel_chainsaw_animated.json @@ -0,0 +1,6 @@ +{ + "parent": "techreborn:item/techrebornItem", + "textures": { + "layer0": "techreborn:items/tool/steel_chainsaw_animated" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/item/tool/steel_chainsaw.json b/src/main/resources/assets/techreborn/models/item/tool/steel_chainsaw.json new file mode 100644 index 000000000..0b69812cb --- /dev/null +++ b/src/main/resources/assets/techreborn/models/item/tool/steel_chainsaw.json @@ -0,0 +1,14 @@ +{ + "parent": "techreborn:item/techrebornItem", + "textures": { + "layer0": "techreborn:items/tool/steel_chainsaw" + }, + "overrides": [ + { + "predicate": { + "techreborn:animated": 1 + }, + "model": "techreborn:item/tool/override/steel_chainsaw_animated" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/item/tool/steel_drill.json b/src/main/resources/assets/techreborn/models/item/tool/steel_drill.json new file mode 100644 index 000000000..8765919d0 --- /dev/null +++ b/src/main/resources/assets/techreborn/models/item/tool/steel_drill.json @@ -0,0 +1,6 @@ +{ + "parent": "techreborn:item/techrebornItem", + "textures": { + "layer0": "techreborn:items/tool/steel_drill" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/item/tool/steel_jackhammer.json b/src/main/resources/assets/techreborn/models/item/tool/steel_jackhammer.json new file mode 100644 index 000000000..7f0b7d3d5 --- /dev/null +++ b/src/main/resources/assets/techreborn/models/item/tool/steel_jackhammer.json @@ -0,0 +1,6 @@ +{ + "parent": "techreborn:item/techrebornItem", + "textures": { + "layer0": "techreborn:items/tool/steel_jackhammer" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/textures/items/tool/advancedchainsaw.png b/src/main/resources/assets/techreborn/textures/items/tool/advanced_chainsaw.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/tool/advancedchainsaw.png rename to src/main/resources/assets/techreborn/textures/items/tool/advanced_chainsaw.png diff --git a/src/main/resources/assets/techreborn/textures/items/tool/advanced_chainsaw_animated.png b/src/main/resources/assets/techreborn/textures/items/tool/advanced_chainsaw_animated.png new file mode 100644 index 0000000000000000000000000000000000000000..1df9e1eb87ea388312ac71b830e61f53281d93e5 GIT binary patch literal 728 zcmV;}0w?{6P)N2bZe?^J zG%heMF)*zP3cvsW0#!*wK~zXfy;RLl6G0s1W+0xqHCiFH0ZEILY>QMN0`-F~+oX^X zsUA#>Uc7O@sDKK}mmhH9VxmYzB*sLVVB4twfLahuG=#ET@DEV9KKD1x4Bd9KY#Za@ z&Hi>~-h029?7k9JRV`z7_ZM>KbT9j%c`X6&*iE!dkHCGqkBJ#>%msHoF*%6kjSakB z`;O$+7NpS|FeK!HoPFcB5Z~Oy{FfC>B|hNokDq9IeAirnJJ;X4u94GNT>XZJ%kS|r zwaPll>%ie~fWY6$nc61jg_WbY5 zj^j&lMt+x07CiCpc!fQmX9l^zB2pEGBsXKZ~P%~Qh&Y0li3 zk!4vHtvjV2gnK{2A6!IBC7@e!q<8UQt%o4 zU2n8bI^h}VXJ_U_AwUC>$w}&Z1&{m$#~ZsbQ&t9-H-xHFgWB3TMtuHz&zVCMN8CZU zlxfsRofs-Dh0}c+j;4Op^~`Ak!8{^|C`iD2c>z_*12}8j*t52G)|5;TMTNHUP<1;z zSE4wo+(-S@7qGj|>c{{@%^`{d2g_L(cGnqpABT?x@|;Zttl*yr(C3{!r`uo#`mso$ zs661#Mdbl^E-DYWbJ2M~0%mzY>pF5Fc|bpw5Fm0Pc|b%86XF(}2NWhGKzoIN)jVL% zSz*EiXt0t8{LI;8AwbwK4~)WuAd3Hz2SyNul{_$l;iPq_C4T{~Qu-8lNS50G0000< KMNUMnLSTab&OhY< literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/techreborn/textures/items/tool/advanced_chainsaw_animated.png.mcmeta b/src/main/resources/assets/techreborn/textures/items/tool/advanced_chainsaw_animated.png.mcmeta new file mode 100644 index 000000000..97596ba81 --- /dev/null +++ b/src/main/resources/assets/techreborn/textures/items/tool/advanced_chainsaw_animated.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation":{ + "frametime":2 + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/textures/items/tool/advanceddrill.png b/src/main/resources/assets/techreborn/textures/items/tool/advanced_drill.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/tool/advanceddrill.png rename to src/main/resources/assets/techreborn/textures/items/tool/advanced_drill.png diff --git a/src/main/resources/assets/techreborn/textures/items/tool/advancedjackhammer.png b/src/main/resources/assets/techreborn/textures/items/tool/advanced_jackhammer.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/tool/advancedjackhammer.png rename to src/main/resources/assets/techreborn/textures/items/tool/advanced_jackhammer.png diff --git a/src/main/resources/assets/techreborn/textures/items/tool/diamondchainsaw.png b/src/main/resources/assets/techreborn/textures/items/tool/diamond_chainsaw.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/tool/diamondchainsaw.png rename to src/main/resources/assets/techreborn/textures/items/tool/diamond_chainsaw.png diff --git a/src/main/resources/assets/techreborn/textures/items/tool/diamond_chainsaw_animated.png b/src/main/resources/assets/techreborn/textures/items/tool/diamond_chainsaw_animated.png new file mode 100644 index 0000000000000000000000000000000000000000..b3429441b955cb80f3f57d3d4650fb1907d76a6f GIT binary patch literal 718 zcmV;<0x|uGP)N2bZe?^J zG%heMF)*zP3cvsW0!v9mK~zXf;ar(U@qUY7wb% zVbZX$M$=#-sUP@(5zz?5U}D@LE{Gosf}}nRF1j&BnraOu1;0qtKcH@pb0(Q*U;9$} zx^;2h+_`toJ$IVUsRB?oCja~ti!o=|tOb8oL(A}aw2cqJcDY}q%50#Ncip-K?Mn_b zOIa+eeunEt+?-GdD!Xr9!2GurJkBg)BALMR+!9(xubLASl(O^s0Fqyq@$5qeceOb@ zdABGgSuUO+5D0)!dn$8mDnEUn##mw&)9E*uU;Tu$_a_j{Xhw1@7DFTwf!FJmO*kU& zOvTZ;8A*OAlzn%u$oiw-KmL*9@wikc`DB|7N1gQuyBfru-^x34O{{!`f9#r6CXbNh zXf&#i9`S8MZZeG2Ue8*nNVWy?qeLejiQ;{djT4 zi`N6~=xuI*W9XbgS#Q7($y7?6+Kt&hH%{zz<6cb-!W|BbcWp;V)Oc>{*LS(*Ll2HP zH)A?vN3XvLgVogtdKxjZZwr#gThJqF>Rci8fDKZ|TJdoI4jgbb%2n%bE=eZzpvP5@ zPTNK-bb9cheJfrCJveNy6{TWQKJ;M2`gL-OLrt{^+3V1?bCXCH6AEFPv;xy)De&)| zzc&<1K|QRB{D4po%d#IR<%;}(pmN22K$P+W)(vDUexM$fPPXC)WKoG_EK9{xFS%0KU7lQb|2v|e{>BPcL zBw(9HM6gjp8bJ^ggpf4)dEVs>>~X??=M_IlX5YS@eX|C@TUxCaYScBgXt5hVHkeMQ z-1I+#@pw$o>2%QV_rdSsa40+;kFOd-to~(lEh5-%x5)DxS(f2=JPPae8l%yO7@`_@ zo=33X@8#s{^?!;+qk(q2{Wk;K{^4-IVzI#Oc0;q-L=;8XY&Piidc+Xbpxf;dF*u*k zVo(%?K!d?xKnzh0Yz8!#&*!*YEyXK0Vn-=m{?@tv=9HB$czFl_0000< KMNUMnLSTZXcgfZO delta 498 zcmVnc767CN8ZD3vtr`i+_N_?}eE9Cw;e^K(o^BJ}_F-!`$=>kZ$@ zg)ac?u5STwaaqHXa)iM5^Jp5t`N=8w{XR=u>umr2#gvo-^}@ec-vplL0dRZMVlJ7) zvMlyC3K%IlJ3hjlnHj&vd_E6gj5H{v00_G-UiXg2-fN|u((42O)oPVOph(IoV9>YT ou_iu^OeSL-#{m$Hq)$ diff --git a/src/main/resources/assets/techreborn/textures/items/tool/frequency_transmitter_coords.png b/src/main/resources/assets/techreborn/textures/items/tool/frequency_transmitter_coords.png new file mode 100644 index 0000000000000000000000000000000000000000..2ff7d1addd451705e925e68cf610ceba780a1a9a GIT binary patch literal 540 zcmV+%0^|LOP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!2kdb!2!6DYwZ9400(qQO+^Rb1rQ1k z0LW(W)Bpeg8FWQhbW?9;ba!ELWdLwtX>N2bZe?^JG%heMF)*zP3cvsW0eMM8K~y+T zozl-r!$1%Q@bxHyZ{eE=^;~-CL8u}0PZHA{l;WWWp@xD`C>lg52)2|qhl)_OB}Eib zjOL^UALnytWyQjP=-~&+WcJIlvjV`cGMNk{_8VK&^uj*}h!eH=e*uo;5SXTka=8q8 zwk%6o$LfM4i0+?TESm@hg8@d-6k&9Y;q=R4rvuxzi6Cr1p->>`U7W*mT})nLEauj* zyt#qBvks~_69R3U<}0s0ImV7J-C}Y=B`H1gG7uJj4i*JcGOUSKNH0XdVaH zsnv)eYyj~*kHFn>VOpl*ZM(1>IZ8+FQ2Nh-$1krLa>7UMWp(`dKbXfzt2gQWxJdfB2zcY=08 e7mWK3KzsrN3z6iJzno_P0000N2bZe?^J zG%heMF)*zP3cvsW0$fQ%K~zXf<&?{BQb82P*_k%+4{)okZM14FZLtJvZ9_CBnidsW zOTm-^tr0>)+!!|95h99lW3+YQvsWG=kp(K2$E}GgH}1ONU-`V>By+>#27#@MFEe-M z{LVRZC-a#AbftQ|Zc_F?fn%c#gIgtobJ+|6em|C7E`-Bjk<1Wi6oaxF$kDU5hD!MW zg)asCJXG;uYs(mtl9ivQp26qyL9JDh$z+g9rBEyu;c_~SK`FM(1YVB^wQ2?Vd>+YU z64`84>!b|d`g${9x7$I2_@ne4!C(+? z_ICB_6mTdM(pwMAp2N{wH`JX4{7zhhYjRjrW;I#4taa6tK(@W9!GE6KM(NQkB91wH z-L~P^<9V!3kAgpvXO^IzfK>^zk{Z5@!sZNo*Jto@a1ic=NxWD(52v=r;LpmwaRO?2 z>NFIm8LM*>*cljr!#aj1H_o8sy@VBQPsX)MpD=;Cb_MTlUcfEOm>9pgraQuvK3TDh zU~&8;4i>H0n?H-P!-~7+A#JN2YLq@Xar~I*;?BenoaSLHT|A{Nw*##*Txf z=P2Jt+bwhw1No#m@5>K3@=5pQ2W*-1zWjjVlkVFOs7`*s{U*2