diff --git a/gradle.properties b/gradle.properties index 42e277b..5fd4422 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,5 +3,5 @@ org.gradle.jvmargs=-Xmx4G mc_version=1.12.2 forge_version=1.12.2-14.23.1.2575 -mod_version=2.6 +mod_version=2.6.1 mappings_version=snapshot_20170917 diff --git a/src/main/java/jackyy/exchangers/Config.java b/src/main/java/jackyy/exchangers/Config.java index 4d0bd92..529eab5 100644 --- a/src/main/java/jackyy/exchangers/Config.java +++ b/src/main/java/jackyy/exchangers/Config.java @@ -91,7 +91,9 @@ public class Config { //Misc public static String[] blocksWhitelist; public static boolean holdingEnchantment; + public static boolean unbreakingPoweredExchangers; public static boolean useOreDictCircuits; + public static boolean doExchangersSilkTouch; public static void readConfig() { Configuration cfg = CommonProxy.config; @@ -286,8 +288,12 @@ private static void initConfig(Configuration cfg) { holdingEnchantment = cfg.getBoolean("Holding Enchantment", CATEGORY_MISC, true, "If true, allows the Holding Enchantment from CoFHCore to be used in Powered Exchangers\n" + "Calculation formula: Base Energy + (Base Energy * Enchantment Level / 2)\n"); + unbreakingPoweredExchangers = cfg.getBoolean("Unbreaking Enchantment Affects Powered Exchangers", CATEGORY_MISC, true, + "If true, allows Unbreaking Enchantment to affect Powered Exchangers"); useOreDictCircuits = cfg.getBoolean("Use OreDict Circuits", CATEGORY_MISC, false, "If true, allows Circuits in Mekanism Exchanger recipes to use OreDict"); + doExchangersSilkTouch = cfg.getBoolean("Exchangers Silk Touch", CATEGORY_MISC, true, + "If true, enables Silk Touch (gets the blocks itself rather than drops) in all Exchangers"); } diff --git a/src/main/java/jackyy/exchangers/Exchangers.java b/src/main/java/jackyy/exchangers/Exchangers.java index 0a279e8..a312ceb 100644 --- a/src/main/java/jackyy/exchangers/Exchangers.java +++ b/src/main/java/jackyy/exchangers/Exchangers.java @@ -18,7 +18,7 @@ @Mod(modid = Exchangers.MODID, version = Exchangers.VERSION, name = Exchangers.MODNAME, dependencies = Exchangers.DEPENDS, guiFactory = Exchangers.GUIFACTORY, certificateFingerprint = "@FINGERPRINT@", acceptedMinecraftVersions = Exchangers.MCVERSION, useMetadata = true) public class Exchangers { - public static final String VERSION = "1.12.2-2.6"; + public static final String VERSION = "1.12.2-2.6.1"; public static final String MCVERSION = "[1.12,1.13)"; public static final String MODID = "exchangers"; public static final String MODNAME = "Exchangers"; diff --git a/src/main/java/jackyy/exchangers/client/Keys.java b/src/main/java/jackyy/exchangers/client/Keys.java index 6005baf..444f513 100644 --- a/src/main/java/jackyy/exchangers/client/Keys.java +++ b/src/main/java/jackyy/exchangers/client/Keys.java @@ -1,6 +1,8 @@ package jackyy.exchangers.client; import net.minecraft.client.settings.KeyBinding; +import net.minecraftforge.client.settings.IKeyConflictContext; +import net.minecraftforge.client.settings.KeyConflictContext; import net.minecraftforge.fml.client.registry.ClientRegistry; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -9,7 +11,16 @@ @SideOnly(Side.CLIENT) public class Keys { - public static final KeyBinding MODE_KEY = new KeyBinding("key.exchangermode", Keyboard.KEY_COMMA, "key.categories.exchangers"); + public static final KeyBinding MODE_KEY = new KeyBinding("key.exchanger_mode", new IKeyConflictContext() { + @Override + public boolean isActive() { + return KeyConflictContext.IN_GAME.isActive(); + } + @Override + public boolean conflicts(IKeyConflictContext other) { + return other == this || KeyConflictContext.IN_GAME.isActive(); + } + }, Keyboard.KEY_COMMA, "key.categories.exchangers"); public static void init() { ClientRegistry.registerKeyBinding(MODE_KEY); diff --git a/src/main/java/jackyy/exchangers/handler/ExchangerHandler.java b/src/main/java/jackyy/exchangers/handler/ExchangerHandler.java index 5ccba1e..5408abe 100644 --- a/src/main/java/jackyy/exchangers/handler/ExchangerHandler.java +++ b/src/main/java/jackyy/exchangers/handler/ExchangerHandler.java @@ -4,28 +4,35 @@ import jackyy.exchangers.client.Keys; import jackyy.exchangers.helper.ChatHelper; import jackyy.exchangers.helper.StringHelper; -import jackyy.exchangers.util.StackUtil; -import net.minecraft.block.Block; +import jackyy.exchangers.util.IExchanger; +import net.minecraft.block.*; import net.minecraft.block.state.IBlockState; import net.minecraft.client.util.ITooltipFlag; +import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.init.Blocks; +import net.minecraft.init.Enchantments; import net.minecraft.init.SoundEvents; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.*; import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; +import net.minecraft.util.text.TextFormatting; import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.common.util.BlockSnapshot; +import net.minecraftforge.event.world.BlockEvent; import java.util.HashSet; import java.util.List; +import java.util.Random; import java.util.Set; -public class ExchangerHandler extends Item { +public class ExchangerHandler extends Item implements IExchanger { public static final int MODE_1X1 = 0; public static final int MODE_3X3 = 1; @@ -47,86 +54,86 @@ public class ExchangerHandler extends Item { "19x19", "21x21", "23x23", "25x25" }; public static void setDefaultTagCompound(ItemStack stack) { - stack.setTagCompound(new NBTTagCompound()); - stack.getTagCompound().setInteger("block", 0); - stack.getTagCompound().setInteger("meta", 0); - stack.getTagCompound().setInteger("mode", 0); - } - - public static boolean stackTagCompoundNull(ItemStack stack) { - return stack.getTagCompound() == null; + if (stack.getTagCompound() == null) { + NBTTagCompound compound = new NBTTagCompound(); + compound.setString("block", "minecraft:air"); + compound.setInteger("meta", 0); + compound.setInteger("mode", 0); + stack.setTagCompound(compound); + } else { + if (stack.getTagCompound().hasKey("Energy") && !stack.getTagCompound().hasKey("mode")) { + stack.getTagCompound().setString("block", "minecraft:air"); + stack.getTagCompound().setInteger("meta", 0); + stack.getTagCompound().setInteger("mode", 0); + } + } } @Override - @SideOnly(Side.CLIENT) public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag bool) { super.addInformation(stack, world, tooltip, bool); if (!StringHelper.isShiftKeyDown()) { tooltip.add(StringHelper.getShiftText()); } - if (stackTagCompoundNull(stack)) - setDefaultTagCompound(stack); + setDefaultTagCompound(stack); NBTTagCompound compound = stack.getTagCompound(); + String id = compound.getString("block"); if (StringHelper.isShiftKeyDown()) { - if (compound.getInteger("block") == 0) { - tooltip.add(StringHelper.localize("tooltip.noselectedblock")); - tooltip.add(StringHelper.localize("tooltip.currentrange") + " " + modeSwitchList[compound.getInteger("mode")]); - tooltip.add(StringHelper.localize("tooltip.maxrange") + " " + modeSwitchList[getMaxRange()]); + if (id.equals("minecraft:air")) { + tooltip.add(StringHelper.localize("tooltip.no_selected_block")); + tooltip.add(StringHelper.localize("tooltip.current_range") + " " + modeSwitchList[compound.getInteger("mode")]); + tooltip.add(StringHelper.localize("tooltip.max_range") + " " + modeSwitchList[getMaxRange()]); } else { - int id = compound.getInteger("block"); - Block block = Block.getBlockById(id); + Block block = Block.getBlockFromName(id); int meta = compound.getInteger("meta"); - - tooltip.add(StringHelper.localize("tooltip.selectedblock") + " " + getBlockName(block, meta)); - tooltip.add(StringHelper.localize("tooltip.currentrange") + " " + modeSwitchList[compound.getInteger("mode")]); - tooltip.add(StringHelper.localize("tooltip.maxrange") + " " + modeSwitchList[getMaxRange()]); + tooltip.add(StringHelper.localize("tooltip.selected_block") + " " + getBlockName(block, meta)); + tooltip.add(StringHelper.localize("tooltip.current_range") + " " + modeSwitchList[compound.getInteger("mode")]); + tooltip.add(StringHelper.localize("tooltip.max_range") + " " + modeSwitchList[getMaxRange()]); + } + if (Config.doExchangersSilkTouch) { + tooltip.add(StringHelper.localize("tooltip.silk_touch.on")); + } else { + tooltip.add(StringHelper.localize("tooltip.silk_touch.off")); } tooltip.add(StringHelper.localize("tooltip.shift1")); tooltip.add(StringHelper.localize("tooltip.shift2")); - tooltip.add(StringHelper.localize("tooltip.shift3") + " " + "(" + Keys.MODE_KEY.getDisplayName() + ")"); + tooltip.add(StringHelper.localize("tooltip.shift3") + " " + "(" + TextFormatting.GREEN + Keys.MODE_KEY.getDisplayName() + TextFormatting.GRAY + ")"); tooltip.add(StringHelper.getTierText(getTier())); } } - public int getTier() { - return this.getTier(); - } - - public int getMaxRange() { - return this.getMaxRange(); - } - - public int getMaxEnergy() { - return this.getMaxEnergy(); - } - - public int getPerBlockUse() { + private int getPerBlockEnergy(ItemStack stack) { + if (Config.unbreakingPoweredExchangers) { + int level = MathHelper.clamp(EnchantmentHelper.getEnchantmentLevel(Enchantments.UNBREAKING, stack), 0, 10); + if (new Random().nextInt(2 + level) >= 2) { + return 0; + } + } return this.getPerBlockUse(); } - public boolean isCreative() { - return false; - } - - public boolean isPowered() { - return false; - } - public void switchMode(EntityPlayer player, ItemStack stack) { - if (stackTagCompoundNull(stack)) - setDefaultTagCompound(stack); + setDefaultTagCompound(stack); int modeSwitch = stack.getTagCompound().getInteger("mode"); - modeSwitch++; + + if (player.isSneaking()) { + modeSwitch--; + } else { + modeSwitch++; + } ItemStack heldItem = player.getHeldItemMainhand(); if (heldItem != ItemStack.EMPTY) { - if (modeSwitch > getMaxRange()) + if (modeSwitch > getMaxRange()) { modeSwitch = MODE_1X1; + } else if (modeSwitch < MODE_1X1) { + modeSwitch = getMaxRange(); + } } stack.getTagCompound().setInteger("mode", modeSwitch); @@ -150,8 +157,16 @@ private boolean isWhitelisted(World world, BlockPos pos) { return true; } } - return world.getBlockState(pos).getBlock().getRegistryName().getResourceDomain().equals("tconstruct") - || world.getBlockState(pos).getBlock().getRegistryName().getResourceDomain().equals("blockcraftery"); + return world.getBlockState(pos).getBlock().getRegistryName().getResourceDomain().equals("tconstruct"); + } + + private boolean isSpecial(Block block) { + return block instanceof BlockLog + || block instanceof BlockRedstoneOre + || block instanceof BlockTrapDoor + || block instanceof BlockDoor + || block instanceof BlockFenceGate + || block instanceof BlockRedstoneLight; } @SuppressWarnings("deprecation") @@ -159,8 +174,8 @@ private void placeBlock(ItemStack stack, EntityPlayer player, World world, Block NBTTagCompound tagCompound = stack.getTagCompound(); Block block; int meta; - int id = tagCompound.getInteger("block"); - block = Block.REGISTRY.getObjectById(id); + String id = tagCompound.getString("block"); + block = Block.getBlockFromName(id); meta = tagCompound.getInteger("meta"); IBlockState oldState = world.getBlockState(pos); @@ -168,82 +183,95 @@ private void placeBlock(ItemStack stack, EntityPlayer player, World world, Block int oldmeta = oldblock.getMetaFromState(oldState); float blockHardness = oldblock.getBlockHardness(oldState, world, pos); - if (id == 0) { + if (id.equals("minecraft:air")) { return; - } - if ((block == oldblock) && (meta == oldmeta)) { + } else if ((block == oldblock) && (meta == oldmeta)) { return; - } - if (world.getTileEntity(pos) != null && !this.isWhitelisted(world, pos)) { - ChatHelper.msgPlayer(player, StringHelper.localize("error.invalidblock.te")); + } else if (world.getTileEntity(pos) != null && !this.isWhitelisted(world, pos)) { + ChatHelper.msgPlayer(player, "error.invalid_block.te"); + return; + } else if (!isCreative() && blockHardness < -0.1F) { + ChatHelper.msgPlayer(player, "error.invalid_block.unbreakable"); + return; + } else if (!isCreative() && isPowered() && stack.getTagCompound().getInteger("Energy") < getPerBlockEnergy(stack)) { + ChatHelper.msgPlayer(player, "error.out_of_power"); return; - } - if (blockHardness < -0.1F) { - if (!isCreative()) { - ChatHelper.msgPlayer(player, StringHelper.localize("error.invalidblock.unbreakable")); - return; - } - } - if (isPowered() && stack.getTagCompound().getInteger("Energy") < getPerBlockUse()) { - if (!isCreative()) { - ChatHelper.msgPlayer(player, StringHelper.localize("error.nopower")); - return; - } } Set coordinates = findSuitableBlocks(stack, world, side, pos, oldblock, oldmeta); boolean notEnough = false; + world.captureBlockSnapshots = false; for (BlockPos coordinate : coordinates) { - if (consumeItemInInventory(Item.getItemFromBlock(block), meta, player.inventory, player)) { - if (!player.capabilities.isCreativeMode && !isCreative()) { - ItemStack oldblockItem = oldblock.getItem(world, pos, oldState); - giveItem(world, player, pos, oldblockItem); - if (!isPowered() && !isCreative()) { - stack.damageItem(1, player); - } else if (stack.getTagCompound().getInteger("Energy") >= getPerBlockUse()) { - stack.getTagCompound().setInteger("Energy", stack.getTagCompound().getInteger("Energy") - getPerBlockUse()); + BlockEvent.PlaceEvent event = new BlockEvent.PlaceEvent(BlockSnapshot.getBlockSnapshot(world, coordinate, 3), Blocks.AIR.getDefaultState(), player, player.getActiveHand()); + world.setBlockState(coordinate, block.getStateFromMeta(meta), 3); + if (!MinecraftForge.EVENT_BUS.post(event)) { + if (consumeItemInInventory(Item.getItemFromBlock(block), meta, player.inventory, player)) { + if (!player.capabilities.isCreativeMode && !isCreative()) { + if (Config.doExchangersSilkTouch || EnchantmentHelper.getEnchantmentLevel(Enchantments.SILK_TOUCH, stack) > 0) { + ItemStack oldblockItem = oldblock.getItem(world, pos, oldState); + giveItem(world, player, pos, oldblockItem); + } else { + int fortuneLevel = EnchantmentHelper.getEnchantmentLevel(Enchantments.FORTUNE, stack); + NonNullList oldblockItems = NonNullList.create(); + oldblock.getDrops(oldblockItems, world, pos, oldState, fortuneLevel); + for (ItemStack oldblockItem : oldblockItems) { + giveItem(world, player, pos, oldblockItem); + } + } + if (!isPowered()) { + stack.damageItem(1, player); + } else if (stack.getTagCompound().getInteger("Energy") >= getPerBlockEnergy(stack)) { + stack.getTagCompound().setInteger("Energy", stack.getTagCompound().getInteger("Energy") - getPerBlockEnergy(stack)); + } + player.openContainer.detectAndSendChanges(); } + world.playSound(null, coordinate.getX(), coordinate.getY(), coordinate.getZ(), + SoundEvents.ENTITY_ENDERMEN_TELEPORT, SoundCategory.BLOCKS, 0.1F, 1F); + } else { + world.restoringBlockSnapshots = true; + event.getBlockSnapshot().restore(true); + world.restoringBlockSnapshots = false; + notEnough = true; } - world.playSound(null, coordinate.getX(), coordinate.getY(), coordinate.getZ(), SoundEvents.ENTITY_ENDERMEN_TELEPORT, - SoundCategory.BLOCKS, 0.1F, 1F); - world.setBlockState(coordinate, block.getStateFromMeta(meta), 3); - player.openContainer.detectAndSendChanges(); - } - else { - notEnough = true; + } else { + world.restoringBlockSnapshots = true; + event.getBlockSnapshot().restore(true); + world.restoringBlockSnapshots = false; + ChatHelper.msgPlayer(player, "error.event_cancelled"); } } if (notEnough) { - ChatHelper.msgPlayer(player, StringHelper.localize("error.outofblock")); + ChatHelper.msgPlayer(player, "error.out_of_block"); } + world.captureBlockSnapshots = true; } @SuppressWarnings("deprecation") private void selectBlock(ItemStack stack, EntityPlayer player, World world, BlockPos pos) { - if (stackTagCompoundNull(stack)) - setDefaultTagCompound(stack); - IBlockState state = world.getBlockState(pos).getBlock().getDefaultState(); + setDefaultTagCompound(stack); + IBlockState state = world.getBlockState(pos); Block block = state.getBlock(); - int meta = block.getMetaFromState(state); + int meta; + if (isSpecial(block)) { + meta = block.getDefaultState().getBlock().getMetaFromState(block.getDefaultState()); + } else { + meta = block.getMetaFromState(state); + } NBTTagCompound tagCompound = getTagCompound(stack); String name = getBlockName(block, meta); float blockHardness = block.getBlockHardness(state, world, pos); if (name == null) { - ChatHelper.msgPlayer(player, StringHelper.localize("error.invalidblock.null")); - } - if (world.getTileEntity(pos) != null && !this.isWhitelisted(world, pos)) { - ChatHelper.msgPlayer(player, StringHelper.localize("error.invalidblock.te")); + ChatHelper.msgPlayer(player, "error.invalid_block.null"); + return; + } else if (world.getTileEntity(pos) != null && !this.isWhitelisted(world, pos)) { + ChatHelper.msgPlayer(player, "error.invalid_block.te"); + return; + } else if (!isCreative() && blockHardness < -0.1F) { + ChatHelper.msgPlayer(player, "error.invalid_block.unbreakable"); return; } - if (blockHardness < -0.1F) { - if (!isCreative()) { - ChatHelper.msgPlayer(player, StringHelper.localize("error.invalidblock.unbreakable")); - } - } - else { - int id = Block.REGISTRY.getIDForObject(block); - tagCompound.setInteger("block", id); - tagCompound.setInteger("meta", meta); - } + String id = Block.REGISTRY.getNameForObject(block).toString(); + tagCompound.setString("block", id); + tagCompound.setInteger("meta", meta); } @SuppressWarnings("unchecked") @@ -298,9 +326,11 @@ private boolean consumeItemInInventory(Item item, int meta, InventoryPlayer inv, return false; } ItemStack stackInSlot = inv.getStackInSlot(i); - stackInSlot = StackUtil.incStackSize(stackInSlot, -1); - if (StackUtil.getStackSize(stackInSlot) == 0) { - inv.setInventorySlotContents(i, StackUtil.getEmptyStack(new ItemStack(item))); + if (stackInSlot != ItemStack.EMPTY) { + stackInSlot.shrink(1); + if (stackInSlot.getCount() == 0) { + inv.setInventorySlotContents(i, ItemStack.EMPTY); + } } return true; } @@ -308,7 +338,7 @@ private boolean consumeItemInInventory(Item item, int meta, InventoryPlayer inv, private static int findItem(Item item, int meta, InventoryPlayer inv) { for (int i = 0; i < 36; i++) { ItemStack stack = inv.getStackInSlot(i); - if ((StackUtil.isValid(stack)) && (stack.getItem() == item) && (meta == stack.getItemDamage())) { + if (stack != ItemStack.EMPTY && (stack.getItem() == item) && (meta == stack.getItemDamage())) { return i; } } diff --git a/src/main/java/jackyy/exchangers/handler/GUIHandler.java b/src/main/java/jackyy/exchangers/handler/GUIHandler.java index 1423a2a..a93fdd2 100644 --- a/src/main/java/jackyy/exchangers/handler/GUIHandler.java +++ b/src/main/java/jackyy/exchangers/handler/GUIHandler.java @@ -31,7 +31,7 @@ public void onGameOverlayRender(RenderGameOverlayEvent event) { EntityPlayer player = (EntityPlayer) mc.getRenderViewEntity(); if (player == null || !mc.inGameHasFocus || !Minecraft.isGuiEnabled()) return; - if (player.getHeldItemMainhand() == null || !(player.getHeldItemMainhand().getItem() instanceof ItemExchangerBase)) return; + if (player.getHeldItemMainhand() == ItemStack.EMPTY || !(player.getHeldItemMainhand().getItem() instanceof ItemExchangerBase)) return; ItemStack stack = player.getHeldItemMainhand(); diff --git a/src/main/java/jackyy/exchangers/handler/RenderOverlayHandler.java b/src/main/java/jackyy/exchangers/handler/RenderOverlayHandler.java index 67fd9ec..158a1f3 100644 --- a/src/main/java/jackyy/exchangers/handler/RenderOverlayHandler.java +++ b/src/main/java/jackyy/exchangers/handler/RenderOverlayHandler.java @@ -1,7 +1,6 @@ package jackyy.exchangers.handler; import jackyy.exchangers.item.ItemExchangerBase; -import jackyy.exchangers.util.StackUtil; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; @@ -13,7 +12,6 @@ import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; import net.minecraftforge.client.event.RenderWorldLastEvent; @@ -30,8 +28,8 @@ public class RenderOverlayHandler { public void renderWorldLastEvent(RenderWorldLastEvent event) { Minecraft mc = Minecraft.getMinecraft(); EntityPlayerSP player = mc.player; - ItemStack stack = player.getHeldItem(EnumHand.MAIN_HAND); - if (StackUtil.isEmpty(stack)) { + ItemStack stack = player.getHeldItemMainhand(); + if (stack == ItemStack.EMPTY) { return; } if ((stack.getItem() instanceof ItemExchangerBase)) { @@ -118,9 +116,8 @@ public void renderOverlay(RenderWorldLastEvent evt, EntityPlayerSP player, ItemS Block block = state.getBlock(); if ((block != null) && (block.getMaterial(state) != Material.AIR)) { int meta = block.getMetaFromState(state); - - int exId = ExchangerHandler.getTagCompound(stack).getInteger("block"); - Block exBlock = Block.REGISTRY.getObjectById(exId); + String exId = ExchangerHandler.getTagCompound(stack).getString("block"); + Block exBlock = Block.getBlockFromName(exId); int exMeta = ExchangerHandler.getTagCompound(stack).getInteger("meta"); if ((exBlock == block) && (exMeta == meta)) { return; diff --git a/src/main/java/jackyy/exchangers/handler/network/PacketHandler.java b/src/main/java/jackyy/exchangers/handler/network/PacketHandler.java index 9565d4e..1ac2773 100644 --- a/src/main/java/jackyy/exchangers/handler/network/PacketHandler.java +++ b/src/main/java/jackyy/exchangers/handler/network/PacketHandler.java @@ -14,10 +14,6 @@ public static int nextID() { public static void registerMessages(String channelName) { INSTANCE = NetworkRegistry.INSTANCE.newSimpleChannel(channelName); - - // Server side INSTANCE.registerMessage(PacketToggleMode.class, PacketToggleMode.class, nextID(), Side.SERVER); - - // Client side } } \ No newline at end of file diff --git a/src/main/java/jackyy/exchangers/handler/network/PacketToggleMode.java b/src/main/java/jackyy/exchangers/handler/network/PacketToggleMode.java index 1ffa3f6..03eb54b 100644 --- a/src/main/java/jackyy/exchangers/handler/network/PacketToggleMode.java +++ b/src/main/java/jackyy/exchangers/handler/network/PacketToggleMode.java @@ -22,7 +22,7 @@ public PacketToggleMode() { } public IMessage onMessage(PacketToggleMode message, MessageContext context) { EntityPlayerMP playerMP = context.getServerHandler().player; ItemStack heldItem = playerMP.getHeldItemMainhand(); - if (heldItem != null && heldItem.getItem() instanceof ExchangerHandler) { + if (heldItem != ItemStack.EMPTY && heldItem.getItem() instanceof ExchangerHandler) { ExchangerHandler exchanger = (ExchangerHandler) (heldItem.getItem()); exchanger.switchMode(playerMP, heldItem); } diff --git a/src/main/java/jackyy/exchangers/helper/ChatHelper.java b/src/main/java/jackyy/exchangers/helper/ChatHelper.java index 8654c38..77b77bd 100644 --- a/src/main/java/jackyy/exchangers/helper/ChatHelper.java +++ b/src/main/java/jackyy/exchangers/helper/ChatHelper.java @@ -1,12 +1,13 @@ package jackyy.exchangers.helper; +import jackyy.exchangers.Exchangers; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.util.text.TextComponentString; +import net.minecraft.util.text.TextComponentTranslation; public class ChatHelper { public static void msgPlayer(EntityPlayer player, String msg) { - player.sendStatusMessage(new TextComponentString(msg), true); + player.sendStatusMessage(new TextComponentTranslation(Exchangers.MODID + "." + msg), true); } } diff --git a/src/main/java/jackyy/exchangers/helper/NBTHelper.java b/src/main/java/jackyy/exchangers/helper/NBTHelper.java index d591f43..bb37afd 100644 --- a/src/main/java/jackyy/exchangers/helper/NBTHelper.java +++ b/src/main/java/jackyy/exchangers/helper/NBTHelper.java @@ -26,10 +26,9 @@ public static int getInt(ItemStack stack, String key) { public static int receiveEnergy(ItemStack container, int energy, int maxEnergy, boolean simulate) { int stored = getEnergyStored(container); int accepted = Math.min(energy, maxEnergy-stored); - if(!simulate) - { + if (!simulate) { stored += accepted; - NBTHelper.setInt(container, "Energy", stored); + setInt(container, "Energy", stored); } return accepted; } @@ -37,10 +36,9 @@ public static int receiveEnergy(ItemStack container, int energy, int maxEnergy, public static int extractEnergy(ItemStack container, int energy, boolean simulate) { int stored = getEnergyStored(container); int extracted = Math.min(energy, stored); - if(!simulate) - { + if (!simulate) { stored -= extracted; - NBTHelper.setInt(container, "Energy", stored); + setInt(container, "Energy", stored); } return extracted; } @@ -48,4 +46,5 @@ public static int extractEnergy(ItemStack container, int energy, boolean simulat public static int getEnergyStored(ItemStack container) { return getInt(container, "Energy"); } + } diff --git a/src/main/java/jackyy/exchangers/helper/StringHelper.java b/src/main/java/jackyy/exchangers/helper/StringHelper.java index 056d66b..79367a1 100644 --- a/src/main/java/jackyy/exchangers/helper/StringHelper.java +++ b/src/main/java/jackyy/exchangers/helper/StringHelper.java @@ -14,7 +14,7 @@ public static String getTierText(int tier) { } public static String getShiftText() { - return TextFormatting.GRAY + localize("tooltip.holdShift", TextFormatting.YELLOW.toString() + TextFormatting.ITALIC + localize("tooltip.holdShift.shift") + TextFormatting.RESET + TextFormatting.GRAY); + return TextFormatting.GRAY + localize("tooltip.hold_shift", TextFormatting.YELLOW.toString() + TextFormatting.ITALIC + localize("tooltip.hold_shift.shift") + TextFormatting.RESET + TextFormatting.GRAY); } public static boolean isShiftKeyDown() { diff --git a/src/main/java/jackyy/exchangers/item/ItemCoreBase.java b/src/main/java/jackyy/exchangers/item/ItemCoreBase.java new file mode 100644 index 0000000..ea3fda8 --- /dev/null +++ b/src/main/java/jackyy/exchangers/item/ItemCoreBase.java @@ -0,0 +1,29 @@ +package jackyy.exchangers.item; + +import jackyy.exchangers.Exchangers; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.NonNullList; + +public class ItemCoreBase extends Item { + + public ItemCoreBase(){ + setMaxStackSize(16); + setCreativeTab(Exchangers.TAB); + } + + @Override + public void getSubItems(CreativeTabs tab, NonNullList list) { + if (isInCreativeTab(tab)) { + if (checkLoaded()) { + list.add(new ItemStack(this)); + } + } + } + + public boolean checkLoaded() { + return true; + } + +} diff --git a/src/main/java/jackyy/exchangers/item/ItemExchangerBase.java b/src/main/java/jackyy/exchangers/item/ItemExchangerBase.java index 694785a..cfd947a 100644 --- a/src/main/java/jackyy/exchangers/item/ItemExchangerBase.java +++ b/src/main/java/jackyy/exchangers/item/ItemExchangerBase.java @@ -1,9 +1,12 @@ package jackyy.exchangers.item; +import jackyy.exchangers.Exchangers; import jackyy.exchangers.handler.ExchangerHandler; import jackyy.exchangers.helper.StringHelper; import net.minecraft.client.util.ITooltipFlag; +import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.ItemStack; +import net.minecraft.util.NonNullList; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -12,6 +15,12 @@ public class ItemExchangerBase extends ExchangerHandler { + public ItemExchangerBase(){ + setMaxStackSize(1); + setCreativeTab(Exchangers.TAB); + } + + @Override public boolean showDurabilityBar(ItemStack stack) { return stack.isItemDamaged(); } @@ -21,10 +30,9 @@ public boolean isPowered() { return false; } - @Override - @SideOnly(Side.CLIENT) - public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag bool) { - super.addInformation(stack, world, tooltip, bool); + @Override + public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag bool) { + super.addInformation(stack, world, tooltip, bool); if (StringHelper.isShiftKeyDown()) { if (!isPowered()) { tooltip.add(StringHelper.formatNumber(stack.getMaxDamage() - stack.getItemDamage()) + " / " + StringHelper.formatNumber(stack.getMaxDamage()) + " " + StringHelper.localize("tooltip.durability")); @@ -32,4 +40,23 @@ public void addInformation(ItemStack stack, World world, List tooltip, I } } + @Override + public void getSubItems(CreativeTabs tab, NonNullList list) { + if (isInCreativeTab(tab)) { + if (checkLoaded()) { + list.add(new ItemStack(this)); + } + } + } + + @Override @SideOnly(Side.CLIENT) + public boolean hasEffect(ItemStack stack) { + return false; + } + + @Override + public int getItemEnchantability() { + return 20; + } + } diff --git a/src/main/java/jackyy/exchangers/item/ItemExchangerBasePowered.java b/src/main/java/jackyy/exchangers/item/ItemExchangerBasePowered.java index 32d4c58..8ad1cbc 100644 --- a/src/main/java/jackyy/exchangers/item/ItemExchangerBasePowered.java +++ b/src/main/java/jackyy/exchangers/item/ItemExchangerBasePowered.java @@ -3,21 +3,22 @@ import cofh.core.item.IEnchantableItem; import cofh.redstoneflux.api.IEnergyContainerItem; import jackyy.exchangers.Config; +import jackyy.exchangers.handler.ExchangerHandler; import jackyy.exchangers.helper.EnergyHelper; import jackyy.exchangers.helper.NBTHelper; import jackyy.exchangers.helper.StringHelper; import jackyy.exchangers.util.EnergyContainerItemWrapper; import net.minecraft.client.util.ITooltipFlag; +import net.minecraft.creativetab.CreativeTabs; import net.minecraft.enchantment.Enchantment; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.NonNullList; import net.minecraft.world.World; import net.minecraftforge.common.capabilities.ICapabilityProvider; import net.minecraftforge.fml.common.Loader; import net.minecraftforge.fml.common.Optional; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; import java.util.List; @@ -26,6 +27,10 @@ public class ItemExchangerBasePowered extends ItemExchangerBase implements IEner private Enchantment holding = Enchantment.getEnchantmentByLocation("cofhcore:holding"); + public ItemExchangerBasePowered(){ + setNoRepair(); + } + @Override public int receiveEnergy(ItemStack container, int energy, boolean simulate) { return NBTHelper.receiveEnergy(container, energy, getMaxEnergyStored(container), simulate); @@ -63,15 +68,29 @@ public double getDurabilityForDisplay(ItemStack stack) { return 1D - ((double) stack.getTagCompound().getInteger("Energy") / (double) getMaxEnergyStored(stack)); } - @Override - @SideOnly(Side.CLIENT) - public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag bool) { - super.addInformation(stack, world, tooltip, bool); + @Override + public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag bool) { + super.addInformation(stack, world, tooltip, bool); if (StringHelper.isShiftKeyDown()) { tooltip.add(StringHelper.formatNumber(getEnergyStored(stack)) + " / " + StringHelper.formatNumber(getMaxEnergyStored(stack)) + " RF"); } } + @Override + public void getSubItems(CreativeTabs tab, NonNullList list) { + if (isInCreativeTab(tab)) { + if (checkLoaded()) { + ItemStack empty = new ItemStack(this); + ExchangerHandler.setDefaultTagCompound(empty); + list.add(empty); + ItemStack full = new ItemStack(this); + ExchangerHandler.setDefaultTagCompound(full); + EnergyHelper.setDefaultEnergyTag(full, getMaxEnergyStored(full)); + list.add(full); + } + } + } + @Override public boolean isDamaged(ItemStack stack) { return true; diff --git a/src/main/java/jackyy/exchangers/item/enderio/ItemConductiveIronExchanger.java b/src/main/java/jackyy/exchangers/item/enderio/ItemConductiveIronExchanger.java index 8a957d0..ba69673 100644 --- a/src/main/java/jackyy/exchangers/item/enderio/ItemConductiveIronExchanger.java +++ b/src/main/java/jackyy/exchangers/item/enderio/ItemConductiveIronExchanger.java @@ -2,13 +2,10 @@ import jackyy.exchangers.Config; import jackyy.exchangers.Exchangers; -import jackyy.exchangers.helper.EnergyHelper; import jackyy.exchangers.item.ItemExchangerBasePowered; import net.minecraft.client.renderer.block.model.ModelResourceLocation; -import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemStack; -import net.minecraft.util.NonNullList; import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.fml.common.Loader; import net.minecraftforge.fml.relauncher.Side; @@ -19,9 +16,6 @@ public class ItemConductiveIronExchanger extends ItemExchangerBasePowered { public ItemConductiveIronExchanger(){ setRegistryName(Exchangers.MODID + ":exconductive"); setUnlocalizedName(Exchangers.MODID + ".exconductive"); - setMaxStackSize(1); - setCreativeTab(Exchangers.TAB); - setNoRepair(); } @SideOnly(Side.CLIENT) @@ -40,18 +34,8 @@ public int getPerBlockUse() { } @Override - public void getSubItems(CreativeTabs tab, NonNullList list) { - if (Config.enderIOModule) { - if (Loader.isModLoaded(Exchangers.EIO)) { - if (isInCreativeTab(tab)) { - ItemStack empty = new ItemStack(this); - list.add(empty); - ItemStack full = new ItemStack(this); - EnergyHelper.setDefaultEnergyTag(full, getMaxEnergyStored(full)); - list.add(full); - } - } - } + public boolean checkLoaded() { + return Config.enderIOModule && Loader.isModLoaded(Exchangers.EIO); } @Override diff --git a/src/main/java/jackyy/exchangers/item/enderio/ItemDarkSteelExchanger.java b/src/main/java/jackyy/exchangers/item/enderio/ItemDarkSteelExchanger.java index b655a49..0825eb4 100644 --- a/src/main/java/jackyy/exchangers/item/enderio/ItemDarkSteelExchanger.java +++ b/src/main/java/jackyy/exchangers/item/enderio/ItemDarkSteelExchanger.java @@ -2,13 +2,10 @@ import jackyy.exchangers.Config; import jackyy.exchangers.Exchangers; -import jackyy.exchangers.helper.EnergyHelper; import jackyy.exchangers.item.ItemExchangerBasePowered; import net.minecraft.client.renderer.block.model.ModelResourceLocation; -import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemStack; -import net.minecraft.util.NonNullList; import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.fml.common.Loader; import net.minecraftforge.fml.relauncher.Side; @@ -19,9 +16,6 @@ public class ItemDarkSteelExchanger extends ItemExchangerBasePowered { public ItemDarkSteelExchanger(){ setRegistryName(Exchangers.MODID + ":exdarksteel"); setUnlocalizedName(Exchangers.MODID + ".exdarksteel"); - setMaxStackSize(1); - setCreativeTab(Exchangers.TAB); - setNoRepair(); } @SideOnly(Side.CLIENT) @@ -40,18 +34,8 @@ public int getPerBlockUse() { } @Override - public void getSubItems(CreativeTabs tab, NonNullList list) { - if (Config.enderIOModule) { - if (Loader.isModLoaded(Exchangers.EIO)) { - if (isInCreativeTab(tab)) { - ItemStack empty = new ItemStack(this); - list.add(empty); - ItemStack full = new ItemStack(this); - EnergyHelper.setDefaultEnergyTag(full, getMaxEnergyStored(full)); - list.add(full); - } - } - } + public boolean checkLoaded() { + return Config.enderIOModule && Loader.isModLoaded(Exchangers.EIO); } @Override diff --git a/src/main/java/jackyy/exchangers/item/enderio/ItemEIOExchangerCoreT1.java b/src/main/java/jackyy/exchangers/item/enderio/ItemEIOExchangerCoreT1.java index b826722..1b2fbbf 100644 --- a/src/main/java/jackyy/exchangers/item/enderio/ItemEIOExchangerCoreT1.java +++ b/src/main/java/jackyy/exchangers/item/enderio/ItemEIOExchangerCoreT1.java @@ -2,24 +2,20 @@ import jackyy.exchangers.Config; import jackyy.exchangers.Exchangers; +import jackyy.exchangers.item.ItemCoreBase; import net.minecraft.client.renderer.block.model.ModelResourceLocation; -import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.EnumRarity; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.NonNullList; import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.fml.common.Loader; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -public class ItemEIOExchangerCoreT1 extends Item { +public class ItemEIOExchangerCoreT1 extends ItemCoreBase { public ItemEIOExchangerCoreT1(){ setRegistryName(Exchangers.MODID + ":eioexcore_t1"); setUnlocalizedName(Exchangers.MODID + ".eioexcore_t1"); - setMaxStackSize(16); - setCreativeTab(Exchangers.TAB); } @SideOnly(Side.CLIENT) @@ -28,14 +24,8 @@ public void initModel() { } @Override - public void getSubItems(CreativeTabs tab, NonNullList list) { - if (Config.enderIOModule) { - if (Loader.isModLoaded(Exchangers.EIO)) { - if (isInCreativeTab(tab)) { - list.add(new ItemStack(this)); - } - } - } + public boolean checkLoaded() { + return Config.enderIOModule && Loader.isModLoaded(Exchangers.EIO); } @Override diff --git a/src/main/java/jackyy/exchangers/item/enderio/ItemEIOExchangerCoreT2.java b/src/main/java/jackyy/exchangers/item/enderio/ItemEIOExchangerCoreT2.java index d207d56..0133142 100644 --- a/src/main/java/jackyy/exchangers/item/enderio/ItemEIOExchangerCoreT2.java +++ b/src/main/java/jackyy/exchangers/item/enderio/ItemEIOExchangerCoreT2.java @@ -2,24 +2,20 @@ import jackyy.exchangers.Config; import jackyy.exchangers.Exchangers; +import jackyy.exchangers.item.ItemCoreBase; import net.minecraft.client.renderer.block.model.ModelResourceLocation; -import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.EnumRarity; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.NonNullList; import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.fml.common.Loader; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -public class ItemEIOExchangerCoreT2 extends Item { +public class ItemEIOExchangerCoreT2 extends ItemCoreBase { public ItemEIOExchangerCoreT2(){ setRegistryName(Exchangers.MODID + ":eioexcore_t2"); setUnlocalizedName(Exchangers.MODID + ".eioexcore_t2"); - setMaxStackSize(16); - setCreativeTab(Exchangers.TAB); } @SideOnly(Side.CLIENT) @@ -28,14 +24,8 @@ public void initModel() { } @Override - public void getSubItems(CreativeTabs tab, NonNullList list) { - if (Config.enderIOModule) { - if (Loader.isModLoaded(Exchangers.EIO)) { - if (isInCreativeTab(tab)) { - list.add(new ItemStack(this)); - } - } - } + public boolean checkLoaded() { + return Config.enderIOModule && Loader.isModLoaded(Exchangers.EIO); } @Override diff --git a/src/main/java/jackyy/exchangers/item/enderio/ItemEIOExchangerCoreT3.java b/src/main/java/jackyy/exchangers/item/enderio/ItemEIOExchangerCoreT3.java index 26a742a..d869422 100644 --- a/src/main/java/jackyy/exchangers/item/enderio/ItemEIOExchangerCoreT3.java +++ b/src/main/java/jackyy/exchangers/item/enderio/ItemEIOExchangerCoreT3.java @@ -2,24 +2,20 @@ import jackyy.exchangers.Config; import jackyy.exchangers.Exchangers; +import jackyy.exchangers.item.ItemCoreBase; import net.minecraft.client.renderer.block.model.ModelResourceLocation; -import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.EnumRarity; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.NonNullList; import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.fml.common.Loader; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -public class ItemEIOExchangerCoreT3 extends Item { +public class ItemEIOExchangerCoreT3 extends ItemCoreBase { public ItemEIOExchangerCoreT3(){ setRegistryName(Exchangers.MODID + ":eioexcore_t3"); setUnlocalizedName(Exchangers.MODID + ".eioexcore_t3"); - setMaxStackSize(16); - setCreativeTab(Exchangers.TAB); } @SideOnly(Side.CLIENT) @@ -28,14 +24,8 @@ public void initModel() { } @Override - public void getSubItems(CreativeTabs tab, NonNullList list) { - if (Config.enderIOModule) { - if (Loader.isModLoaded(Exchangers.EIO)) { - if (isInCreativeTab(tab)) { - list.add(new ItemStack(this)); - } - } - } + public boolean checkLoaded() { + return Config.enderIOModule && Loader.isModLoaded(Exchangers.EIO); } @Override diff --git a/src/main/java/jackyy/exchangers/item/enderio/ItemElectricalSteelExchanger.java b/src/main/java/jackyy/exchangers/item/enderio/ItemElectricalSteelExchanger.java index 15fa3bb..fd4a68d 100644 --- a/src/main/java/jackyy/exchangers/item/enderio/ItemElectricalSteelExchanger.java +++ b/src/main/java/jackyy/exchangers/item/enderio/ItemElectricalSteelExchanger.java @@ -2,13 +2,10 @@ import jackyy.exchangers.Config; import jackyy.exchangers.Exchangers; -import jackyy.exchangers.helper.EnergyHelper; import jackyy.exchangers.item.ItemExchangerBasePowered; import net.minecraft.client.renderer.block.model.ModelResourceLocation; -import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemStack; -import net.minecraft.util.NonNullList; import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.fml.common.Loader; import net.minecraftforge.fml.relauncher.Side; @@ -19,9 +16,6 @@ public class ItemElectricalSteelExchanger extends ItemExchangerBasePowered { public ItemElectricalSteelExchanger(){ setRegistryName(Exchangers.MODID + ":exelectricalsteel"); setUnlocalizedName(Exchangers.MODID + ".exelectricalsteel"); - setMaxStackSize(1); - setCreativeTab(Exchangers.TAB); - setNoRepair(); } @SideOnly(Side.CLIENT) @@ -40,18 +34,8 @@ public int getPerBlockUse() { } @Override - public void getSubItems(CreativeTabs tab, NonNullList list) { - if (Config.enderIOModule) { - if (Loader.isModLoaded(Exchangers.EIO)) { - if (isInCreativeTab(tab)) { - ItemStack empty = new ItemStack(this); - list.add(empty); - ItemStack full = new ItemStack(this); - EnergyHelper.setDefaultEnergyTag(full, getMaxEnergyStored(full)); - list.add(full); - } - } - } + public boolean checkLoaded() { + return Config.enderIOModule && Loader.isModLoaded(Exchangers.EIO); } @Override diff --git a/src/main/java/jackyy/exchangers/item/enderio/ItemEnergeticExchanger.java b/src/main/java/jackyy/exchangers/item/enderio/ItemEnergeticExchanger.java index 5645a45..dfc987d 100644 --- a/src/main/java/jackyy/exchangers/item/enderio/ItemEnergeticExchanger.java +++ b/src/main/java/jackyy/exchangers/item/enderio/ItemEnergeticExchanger.java @@ -2,13 +2,10 @@ import jackyy.exchangers.Config; import jackyy.exchangers.Exchangers; -import jackyy.exchangers.helper.EnergyHelper; import jackyy.exchangers.item.ItemExchangerBasePowered; import net.minecraft.client.renderer.block.model.ModelResourceLocation; -import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemStack; -import net.minecraft.util.NonNullList; import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.fml.common.Loader; import net.minecraftforge.fml.relauncher.Side; @@ -19,9 +16,6 @@ public class ItemEnergeticExchanger extends ItemExchangerBasePowered { public ItemEnergeticExchanger(){ setRegistryName(Exchangers.MODID + ":exenergetic"); setUnlocalizedName(Exchangers.MODID + ".exenergetic"); - setMaxStackSize(1); - setCreativeTab(Exchangers.TAB); - setNoRepair(); } @SideOnly(Side.CLIENT) @@ -40,18 +34,8 @@ public int getPerBlockUse() { } @Override - public void getSubItems(CreativeTabs tab, NonNullList list) { - if (Config.enderIOModule) { - if (Loader.isModLoaded(Exchangers.EIO)) { - if (isInCreativeTab(tab)) { - ItemStack empty = new ItemStack(this); - list.add(empty); - ItemStack full = new ItemStack(this); - EnergyHelper.setDefaultEnergyTag(full, getMaxEnergyStored(full)); - list.add(full); - } - } - } + public boolean checkLoaded() { + return Config.enderIOModule && Loader.isModLoaded(Exchangers.EIO); } @Override diff --git a/src/main/java/jackyy/exchangers/item/enderio/ItemPulsatingIronExchanger.java b/src/main/java/jackyy/exchangers/item/enderio/ItemPulsatingIronExchanger.java index d999ada..a8586b1 100644 --- a/src/main/java/jackyy/exchangers/item/enderio/ItemPulsatingIronExchanger.java +++ b/src/main/java/jackyy/exchangers/item/enderio/ItemPulsatingIronExchanger.java @@ -2,13 +2,10 @@ import jackyy.exchangers.Config; import jackyy.exchangers.Exchangers; -import jackyy.exchangers.helper.EnergyHelper; import jackyy.exchangers.item.ItemExchangerBasePowered; import net.minecraft.client.renderer.block.model.ModelResourceLocation; -import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemStack; -import net.minecraft.util.NonNullList; import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.fml.common.Loader; import net.minecraftforge.fml.relauncher.Side; @@ -19,9 +16,6 @@ public class ItemPulsatingIronExchanger extends ItemExchangerBasePowered { public ItemPulsatingIronExchanger(){ setRegistryName(Exchangers.MODID + ":expulsating"); setUnlocalizedName(Exchangers.MODID + ".expulsating"); - setMaxStackSize(1); - setCreativeTab(Exchangers.TAB); - setNoRepair(); } @SideOnly(Side.CLIENT) @@ -40,18 +34,8 @@ public int getPerBlockUse() { } @Override - public void getSubItems(CreativeTabs tab, NonNullList list) { - if (Config.enderIOModule) { - if (Loader.isModLoaded(Exchangers.EIO)) { - if (isInCreativeTab(tab)) { - ItemStack empty = new ItemStack(this); - list.add(empty); - ItemStack full = new ItemStack(this); - EnergyHelper.setDefaultEnergyTag(full, getMaxEnergyStored(full)); - list.add(full); - } - } - } + public boolean checkLoaded() { + return Config.enderIOModule && Loader.isModLoaded(Exchangers.EIO); } @Override diff --git a/src/main/java/jackyy/exchangers/item/enderio/ItemVibrantExchanger.java b/src/main/java/jackyy/exchangers/item/enderio/ItemVibrantExchanger.java index b4985dc..36d60f5 100644 --- a/src/main/java/jackyy/exchangers/item/enderio/ItemVibrantExchanger.java +++ b/src/main/java/jackyy/exchangers/item/enderio/ItemVibrantExchanger.java @@ -2,13 +2,10 @@ import jackyy.exchangers.Config; import jackyy.exchangers.Exchangers; -import jackyy.exchangers.helper.EnergyHelper; import jackyy.exchangers.item.ItemExchangerBasePowered; import net.minecraft.client.renderer.block.model.ModelResourceLocation; -import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemStack; -import net.minecraft.util.NonNullList; import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.fml.common.Loader; import net.minecraftforge.fml.relauncher.Side; @@ -19,9 +16,6 @@ public class ItemVibrantExchanger extends ItemExchangerBasePowered { public ItemVibrantExchanger(){ setRegistryName(Exchangers.MODID + ":exvibrant"); setUnlocalizedName(Exchangers.MODID + ".exvibrant"); - setMaxStackSize(1); - setCreativeTab(Exchangers.TAB); - setNoRepair(); } @SideOnly(Side.CLIENT) @@ -40,18 +34,8 @@ public int getPerBlockUse() { } @Override - public void getSubItems(CreativeTabs tab, NonNullList list) { - if (Config.enderIOModule) { - if (Loader.isModLoaded(Exchangers.EIO)) { - if (isInCreativeTab(tab)) { - ItemStack empty = new ItemStack(this); - list.add(empty); - ItemStack full = new ItemStack(this); - EnergyHelper.setDefaultEnergyTag(full, getMaxEnergyStored(full)); - list.add(full); - } - } - } + public boolean checkLoaded() { + return Config.enderIOModule && Loader.isModLoaded(Exchangers.EIO); } @Override diff --git a/src/main/java/jackyy/exchangers/item/immersiveengineering/ItemHVExchanger.java b/src/main/java/jackyy/exchangers/item/immersiveengineering/ItemHVExchanger.java index eebeebc..1de0b6a 100644 --- a/src/main/java/jackyy/exchangers/item/immersiveengineering/ItemHVExchanger.java +++ b/src/main/java/jackyy/exchangers/item/immersiveengineering/ItemHVExchanger.java @@ -2,13 +2,10 @@ import jackyy.exchangers.Config; import jackyy.exchangers.Exchangers; -import jackyy.exchangers.helper.EnergyHelper; import jackyy.exchangers.item.ItemExchangerBasePowered; import net.minecraft.client.renderer.block.model.ModelResourceLocation; -import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemStack; -import net.minecraft.util.NonNullList; import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.fml.common.Loader; import net.minecraftforge.fml.relauncher.Side; @@ -19,9 +16,6 @@ public class ItemHVExchanger extends ItemExchangerBasePowered { public ItemHVExchanger(){ setRegistryName(Exchangers.MODID + ":exhv"); setUnlocalizedName(Exchangers.MODID + ".exhv"); - setMaxStackSize(1); - setCreativeTab(Exchangers.TAB); - setNoRepair(); } @SideOnly(Side.CLIENT) @@ -40,18 +34,8 @@ public int getPerBlockUse() { } @Override - public void getSubItems(CreativeTabs tab, NonNullList list) { - if (Config.immersiveEngineeringModule) { - if (Loader.isModLoaded(Exchangers.IE)) { - if (isInCreativeTab(tab)) { - ItemStack empty = new ItemStack(this); - list.add(empty); - ItemStack full = new ItemStack(this); - EnergyHelper.setDefaultEnergyTag(full, getMaxEnergyStored(full)); - list.add(full); - } - } - } + public boolean checkLoaded() { + return Config.immersiveEngineeringModule && Loader.isModLoaded(Exchangers.IE); } @Override diff --git a/src/main/java/jackyy/exchangers/item/immersiveengineering/ItemIEExchangerCoreT1.java b/src/main/java/jackyy/exchangers/item/immersiveengineering/ItemIEExchangerCoreT1.java index 5d524cb..3710358 100644 --- a/src/main/java/jackyy/exchangers/item/immersiveengineering/ItemIEExchangerCoreT1.java +++ b/src/main/java/jackyy/exchangers/item/immersiveengineering/ItemIEExchangerCoreT1.java @@ -2,24 +2,20 @@ import jackyy.exchangers.Config; import jackyy.exchangers.Exchangers; +import jackyy.exchangers.item.ItemCoreBase; import net.minecraft.client.renderer.block.model.ModelResourceLocation; -import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.EnumRarity; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.NonNullList; import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.fml.common.Loader; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -public class ItemIEExchangerCoreT1 extends Item { +public class ItemIEExchangerCoreT1 extends ItemCoreBase { public ItemIEExchangerCoreT1(){ setRegistryName(Exchangers.MODID + ":ieexcore_t1"); setUnlocalizedName(Exchangers.MODID + ".ieexcore_t1"); - setMaxStackSize(16); - setCreativeTab(Exchangers.TAB); } @SideOnly(Side.CLIENT) @@ -28,14 +24,8 @@ public void initModel() { } @Override - public void getSubItems(CreativeTabs tab, NonNullList list) { - if (Config.immersiveEngineeringModule) { - if (Loader.isModLoaded(Exchangers.IE)) { - if (isInCreativeTab(tab)) { - list.add(new ItemStack(this)); - } - } - } + public boolean checkLoaded() { + return Config.immersiveEngineeringModule && Loader.isModLoaded(Exchangers.IE); } @Override diff --git a/src/main/java/jackyy/exchangers/item/immersiveengineering/ItemIEExchangerCoreT2.java b/src/main/java/jackyy/exchangers/item/immersiveengineering/ItemIEExchangerCoreT2.java index 361eb67..9635f71 100644 --- a/src/main/java/jackyy/exchangers/item/immersiveengineering/ItemIEExchangerCoreT2.java +++ b/src/main/java/jackyy/exchangers/item/immersiveengineering/ItemIEExchangerCoreT2.java @@ -2,24 +2,20 @@ import jackyy.exchangers.Config; import jackyy.exchangers.Exchangers; +import jackyy.exchangers.item.ItemCoreBase; import net.minecraft.client.renderer.block.model.ModelResourceLocation; -import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.EnumRarity; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.NonNullList; import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.fml.common.Loader; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -public class ItemIEExchangerCoreT2 extends Item { +public class ItemIEExchangerCoreT2 extends ItemCoreBase { public ItemIEExchangerCoreT2(){ setRegistryName(Exchangers.MODID + ":ieexcore_t2"); setUnlocalizedName(Exchangers.MODID + ".ieexcore_t2"); - setMaxStackSize(16); - setCreativeTab(Exchangers.TAB); } @SideOnly(Side.CLIENT) @@ -28,14 +24,8 @@ public void initModel() { } @Override - public void getSubItems(CreativeTabs tab, NonNullList list) { - if (Config.immersiveEngineeringModule) { - if (Loader.isModLoaded(Exchangers.IE)) { - if (isInCreativeTab(tab)) { - list.add(new ItemStack(this)); - } - } - } + public boolean checkLoaded() { + return Config.immersiveEngineeringModule && Loader.isModLoaded(Exchangers.IE); } @Override diff --git a/src/main/java/jackyy/exchangers/item/immersiveengineering/ItemIEExchangerCoreT3.java b/src/main/java/jackyy/exchangers/item/immersiveengineering/ItemIEExchangerCoreT3.java index 82f9401..2dd4e25 100644 --- a/src/main/java/jackyy/exchangers/item/immersiveengineering/ItemIEExchangerCoreT3.java +++ b/src/main/java/jackyy/exchangers/item/immersiveengineering/ItemIEExchangerCoreT3.java @@ -2,24 +2,20 @@ import jackyy.exchangers.Config; import jackyy.exchangers.Exchangers; +import jackyy.exchangers.item.ItemCoreBase; import net.minecraft.client.renderer.block.model.ModelResourceLocation; -import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.EnumRarity; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.NonNullList; import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.fml.common.Loader; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -public class ItemIEExchangerCoreT3 extends Item { +public class ItemIEExchangerCoreT3 extends ItemCoreBase { public ItemIEExchangerCoreT3(){ setRegistryName(Exchangers.MODID + ":ieexcore_t3"); setUnlocalizedName(Exchangers.MODID + ".ieexcore_t3"); - setMaxStackSize(16); - setCreativeTab(Exchangers.TAB); } @SideOnly(Side.CLIENT) @@ -28,14 +24,8 @@ public void initModel() { } @Override - public void getSubItems(CreativeTabs tab, NonNullList list) { - if (Config.immersiveEngineeringModule) { - if (Loader.isModLoaded(Exchangers.IE)) { - if (isInCreativeTab(tab)) { - list.add(new ItemStack(this)); - } - } - } + public boolean checkLoaded() { + return Config.immersiveEngineeringModule && Loader.isModLoaded(Exchangers.IE); } @Override diff --git a/src/main/java/jackyy/exchangers/item/immersiveengineering/ItemLVExchanger.java b/src/main/java/jackyy/exchangers/item/immersiveengineering/ItemLVExchanger.java index 5753a3e..791a612 100644 --- a/src/main/java/jackyy/exchangers/item/immersiveengineering/ItemLVExchanger.java +++ b/src/main/java/jackyy/exchangers/item/immersiveengineering/ItemLVExchanger.java @@ -2,13 +2,10 @@ import jackyy.exchangers.Config; import jackyy.exchangers.Exchangers; -import jackyy.exchangers.helper.EnergyHelper; import jackyy.exchangers.item.ItemExchangerBasePowered; import net.minecraft.client.renderer.block.model.ModelResourceLocation; -import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemStack; -import net.minecraft.util.NonNullList; import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.fml.common.Loader; import net.minecraftforge.fml.relauncher.Side; @@ -19,9 +16,6 @@ public class ItemLVExchanger extends ItemExchangerBasePowered { public ItemLVExchanger(){ setRegistryName(Exchangers.MODID + ":exlv"); setUnlocalizedName(Exchangers.MODID + ".exlv"); - setMaxStackSize(1); - setCreativeTab(Exchangers.TAB); - setNoRepair(); } @SideOnly(Side.CLIENT) @@ -40,18 +34,8 @@ public int getPerBlockUse() { } @Override - public void getSubItems(CreativeTabs tab, NonNullList list) { - if (Config.immersiveEngineeringModule) { - if (Loader.isModLoaded(Exchangers.IE)) { - if (isInCreativeTab(tab)) { - ItemStack empty = new ItemStack(this); - list.add(empty); - ItemStack full = new ItemStack(this); - EnergyHelper.setDefaultEnergyTag(full, getMaxEnergyStored(full)); - list.add(full); - } - } - } + public boolean checkLoaded() { + return Config.immersiveEngineeringModule && Loader.isModLoaded(Exchangers.IE); } @Override diff --git a/src/main/java/jackyy/exchangers/item/immersiveengineering/ItemMVExchanger.java b/src/main/java/jackyy/exchangers/item/immersiveengineering/ItemMVExchanger.java index 00f3213..212e0ae 100644 --- a/src/main/java/jackyy/exchangers/item/immersiveengineering/ItemMVExchanger.java +++ b/src/main/java/jackyy/exchangers/item/immersiveengineering/ItemMVExchanger.java @@ -2,13 +2,10 @@ import jackyy.exchangers.Config; import jackyy.exchangers.Exchangers; -import jackyy.exchangers.helper.EnergyHelper; import jackyy.exchangers.item.ItemExchangerBasePowered; import net.minecraft.client.renderer.block.model.ModelResourceLocation; -import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemStack; -import net.minecraft.util.NonNullList; import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.fml.common.Loader; import net.minecraftforge.fml.relauncher.Side; @@ -19,9 +16,6 @@ public class ItemMVExchanger extends ItemExchangerBasePowered { public ItemMVExchanger(){ setRegistryName(Exchangers.MODID + ":exmv"); setUnlocalizedName(Exchangers.MODID + ".exmv"); - setMaxStackSize(1); - setCreativeTab(Exchangers.TAB); - setNoRepair(); } @SideOnly(Side.CLIENT) @@ -40,18 +34,8 @@ public int getPerBlockUse() { } @Override - public void getSubItems(CreativeTabs tab, NonNullList list) { - if (Config.immersiveEngineeringModule) { - if (Loader.isModLoaded(Exchangers.IE)) { - if (isInCreativeTab(tab)) { - ItemStack empty = new ItemStack(this); - list.add(empty); - ItemStack full = new ItemStack(this); - EnergyHelper.setDefaultEnergyTag(full, getMaxEnergyStored(full)); - list.add(full); - } - } - } + public boolean checkLoaded() { + return Config.immersiveEngineeringModule && Loader.isModLoaded(Exchangers.IE); } @Override diff --git a/src/main/java/jackyy/exchangers/item/mekanism/ItemAdvancedExchanger.java b/src/main/java/jackyy/exchangers/item/mekanism/ItemAdvancedExchanger.java index eaa3e2e..5b70470 100644 --- a/src/main/java/jackyy/exchangers/item/mekanism/ItemAdvancedExchanger.java +++ b/src/main/java/jackyy/exchangers/item/mekanism/ItemAdvancedExchanger.java @@ -2,13 +2,10 @@ import jackyy.exchangers.Config; import jackyy.exchangers.Exchangers; -import jackyy.exchangers.helper.EnergyHelper; import jackyy.exchangers.item.ItemExchangerBasePowered; import net.minecraft.client.renderer.block.model.ModelResourceLocation; -import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemStack; -import net.minecraft.util.NonNullList; import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.fml.common.Loader; import net.minecraftforge.fml.relauncher.Side; @@ -19,9 +16,6 @@ public class ItemAdvancedExchanger extends ItemExchangerBasePowered { public ItemAdvancedExchanger(){ setRegistryName(Exchangers.MODID + ":exadvanced"); setUnlocalizedName(Exchangers.MODID + ".exadvanced"); - setMaxStackSize(1); - setCreativeTab(Exchangers.TAB); - setNoRepair(); } @SideOnly(Side.CLIENT) @@ -40,18 +34,8 @@ public int getPerBlockUse() { } @Override - public void getSubItems(CreativeTabs tab, NonNullList list) { - if (Config.mekanismModule) { - if (Loader.isModLoaded(Exchangers.MEK)) { - if (isInCreativeTab(tab)) { - ItemStack empty = new ItemStack(this); - list.add(empty); - ItemStack full = new ItemStack(this); - EnergyHelper.setDefaultEnergyTag(full, getMaxEnergyStored(full)); - list.add(full); - } - } - } + public boolean checkLoaded() { + return Config.mekanismModule && Loader.isModLoaded(Exchangers.MEK); } @Override diff --git a/src/main/java/jackyy/exchangers/item/mekanism/ItemBasicExchanger.java b/src/main/java/jackyy/exchangers/item/mekanism/ItemBasicExchanger.java index b615eb5..ba1a936 100644 --- a/src/main/java/jackyy/exchangers/item/mekanism/ItemBasicExchanger.java +++ b/src/main/java/jackyy/exchangers/item/mekanism/ItemBasicExchanger.java @@ -2,13 +2,10 @@ import jackyy.exchangers.Config; import jackyy.exchangers.Exchangers; -import jackyy.exchangers.helper.EnergyHelper; import jackyy.exchangers.item.ItemExchangerBasePowered; import net.minecraft.client.renderer.block.model.ModelResourceLocation; -import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemStack; -import net.minecraft.util.NonNullList; import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.fml.common.Loader; import net.minecraftforge.fml.relauncher.Side; @@ -19,9 +16,6 @@ public class ItemBasicExchanger extends ItemExchangerBasePowered { public ItemBasicExchanger(){ setRegistryName(Exchangers.MODID + ":exbasic"); setUnlocalizedName(Exchangers.MODID + ".exbasic"); - setMaxStackSize(1); - setCreativeTab(Exchangers.TAB); - setNoRepair(); } @SideOnly(Side.CLIENT) @@ -40,18 +34,8 @@ public int getPerBlockUse() { } @Override - public void getSubItems(CreativeTabs tab, NonNullList list) { - if (Config.mekanismModule) { - if (Loader.isModLoaded(Exchangers.MEK)) { - if (isInCreativeTab(tab)) { - ItemStack empty = new ItemStack(this); - list.add(empty); - ItemStack full = new ItemStack(this); - EnergyHelper.setDefaultEnergyTag(full, getMaxEnergyStored(full)); - list.add(full); - } - } - } + public boolean checkLoaded() { + return Config.mekanismModule && Loader.isModLoaded(Exchangers.MEK); } @Override diff --git a/src/main/java/jackyy/exchangers/item/mekanism/ItemEliteExchanger.java b/src/main/java/jackyy/exchangers/item/mekanism/ItemEliteExchanger.java index 2a00a2e..454363c 100644 --- a/src/main/java/jackyy/exchangers/item/mekanism/ItemEliteExchanger.java +++ b/src/main/java/jackyy/exchangers/item/mekanism/ItemEliteExchanger.java @@ -2,13 +2,10 @@ import jackyy.exchangers.Config; import jackyy.exchangers.Exchangers; -import jackyy.exchangers.helper.EnergyHelper; import jackyy.exchangers.item.ItemExchangerBasePowered; import net.minecraft.client.renderer.block.model.ModelResourceLocation; -import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemStack; -import net.minecraft.util.NonNullList; import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.fml.common.Loader; import net.minecraftforge.fml.relauncher.Side; @@ -19,9 +16,6 @@ public class ItemEliteExchanger extends ItemExchangerBasePowered { public ItemEliteExchanger(){ setRegistryName(Exchangers.MODID + ":exelite"); setUnlocalizedName(Exchangers.MODID + ".exelite"); - setMaxStackSize(1); - setCreativeTab(Exchangers.TAB); - setNoRepair(); } @SideOnly(Side.CLIENT) @@ -40,18 +34,8 @@ public int getPerBlockUse() { } @Override - public void getSubItems(CreativeTabs tab, NonNullList list) { - if (Config.mekanismModule) { - if (Loader.isModLoaded(Exchangers.MEK)) { - if (isInCreativeTab(tab)) { - ItemStack empty = new ItemStack(this); - list.add(empty); - ItemStack full = new ItemStack(this); - EnergyHelper.setDefaultEnergyTag(full, getMaxEnergyStored(full)); - list.add(full); - } - } - } + public boolean checkLoaded() { + return Config.mekanismModule && Loader.isModLoaded(Exchangers.MEK); } @Override diff --git a/src/main/java/jackyy/exchangers/item/mekanism/ItemMekanismExchangerCoreT1.java b/src/main/java/jackyy/exchangers/item/mekanism/ItemMekanismExchangerCoreT1.java index 8264a00..bf1ce85 100644 --- a/src/main/java/jackyy/exchangers/item/mekanism/ItemMekanismExchangerCoreT1.java +++ b/src/main/java/jackyy/exchangers/item/mekanism/ItemMekanismExchangerCoreT1.java @@ -2,24 +2,20 @@ import jackyy.exchangers.Config; import jackyy.exchangers.Exchangers; +import jackyy.exchangers.item.ItemCoreBase; import net.minecraft.client.renderer.block.model.ModelResourceLocation; -import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.EnumRarity; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.NonNullList; import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.fml.common.Loader; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -public class ItemMekanismExchangerCoreT1 extends Item { +public class ItemMekanismExchangerCoreT1 extends ItemCoreBase { public ItemMekanismExchangerCoreT1(){ setRegistryName(Exchangers.MODID + ":mekexcore_t1"); setUnlocalizedName(Exchangers.MODID + ".mekexcore_t1"); - setMaxStackSize(16); - setCreativeTab(Exchangers.TAB); } @SideOnly(Side.CLIENT) @@ -28,14 +24,8 @@ public void initModel() { } @Override - public void getSubItems(CreativeTabs tab, NonNullList list) { - if (Config.mekanismModule) { - if (Loader.isModLoaded(Exchangers.MEK)) { - if (isInCreativeTab(tab)) { - list.add(new ItemStack(this)); - } - } - } + public boolean checkLoaded() { + return Config.mekanismModule && Loader.isModLoaded(Exchangers.MEK); } @Override diff --git a/src/main/java/jackyy/exchangers/item/mekanism/ItemMekanismExchangerCoreT2.java b/src/main/java/jackyy/exchangers/item/mekanism/ItemMekanismExchangerCoreT2.java index 7582792..3b38aa6 100644 --- a/src/main/java/jackyy/exchangers/item/mekanism/ItemMekanismExchangerCoreT2.java +++ b/src/main/java/jackyy/exchangers/item/mekanism/ItemMekanismExchangerCoreT2.java @@ -2,24 +2,20 @@ import jackyy.exchangers.Config; import jackyy.exchangers.Exchangers; +import jackyy.exchangers.item.ItemCoreBase; import net.minecraft.client.renderer.block.model.ModelResourceLocation; -import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.EnumRarity; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.NonNullList; import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.fml.common.Loader; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -public class ItemMekanismExchangerCoreT2 extends Item { +public class ItemMekanismExchangerCoreT2 extends ItemCoreBase { public ItemMekanismExchangerCoreT2(){ setRegistryName(Exchangers.MODID + ":mekexcore_t2"); setUnlocalizedName(Exchangers.MODID + ".mekexcore_t2"); - setMaxStackSize(16); - setCreativeTab(Exchangers.TAB); } @SideOnly(Side.CLIENT) @@ -28,14 +24,8 @@ public void initModel() { } @Override - public void getSubItems(CreativeTabs tab, NonNullList list) { - if (Config.mekanismModule) { - if (Loader.isModLoaded(Exchangers.MEK)) { - if (isInCreativeTab(tab)) { - list.add(new ItemStack(this)); - } - } - } + public boolean checkLoaded() { + return Config.mekanismModule && Loader.isModLoaded(Exchangers.MEK); } @Override diff --git a/src/main/java/jackyy/exchangers/item/mekanism/ItemMekanismExchangerCoreT3.java b/src/main/java/jackyy/exchangers/item/mekanism/ItemMekanismExchangerCoreT3.java index 9f1a712..8323ae0 100644 --- a/src/main/java/jackyy/exchangers/item/mekanism/ItemMekanismExchangerCoreT3.java +++ b/src/main/java/jackyy/exchangers/item/mekanism/ItemMekanismExchangerCoreT3.java @@ -2,24 +2,20 @@ import jackyy.exchangers.Config; import jackyy.exchangers.Exchangers; +import jackyy.exchangers.item.ItemCoreBase; import net.minecraft.client.renderer.block.model.ModelResourceLocation; -import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.EnumRarity; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.NonNullList; import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.fml.common.Loader; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -public class ItemMekanismExchangerCoreT3 extends Item { +public class ItemMekanismExchangerCoreT3 extends ItemCoreBase { public ItemMekanismExchangerCoreT3(){ setRegistryName(Exchangers.MODID + ":mekexcore_t3"); setUnlocalizedName(Exchangers.MODID + ".mekexcore_t3"); - setMaxStackSize(16); - setCreativeTab(Exchangers.TAB); } @SideOnly(Side.CLIENT) @@ -28,16 +24,9 @@ public void initModel() { } @Override - public void getSubItems(CreativeTabs tab, NonNullList list) { - if (Config.mekanismModule) { - if (Loader.isModLoaded(Exchangers.MEK)) { - if (isInCreativeTab(tab)) { - list.add(new ItemStack(this)); - } - } - } + public boolean checkLoaded() { + return Config.mekanismModule && Loader.isModLoaded(Exchangers.MEK); } - @Override public EnumRarity getRarity(ItemStack stack) { return EnumRarity.EPIC; diff --git a/src/main/java/jackyy/exchangers/item/mekanism/ItemUltimateExchanger.java b/src/main/java/jackyy/exchangers/item/mekanism/ItemUltimateExchanger.java index 7a68e28..39a3e0f 100644 --- a/src/main/java/jackyy/exchangers/item/mekanism/ItemUltimateExchanger.java +++ b/src/main/java/jackyy/exchangers/item/mekanism/ItemUltimateExchanger.java @@ -2,13 +2,10 @@ import jackyy.exchangers.Config; import jackyy.exchangers.Exchangers; -import jackyy.exchangers.helper.EnergyHelper; import jackyy.exchangers.item.ItemExchangerBasePowered; import net.minecraft.client.renderer.block.model.ModelResourceLocation; -import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemStack; -import net.minecraft.util.NonNullList; import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.fml.common.Loader; import net.minecraftforge.fml.relauncher.Side; @@ -19,9 +16,6 @@ public class ItemUltimateExchanger extends ItemExchangerBasePowered { public ItemUltimateExchanger(){ setRegistryName(Exchangers.MODID + ":exultimate"); setUnlocalizedName(Exchangers.MODID + ".exultimate"); - setMaxStackSize(1); - setCreativeTab(Exchangers.TAB); - setNoRepair(); } @SideOnly(Side.CLIENT) @@ -40,18 +34,8 @@ public int getPerBlockUse() { } @Override - public void getSubItems(CreativeTabs tab, NonNullList list) { - if (Config.mekanismModule) { - if (Loader.isModLoaded(Exchangers.MEK)) { - if (isInCreativeTab(tab)) { - ItemStack empty = new ItemStack(this); - list.add(empty); - ItemStack full = new ItemStack(this); - EnergyHelper.setDefaultEnergyTag(full, getMaxEnergyStored(full)); - list.add(full); - } - } - } + public boolean checkLoaded() { + return Config.mekanismModule && Loader.isModLoaded(Exchangers.MEK); } @Override diff --git a/src/main/java/jackyy/exchangers/item/special/ItemCreativeExchanger.java b/src/main/java/jackyy/exchangers/item/special/ItemCreativeExchanger.java index 961e9f2..00c3292 100644 --- a/src/main/java/jackyy/exchangers/item/special/ItemCreativeExchanger.java +++ b/src/main/java/jackyy/exchangers/item/special/ItemCreativeExchanger.java @@ -4,10 +4,8 @@ import jackyy.exchangers.Exchangers; import jackyy.exchangers.item.ItemExchangerBase; import net.minecraft.client.renderer.block.model.ModelResourceLocation; -import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemStack; -import net.minecraft.util.NonNullList; import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -17,9 +15,7 @@ public class ItemCreativeExchanger extends ItemExchangerBase { public ItemCreativeExchanger(){ setRegistryName(Exchangers.MODID + ":excreative"); setUnlocalizedName(Exchangers.MODID + ".excreative"); - setMaxStackSize(1); setMaxDamage(9001); - setCreativeTab(Exchangers.TAB); } @SideOnly(Side.CLIENT) @@ -43,12 +39,8 @@ public int getMaxRange() { } @Override - public void getSubItems(CreativeTabs tab, NonNullList list) { - if (Config.specialModule) { - if (isInCreativeTab(tab)) { - list.add(new ItemStack(this)); - } - } + public boolean checkLoaded() { + return Config.specialModule; } @Override diff --git a/src/main/java/jackyy/exchangers/item/special/ItemTuberousExchanger.java b/src/main/java/jackyy/exchangers/item/special/ItemTuberousExchanger.java index 8eba3a5..3bcbe12 100644 --- a/src/main/java/jackyy/exchangers/item/special/ItemTuberousExchanger.java +++ b/src/main/java/jackyy/exchangers/item/special/ItemTuberousExchanger.java @@ -6,7 +6,6 @@ import jackyy.exchangers.item.ItemExchangerBase; import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.client.util.ITooltipFlag; -import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemStack; @@ -24,9 +23,7 @@ public class ItemTuberousExchanger extends ItemExchangerBase { public ItemTuberousExchanger(){ setRegistryName(Exchangers.MODID + ":expotato"); setUnlocalizedName(Exchangers.MODID + ".expotato"); - setMaxStackSize(1); setMaxDamage(1); - setCreativeTab(Exchangers.TAB); } @SideOnly(Side.CLIENT) @@ -39,7 +36,7 @@ public void initModel() { public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag bool) { super.addInformation(stack, world, tooltip, bool); if (StringHelper.isShiftKeyDown()) { - tooltip.add(StringHelper.localize("tooltip.tuberousExchanger.warning")); + tooltip.add(StringHelper.localize("tooltip.tuberous_exchanger.warning")); } } @@ -62,7 +59,7 @@ public ActionResult onItemRightClick(World world, EntityPlayer player private static boolean killPlayer(EntityPlayer player, ItemStack stack) { if (player != null) { stack.setCount(0); - player.attackEntityFrom(new EntityDamageSource("exchangerpotato", player), 100000.0F); + player.attackEntityFrom(new EntityDamageSource("tuberous_exchanger", player), 100000.0F); player.world.createExplosion(player, player.posX, player.posY, player.posZ, 1.0F, false); return true; } @@ -75,12 +72,8 @@ public int getMaxRange() { } @Override - public void getSubItems(CreativeTabs tab, NonNullList list) { - if (Config.specialModule) { - if (isInCreativeTab(tab)) { - list.add(new ItemStack(this)); - } - } + public boolean checkLoaded() { + return Config.specialModule; } @Override diff --git a/src/main/java/jackyy/exchangers/item/thermalexpansion/ItemHardenedExchanger.java b/src/main/java/jackyy/exchangers/item/thermalexpansion/ItemHardenedExchanger.java index 8b31649..c889d16 100644 --- a/src/main/java/jackyy/exchangers/item/thermalexpansion/ItemHardenedExchanger.java +++ b/src/main/java/jackyy/exchangers/item/thermalexpansion/ItemHardenedExchanger.java @@ -2,13 +2,10 @@ import jackyy.exchangers.Config; import jackyy.exchangers.Exchangers; -import jackyy.exchangers.helper.EnergyHelper; import jackyy.exchangers.item.ItemExchangerBasePowered; import net.minecraft.client.renderer.block.model.ModelResourceLocation; -import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemStack; -import net.minecraft.util.NonNullList; import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.fml.common.Loader; import net.minecraftforge.fml.relauncher.Side; @@ -19,9 +16,6 @@ public class ItemHardenedExchanger extends ItemExchangerBasePowered { public ItemHardenedExchanger(){ setRegistryName(Exchangers.MODID + ":exhardened"); setUnlocalizedName(Exchangers.MODID + ".exhardened"); - setMaxStackSize(1); - setCreativeTab(Exchangers.TAB); - setNoRepair(); } @SideOnly(Side.CLIENT) @@ -40,18 +34,8 @@ public int getPerBlockUse() { } @Override - public void getSubItems(CreativeTabs tab, NonNullList list) { - if (Config.thermalExpansionModule) { - if (Loader.isModLoaded(Exchangers.TE)) { - if (isInCreativeTab(tab)) { - ItemStack empty = new ItemStack(this); - list.add(empty); - ItemStack full = new ItemStack(this); - EnergyHelper.setDefaultEnergyTag(full, getMaxEnergyStored(full)); - list.add(full); - } - } - } + public boolean checkLoaded() { + return Config.thermalExpansionModule && Loader.isModLoaded(Exchangers.TE); } @Override diff --git a/src/main/java/jackyy/exchangers/item/thermalexpansion/ItemLeadstoneExchanger.java b/src/main/java/jackyy/exchangers/item/thermalexpansion/ItemLeadstoneExchanger.java index 258d858..2b79966 100644 --- a/src/main/java/jackyy/exchangers/item/thermalexpansion/ItemLeadstoneExchanger.java +++ b/src/main/java/jackyy/exchangers/item/thermalexpansion/ItemLeadstoneExchanger.java @@ -2,13 +2,10 @@ import jackyy.exchangers.Config; import jackyy.exchangers.Exchangers; -import jackyy.exchangers.helper.EnergyHelper; import jackyy.exchangers.item.ItemExchangerBasePowered; import net.minecraft.client.renderer.block.model.ModelResourceLocation; -import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemStack; -import net.minecraft.util.NonNullList; import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.fml.common.Loader; import net.minecraftforge.fml.relauncher.Side; @@ -19,9 +16,6 @@ public class ItemLeadstoneExchanger extends ItemExchangerBasePowered { public ItemLeadstoneExchanger(){ setRegistryName(Exchangers.MODID + ":exleadstone"); setUnlocalizedName(Exchangers.MODID + ".exleadstone"); - setMaxStackSize(1); - setCreativeTab(Exchangers.TAB); - setNoRepair(); } @SideOnly(Side.CLIENT) @@ -40,18 +34,8 @@ public int getPerBlockUse() { } @Override - public void getSubItems(CreativeTabs tab, NonNullList list) { - if (Config.thermalExpansionModule) { - if (Loader.isModLoaded(Exchangers.TE)) { - if (isInCreativeTab(tab)) { - ItemStack empty = new ItemStack(this); - list.add(empty); - ItemStack full = new ItemStack(this); - EnergyHelper.setDefaultEnergyTag(full, getMaxEnergyStored(full)); - list.add(full); - } - } - } + public boolean checkLoaded() { + return Config.thermalExpansionModule && Loader.isModLoaded(Exchangers.TE); } @Override diff --git a/src/main/java/jackyy/exchangers/item/thermalexpansion/ItemReinforcedExchanger.java b/src/main/java/jackyy/exchangers/item/thermalexpansion/ItemReinforcedExchanger.java index 074497d..9f91457 100644 --- a/src/main/java/jackyy/exchangers/item/thermalexpansion/ItemReinforcedExchanger.java +++ b/src/main/java/jackyy/exchangers/item/thermalexpansion/ItemReinforcedExchanger.java @@ -2,13 +2,10 @@ import jackyy.exchangers.Config; import jackyy.exchangers.Exchangers; -import jackyy.exchangers.helper.EnergyHelper; import jackyy.exchangers.item.ItemExchangerBasePowered; import net.minecraft.client.renderer.block.model.ModelResourceLocation; -import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemStack; -import net.minecraft.util.NonNullList; import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.fml.common.Loader; import net.minecraftforge.fml.relauncher.Side; @@ -19,9 +16,6 @@ public class ItemReinforcedExchanger extends ItemExchangerBasePowered { public ItemReinforcedExchanger(){ setRegistryName(Exchangers.MODID + ":exreinforced"); setUnlocalizedName(Exchangers.MODID + ".exreinforced"); - setMaxStackSize(1); - setCreativeTab(Exchangers.TAB); - setNoRepair(); } @SideOnly(Side.CLIENT) @@ -40,18 +34,8 @@ public int getPerBlockUse() { } @Override - public void getSubItems(CreativeTabs tab, NonNullList list) { - if (Config.thermalExpansionModule) { - if (Loader.isModLoaded(Exchangers.TE)) { - if (isInCreativeTab(tab)) { - ItemStack empty = new ItemStack(this); - list.add(empty); - ItemStack full = new ItemStack(this); - EnergyHelper.setDefaultEnergyTag(full, getMaxEnergyStored(full)); - list.add(full); - } - } - } + public boolean checkLoaded() { + return Config.thermalExpansionModule && Loader.isModLoaded(Exchangers.TE); } @Override diff --git a/src/main/java/jackyy/exchangers/item/thermalexpansion/ItemResonantExchanger.java b/src/main/java/jackyy/exchangers/item/thermalexpansion/ItemResonantExchanger.java index ef48227..53a261a 100644 --- a/src/main/java/jackyy/exchangers/item/thermalexpansion/ItemResonantExchanger.java +++ b/src/main/java/jackyy/exchangers/item/thermalexpansion/ItemResonantExchanger.java @@ -2,13 +2,10 @@ import jackyy.exchangers.Config; import jackyy.exchangers.Exchangers; -import jackyy.exchangers.helper.EnergyHelper; import jackyy.exchangers.item.ItemExchangerBasePowered; import net.minecraft.client.renderer.block.model.ModelResourceLocation; -import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemStack; -import net.minecraft.util.NonNullList; import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.fml.common.Loader; import net.minecraftforge.fml.relauncher.Side; @@ -19,9 +16,6 @@ public class ItemResonantExchanger extends ItemExchangerBasePowered { public ItemResonantExchanger(){ setRegistryName(Exchangers.MODID + ":exresonant"); setUnlocalizedName(Exchangers.MODID + ".exresonant"); - setMaxStackSize(1); - setCreativeTab(Exchangers.TAB); - setNoRepair(); } @SideOnly(Side.CLIENT) @@ -40,18 +34,8 @@ public int getPerBlockUse() { } @Override - public void getSubItems(CreativeTabs tab, NonNullList list) { - if (Config.thermalExpansionModule) { - if (Loader.isModLoaded(Exchangers.TE)) { - if (isInCreativeTab(tab)) { - ItemStack empty = new ItemStack(this); - list.add(empty); - ItemStack full = new ItemStack(this); - EnergyHelper.setDefaultEnergyTag(full, getMaxEnergyStored(full)); - list.add(full); - } - } - } + public boolean checkLoaded() { + return Config.thermalExpansionModule && Loader.isModLoaded(Exchangers.TE); } @Override diff --git a/src/main/java/jackyy/exchangers/item/thermalexpansion/ItemSignalumExchanger.java b/src/main/java/jackyy/exchangers/item/thermalexpansion/ItemSignalumExchanger.java index 91b4ff3..fc289a5 100644 --- a/src/main/java/jackyy/exchangers/item/thermalexpansion/ItemSignalumExchanger.java +++ b/src/main/java/jackyy/exchangers/item/thermalexpansion/ItemSignalumExchanger.java @@ -2,13 +2,10 @@ import jackyy.exchangers.Config; import jackyy.exchangers.Exchangers; -import jackyy.exchangers.helper.EnergyHelper; import jackyy.exchangers.item.ItemExchangerBasePowered; import net.minecraft.client.renderer.block.model.ModelResourceLocation; -import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemStack; -import net.minecraft.util.NonNullList; import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.fml.common.Loader; import net.minecraftforge.fml.relauncher.Side; @@ -19,9 +16,6 @@ public class ItemSignalumExchanger extends ItemExchangerBasePowered { public ItemSignalumExchanger(){ setRegistryName(Exchangers.MODID + ":exsignalum"); setUnlocalizedName(Exchangers.MODID + ".exsignalum"); - setMaxStackSize(1); - setCreativeTab(Exchangers.TAB); - setNoRepair(); } @SideOnly(Side.CLIENT) @@ -40,18 +34,8 @@ public int getPerBlockUse() { } @Override - public void getSubItems(CreativeTabs tab, NonNullList list) { - if (Config.thermalExpansionModule) { - if (Loader.isModLoaded(Exchangers.TE)) { - if (isInCreativeTab(tab)) { - ItemStack empty = new ItemStack(this); - list.add(empty); - ItemStack full = new ItemStack(this); - EnergyHelper.setDefaultEnergyTag(full, getMaxEnergyStored(full)); - list.add(full); - } - } - } + public boolean checkLoaded() { + return Config.thermalExpansionModule && Loader.isModLoaded(Exchangers.TE); } @Override diff --git a/src/main/java/jackyy/exchangers/item/thermalexpansion/ItemTEExchangerCoreT1.java b/src/main/java/jackyy/exchangers/item/thermalexpansion/ItemTEExchangerCoreT1.java index 18bdf09..a3547a3 100644 --- a/src/main/java/jackyy/exchangers/item/thermalexpansion/ItemTEExchangerCoreT1.java +++ b/src/main/java/jackyy/exchangers/item/thermalexpansion/ItemTEExchangerCoreT1.java @@ -2,24 +2,20 @@ import jackyy.exchangers.Config; import jackyy.exchangers.Exchangers; +import jackyy.exchangers.item.ItemCoreBase; import net.minecraft.client.renderer.block.model.ModelResourceLocation; -import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.EnumRarity; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.NonNullList; import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.fml.common.Loader; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -public class ItemTEExchangerCoreT1 extends Item { +public class ItemTEExchangerCoreT1 extends ItemCoreBase { public ItemTEExchangerCoreT1(){ setRegistryName(Exchangers.MODID + ":teexcore_t1"); setUnlocalizedName(Exchangers.MODID + ".teexcore_t1"); - setMaxStackSize(16); - setCreativeTab(Exchangers.TAB); } @SideOnly(Side.CLIENT) @@ -28,14 +24,8 @@ public void initModel() { } @Override - public void getSubItems(CreativeTabs tab, NonNullList list) { - if (Config.thermalExpansionModule) { - if (Loader.isModLoaded(Exchangers.TE)) { - if (isInCreativeTab(tab)) { - list.add(new ItemStack(this)); - } - } - } + public boolean checkLoaded() { + return Config.thermalExpansionModule && Loader.isModLoaded(Exchangers.TE); } @Override diff --git a/src/main/java/jackyy/exchangers/item/thermalexpansion/ItemTEExchangerCoreT2.java b/src/main/java/jackyy/exchangers/item/thermalexpansion/ItemTEExchangerCoreT2.java index ebbbb8b..967d258 100644 --- a/src/main/java/jackyy/exchangers/item/thermalexpansion/ItemTEExchangerCoreT2.java +++ b/src/main/java/jackyy/exchangers/item/thermalexpansion/ItemTEExchangerCoreT2.java @@ -2,24 +2,20 @@ import jackyy.exchangers.Config; import jackyy.exchangers.Exchangers; +import jackyy.exchangers.item.ItemCoreBase; import net.minecraft.client.renderer.block.model.ModelResourceLocation; -import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.EnumRarity; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.NonNullList; import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.fml.common.Loader; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -public class ItemTEExchangerCoreT2 extends Item { +public class ItemTEExchangerCoreT2 extends ItemCoreBase { public ItemTEExchangerCoreT2(){ setRegistryName(Exchangers.MODID + ":teexcore_t2"); setUnlocalizedName(Exchangers.MODID + ".teexcore_t2"); - setMaxStackSize(16); - setCreativeTab(Exchangers.TAB); } @SideOnly(Side.CLIENT) @@ -28,14 +24,8 @@ public void initModel() { } @Override - public void getSubItems(CreativeTabs tab, NonNullList list) { - if (Config.thermalExpansionModule) { - if (Loader.isModLoaded(Exchangers.TE)) { - if (isInCreativeTab(tab)) { - list.add(new ItemStack(this)); - } - } - } + public boolean checkLoaded() { + return Config.thermalExpansionModule && Loader.isModLoaded(Exchangers.TE); } @Override diff --git a/src/main/java/jackyy/exchangers/item/thermalexpansion/ItemTEExchangerCoreT3.java b/src/main/java/jackyy/exchangers/item/thermalexpansion/ItemTEExchangerCoreT3.java index d37933e..a7b46fb 100644 --- a/src/main/java/jackyy/exchangers/item/thermalexpansion/ItemTEExchangerCoreT3.java +++ b/src/main/java/jackyy/exchangers/item/thermalexpansion/ItemTEExchangerCoreT3.java @@ -2,24 +2,20 @@ import jackyy.exchangers.Config; import jackyy.exchangers.Exchangers; +import jackyy.exchangers.item.ItemCoreBase; import net.minecraft.client.renderer.block.model.ModelResourceLocation; -import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.EnumRarity; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.NonNullList; import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.fml.common.Loader; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -public class ItemTEExchangerCoreT3 extends Item { +public class ItemTEExchangerCoreT3 extends ItemCoreBase { public ItemTEExchangerCoreT3(){ setRegistryName(Exchangers.MODID + ":teexcore_t3"); setUnlocalizedName(Exchangers.MODID + ".teexcore_t3"); - setMaxStackSize(16); - setCreativeTab(Exchangers.TAB); } @SideOnly(Side.CLIENT) @@ -28,14 +24,8 @@ public void initModel() { } @Override - public void getSubItems(CreativeTabs tab, NonNullList list) { - if (Config.thermalExpansionModule) { - if (Loader.isModLoaded(Exchangers.TE)) { - if (isInCreativeTab(tab)) { - list.add(new ItemStack(this)); - } - } - } + public boolean checkLoaded() { + return Config.thermalExpansionModule && Loader.isModLoaded(Exchangers.TE); } @Override diff --git a/src/main/java/jackyy/exchangers/item/vanilla/ItemDiamondExchanger.java b/src/main/java/jackyy/exchangers/item/vanilla/ItemDiamondExchanger.java index 5f5ba2a..8ac41f8 100644 --- a/src/main/java/jackyy/exchangers/item/vanilla/ItemDiamondExchanger.java +++ b/src/main/java/jackyy/exchangers/item/vanilla/ItemDiamondExchanger.java @@ -4,10 +4,8 @@ import jackyy.exchangers.Exchangers; import jackyy.exchangers.item.ItemExchangerBase; import net.minecraft.client.renderer.block.model.ModelResourceLocation; -import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemStack; -import net.minecraft.util.NonNullList; import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -17,9 +15,7 @@ public class ItemDiamondExchanger extends ItemExchangerBase { public ItemDiamondExchanger(){ setRegistryName(Exchangers.MODID + ":exdiamond"); setUnlocalizedName(Exchangers.MODID + ".exdiamond"); - setMaxStackSize(1); setMaxDamage(Config.diaMaxDmg); - setCreativeTab(Exchangers.TAB); } @SideOnly(Side.CLIENT) @@ -38,12 +34,8 @@ public int getMaxRange() { } @Override - public void getSubItems(CreativeTabs tab, NonNullList list) { - if (Config.vanillaModule) { - if (isInCreativeTab(tab)) { - list.add(new ItemStack(this)); - } - } + public boolean checkLoaded() { + return Config.vanillaModule; } @Override diff --git a/src/main/java/jackyy/exchangers/item/vanilla/ItemEmeraldExchanger.java b/src/main/java/jackyy/exchangers/item/vanilla/ItemEmeraldExchanger.java index 0f6a9b5..acbddcc 100644 --- a/src/main/java/jackyy/exchangers/item/vanilla/ItemEmeraldExchanger.java +++ b/src/main/java/jackyy/exchangers/item/vanilla/ItemEmeraldExchanger.java @@ -4,10 +4,8 @@ import jackyy.exchangers.Exchangers; import jackyy.exchangers.item.ItemExchangerBase; import net.minecraft.client.renderer.block.model.ModelResourceLocation; -import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemStack; -import net.minecraft.util.NonNullList; import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -38,12 +36,8 @@ public int getMaxRange() { } @Override - public void getSubItems(CreativeTabs tab, NonNullList list) { - if (Config.vanillaModule) { - if (isInCreativeTab(tab)) { - list.add(new ItemStack(this)); - } - } + public boolean checkLoaded() { + return Config.vanillaModule; } @Override diff --git a/src/main/java/jackyy/exchangers/item/vanilla/ItemExchangerCoreT1.java b/src/main/java/jackyy/exchangers/item/vanilla/ItemExchangerCoreT1.java index 6ad46e0..d82d667 100644 --- a/src/main/java/jackyy/exchangers/item/vanilla/ItemExchangerCoreT1.java +++ b/src/main/java/jackyy/exchangers/item/vanilla/ItemExchangerCoreT1.java @@ -2,23 +2,19 @@ import jackyy.exchangers.Config; import jackyy.exchangers.Exchangers; +import jackyy.exchangers.item.ItemCoreBase; import net.minecraft.client.renderer.block.model.ModelResourceLocation; -import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.EnumRarity; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.NonNullList; import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -public class ItemExchangerCoreT1 extends Item { +public class ItemExchangerCoreT1 extends ItemCoreBase { public ItemExchangerCoreT1(){ setRegistryName(Exchangers.MODID + ":excore_t1"); setUnlocalizedName(Exchangers.MODID + ".excore_t1"); - setMaxStackSize(16); - setCreativeTab(Exchangers.TAB); } @SideOnly(Side.CLIENT) @@ -27,12 +23,8 @@ public void initModel() { } @Override - public void getSubItems(CreativeTabs tab, NonNullList list) { - if (Config.vanillaModule) { - if (isInCreativeTab(tab)) { - list.add(new ItemStack(this)); - } - } + public boolean checkLoaded() { + return Config.vanillaModule; } @Override diff --git a/src/main/java/jackyy/exchangers/item/vanilla/ItemExchangerCoreT2.java b/src/main/java/jackyy/exchangers/item/vanilla/ItemExchangerCoreT2.java index c53ce3d..306ec7b 100644 --- a/src/main/java/jackyy/exchangers/item/vanilla/ItemExchangerCoreT2.java +++ b/src/main/java/jackyy/exchangers/item/vanilla/ItemExchangerCoreT2.java @@ -2,23 +2,19 @@ import jackyy.exchangers.Config; import jackyy.exchangers.Exchangers; +import jackyy.exchangers.item.ItemCoreBase; import net.minecraft.client.renderer.block.model.ModelResourceLocation; -import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.EnumRarity; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.NonNullList; import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -public class ItemExchangerCoreT2 extends Item { +public class ItemExchangerCoreT2 extends ItemCoreBase { public ItemExchangerCoreT2(){ setRegistryName(Exchangers.MODID + ":excore_t2"); setUnlocalizedName(Exchangers.MODID + ".excore_t2"); - setMaxStackSize(16); - setCreativeTab(Exchangers.TAB); } @SideOnly(Side.CLIENT) @@ -27,12 +23,8 @@ public void initModel() { } @Override - public void getSubItems(CreativeTabs tab, NonNullList list) { - if (Config.vanillaModule) { - if (isInCreativeTab(tab)) { - list.add(new ItemStack(this)); - } - } + public boolean checkLoaded() { + return Config.vanillaModule; } @Override diff --git a/src/main/java/jackyy/exchangers/item/vanilla/ItemExchangerCoreT3.java b/src/main/java/jackyy/exchangers/item/vanilla/ItemExchangerCoreT3.java index c14c4bc..29d3036 100644 --- a/src/main/java/jackyy/exchangers/item/vanilla/ItemExchangerCoreT3.java +++ b/src/main/java/jackyy/exchangers/item/vanilla/ItemExchangerCoreT3.java @@ -2,23 +2,19 @@ import jackyy.exchangers.Config; import jackyy.exchangers.Exchangers; +import jackyy.exchangers.item.ItemCoreBase; import net.minecraft.client.renderer.block.model.ModelResourceLocation; -import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.EnumRarity; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.NonNullList; import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -public class ItemExchangerCoreT3 extends Item { +public class ItemExchangerCoreT3 extends ItemCoreBase { public ItemExchangerCoreT3(){ setRegistryName(Exchangers.MODID + ":excore_t3"); setUnlocalizedName(Exchangers.MODID + ".excore_t3"); - setMaxStackSize(16); - setCreativeTab(Exchangers.TAB); } @SideOnly(Side.CLIENT) @@ -27,12 +23,8 @@ public void initModel() { } @Override - public void getSubItems(CreativeTabs tab, NonNullList list) { - if (Config.vanillaModule) { - if (isInCreativeTab(tab)) { - list.add(new ItemStack(this)); - } - } + public boolean checkLoaded() { + return Config.vanillaModule; } @Override diff --git a/src/main/java/jackyy/exchangers/item/vanilla/ItemGoldenExchanger.java b/src/main/java/jackyy/exchangers/item/vanilla/ItemGoldenExchanger.java index fd4e175..132894c 100644 --- a/src/main/java/jackyy/exchangers/item/vanilla/ItemGoldenExchanger.java +++ b/src/main/java/jackyy/exchangers/item/vanilla/ItemGoldenExchanger.java @@ -4,10 +4,8 @@ import jackyy.exchangers.Exchangers; import jackyy.exchangers.item.ItemExchangerBase; import net.minecraft.client.renderer.block.model.ModelResourceLocation; -import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemStack; -import net.minecraft.util.NonNullList; import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -17,9 +15,7 @@ public class ItemGoldenExchanger extends ItemExchangerBase { public ItemGoldenExchanger(){ setRegistryName(Exchangers.MODID + ":exgolden"); setUnlocalizedName(Exchangers.MODID + ".exgolden"); - setMaxStackSize(1); setMaxDamage(Config.goldMaxDmg); - setCreativeTab(Exchangers.TAB); } @SideOnly(Side.CLIENT) @@ -38,12 +34,8 @@ public int getMaxRange() { } @Override - public void getSubItems(CreativeTabs tab, NonNullList list) { - if (Config.vanillaModule) { - if (isInCreativeTab(tab)) { - list.add(new ItemStack(this)); - } - } + public boolean checkLoaded() { + return Config.vanillaModule; } @Override diff --git a/src/main/java/jackyy/exchangers/item/vanilla/ItemIronExchanger.java b/src/main/java/jackyy/exchangers/item/vanilla/ItemIronExchanger.java index bd7d7f8..f247956 100644 --- a/src/main/java/jackyy/exchangers/item/vanilla/ItemIronExchanger.java +++ b/src/main/java/jackyy/exchangers/item/vanilla/ItemIronExchanger.java @@ -4,10 +4,8 @@ import jackyy.exchangers.Exchangers; import jackyy.exchangers.item.ItemExchangerBase; import net.minecraft.client.renderer.block.model.ModelResourceLocation; -import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemStack; -import net.minecraft.util.NonNullList; import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -17,9 +15,7 @@ public class ItemIronExchanger extends ItemExchangerBase { public ItemIronExchanger(){ setRegistryName(Exchangers.MODID + ":exiron"); setUnlocalizedName(Exchangers.MODID + ".exiron"); - setMaxStackSize(1); setMaxDamage(Config.ironMaxDmg); - setCreativeTab(Exchangers.TAB); } @SideOnly(Side.CLIENT) @@ -38,12 +34,8 @@ public int getMaxRange() { } @Override - public void getSubItems(CreativeTabs tab, NonNullList list) { - if (Config.vanillaModule) { - if (isInCreativeTab(tab)) { - list.add(new ItemStack(this)); - } - } + public boolean checkLoaded() { + return Config.vanillaModule; } @Override diff --git a/src/main/java/jackyy/exchangers/item/vanilla/ItemObsidianExchanger.java b/src/main/java/jackyy/exchangers/item/vanilla/ItemObsidianExchanger.java index 6cc470d..49c94a3 100644 --- a/src/main/java/jackyy/exchangers/item/vanilla/ItemObsidianExchanger.java +++ b/src/main/java/jackyy/exchangers/item/vanilla/ItemObsidianExchanger.java @@ -4,10 +4,8 @@ import jackyy.exchangers.Exchangers; import jackyy.exchangers.item.ItemExchangerBase; import net.minecraft.client.renderer.block.model.ModelResourceLocation; -import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemStack; -import net.minecraft.util.NonNullList; import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -17,9 +15,7 @@ public class ItemObsidianExchanger extends ItemExchangerBase { public ItemObsidianExchanger(){ setRegistryName(Exchangers.MODID + ":exobsidian"); setUnlocalizedName(Exchangers.MODID + ".exobsidian"); - setMaxStackSize(1); setMaxDamage(Config.obsMaxDmg); - setCreativeTab(Exchangers.TAB); } @SideOnly(Side.CLIENT) @@ -38,12 +34,8 @@ public int getMaxRange() { } @Override - public void getSubItems(CreativeTabs tab, NonNullList list) { - if (Config.vanillaModule) { - if (isInCreativeTab(tab)) { - list.add(new ItemStack(this)); - } - } + public boolean checkLoaded() { + return Config.vanillaModule; } @Override diff --git a/src/main/java/jackyy/exchangers/item/vanilla/ItemStoneExchanger.java b/src/main/java/jackyy/exchangers/item/vanilla/ItemStoneExchanger.java index 4eb4d4a..d6a59d1 100644 --- a/src/main/java/jackyy/exchangers/item/vanilla/ItemStoneExchanger.java +++ b/src/main/java/jackyy/exchangers/item/vanilla/ItemStoneExchanger.java @@ -4,10 +4,8 @@ import jackyy.exchangers.Exchangers; import jackyy.exchangers.item.ItemExchangerBase; import net.minecraft.client.renderer.block.model.ModelResourceLocation; -import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemStack; -import net.minecraft.util.NonNullList; import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -17,9 +15,7 @@ public class ItemStoneExchanger extends ItemExchangerBase { public ItemStoneExchanger(){ setRegistryName(Exchangers.MODID + ":exstone"); setUnlocalizedName(Exchangers.MODID + ".exstone"); - setMaxStackSize(1); setMaxDamage(Config.stoneMaxDmg); - setCreativeTab(Exchangers.TAB); } @SideOnly(Side.CLIENT) @@ -38,12 +34,8 @@ public int getMaxRange() { } @Override - public void getSubItems(CreativeTabs tab, NonNullList list) { - if (Config.vanillaModule) { - if (isInCreativeTab(tab)) { - list.add(new ItemStack(this)); - } - } + public boolean checkLoaded() { + return Config.vanillaModule; } @Override diff --git a/src/main/java/jackyy/exchangers/item/vanilla/ItemWoodenExchanger.java b/src/main/java/jackyy/exchangers/item/vanilla/ItemWoodenExchanger.java index a3544b0..7c18ce3 100644 --- a/src/main/java/jackyy/exchangers/item/vanilla/ItemWoodenExchanger.java +++ b/src/main/java/jackyy/exchangers/item/vanilla/ItemWoodenExchanger.java @@ -4,10 +4,8 @@ import jackyy.exchangers.Exchangers; import jackyy.exchangers.item.ItemExchangerBase; import net.minecraft.client.renderer.block.model.ModelResourceLocation; -import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemStack; -import net.minecraft.util.NonNullList; import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -17,9 +15,7 @@ public class ItemWoodenExchanger extends ItemExchangerBase { public ItemWoodenExchanger(){ setRegistryName(Exchangers.MODID + ":exwooden"); setUnlocalizedName(Exchangers.MODID + ".exwooden"); - setMaxStackSize(1); setMaxDamage(Config.woodMaxDmg); - setCreativeTab(Exchangers.TAB); } @SideOnly(Side.CLIENT) @@ -38,12 +34,8 @@ public int getMaxRange() { } @Override - public void getSubItems(CreativeTabs tab, NonNullList list) { - if (Config.vanillaModule) { - if (isInCreativeTab(tab)) { - list.add(new ItemStack(this)); - } - } + public boolean checkLoaded() { + return Config.vanillaModule; } @Override diff --git a/src/main/java/jackyy/exchangers/util/IExchanger.java b/src/main/java/jackyy/exchangers/util/IExchanger.java new file mode 100644 index 0000000..ad91de4 --- /dev/null +++ b/src/main/java/jackyy/exchangers/util/IExchanger.java @@ -0,0 +1,33 @@ +package jackyy.exchangers.util; + +public interface IExchanger { + + default int getTier() { + return this.getTier(); + } + + default int getMaxRange() { + return this.getMaxRange(); + } + + default int getMaxEnergy() { + return this.getMaxEnergy(); + } + + default int getPerBlockUse() { + return this.getPerBlockUse(); + } + + default boolean isCreative() { + return false; + } + + default boolean isPowered() { + return false; + } + + default boolean checkLoaded() { + return this.checkLoaded(); + } + +} diff --git a/src/main/java/jackyy/exchangers/util/StackUtil.java b/src/main/java/jackyy/exchangers/util/StackUtil.java deleted file mode 100644 index a6bbe52..0000000 --- a/src/main/java/jackyy/exchangers/util/StackUtil.java +++ /dev/null @@ -1,39 +0,0 @@ -package jackyy.exchangers.util; - -import net.minecraft.item.ItemStack; - -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - -public class StackUtil { - - @Nullable - public static ItemStack incStackSize(@Nonnull ItemStack stack, int amount) { - stack.setCount(stack.getCount() + amount); - if (stack.getCount() <= 0) { - return ItemStack.EMPTY; - } - return stack; - } - - public static int getStackSize(@Nullable ItemStack stack) { - if (stack == ItemStack.EMPTY) { - return 0; - } - return stack.getCount(); - } - - @Nullable - public static ItemStack getEmptyStack(@Nullable ItemStack stack) { - return ItemStack.EMPTY; - } - - public static boolean isValid(@Nullable ItemStack stack) { - return stack != ItemStack.EMPTY && stack.getCount() > 0; - } - - public static boolean isEmpty(@Nullable ItemStack stack) { - return stack == ItemStack.EMPTY || stack.getCount() <= 0; - } - -} diff --git a/src/main/resources/assets/exchangers/lang/de_DE.lang b/src/main/resources/assets/exchangers/lang/de_DE.lang index 973d0f9..e29a7eb 100644 --- a/src/main/resources/assets/exchangers/lang/de_DE.lang +++ b/src/main/resources/assets/exchangers/lang/de_DE.lang @@ -3,33 +3,36 @@ itemGroup.exchangers=Austauscher #Key Bindings key.categories.exchangers=Austauscher -key.exchangermode=Austauscher Modus +key.exchanger_mode=Austauscher Modus #Death -death.attack.exchangerpotato=%1$s versuchte einene Kartoffel Austauscher zu verwenden -death.attack.exchangerpotato.player=%1$s versuchte einene Kartoffel Austauscher zu verwenden -death.attack.exchangerpotato.item=%1$s versuchte einene Kartoffel Austauscher zu verwenden +death.attack.tuberous_exchanger=%1$s versuchte einene Kartoffel Austauscher zu verwenden +death.attack.tuberous_exchanger.player=%1$s versuchte einene Kartoffel Austauscher zu verwenden +death.attack.tuberous_exchanger.item=%1$s versuchte einene Kartoffel Austauscher zu verwenden #Tooltips exchangers.tooltip.durability=Haltbarkeit exchangers.tooltip.tier=Stufe %d -exchangers.tooltip.holdShift=Drücke %s für Details -exchangers.tooltip.holdShift.shift=Shift +exchangers.tooltip.hold_shift=Drücke %s für Details +exchangers.tooltip.hold_shift.shift=Shift exchangers.tooltip.shift1=Schleichen und Block rechtsklicken um zu wählen. exchangers.tooltip.shift2=Block rechtsklicken um auszutauschen. exchangers.tooltip.shift3=Verwende die Modus Taste um den Modus zu wechseln. -exchangers.tooltip.tuberousExchanger.warning=§c§oKlever! Aber nicht austauschbar. -exchangers.tooltip.selectedblock=§2Ausgewählter Block: -exchangers.tooltip.currentrange=§2Reichweite: -exchangers.tooltip.maxrange=§2Maximale Reichweite: -exchangers.tooltip.noselectedblock=§4Kein Block ausgewählt. +exchangers.tooltip.tuberous_exchanger.warning=§c§oKlever! Aber nicht austauschbar. +exchangers.tooltip.selected_block=§2Ausgewählter Block: +exchangers.tooltip.current_range=§2Reichweite: +exchangers.tooltip.max_range=§2Maximale Reichweite: +exchangers.tooltip.no_selected_block=§4Kein Block ausgewählt. +exchangers.tooltip.silk_touch.on=§fSilk Touch mode is §a§lenabled§r in config. +exchangers.tooltip.silk_touch.off=§fSilk Touch mode is §4§ldisabled§r in config. #Error Messages -exchangers.error.invalidblock.te=§cFehler: Ungültiger Block! (Tile Entities) -exchangers.error.invalidblock.unbreakable=§cFehler: Ungültiger Block! (Unbreakable Blocks) -exchangers.error.invalidblock.null=§cFehler: Ungültiger Block! (Null Display Name) -exchangers.error.outofblock=§cFehler: Nicht genügend Blöcke! -exchangers.error.nopower=§cFehler: Nicht genügend Energie! +exchangers.error.invalid_block.te=§cFehler: Ungültiger Block! (Tile Entities) +exchangers.error.invalid_block.unbreakable=§cFehler: Ungültiger Block! (Unbreakable Blocks) +exchangers.error.invalid_block.null=§cFehler: Ungültiger Block! (Null Display Name) +exchangers.error.out_of_block=§cFehler: Nicht genügend Blöcke! +exchangers.error.out_of_power=§cFehler: Nicht genügend Energie! +exchangers.error.event_cancelled=§cFehler: Exchange event cancelled by other mods! #Crafting Components #Vanilla diff --git a/src/main/resources/assets/exchangers/lang/en_US.lang b/src/main/resources/assets/exchangers/lang/en_US.lang index 3f5add7..1bde2f7 100644 --- a/src/main/resources/assets/exchangers/lang/en_US.lang +++ b/src/main/resources/assets/exchangers/lang/en_US.lang @@ -3,33 +3,36 @@ itemGroup.exchangers=Exchangers #Key Bindings key.categories.exchangers=Exchangers -key.exchangermode=Exchanger Mode Switch +key.exchanger_mode=Exchanger Mode Switch #Death -death.attack.exchangerpotato=%1$s tried to operate a potato exchanger -death.attack.exchangerpotato.player=%1$s tried to operate a potato exchanger -death.attack.exchangerpotato.item=%1$s tried to operate a potato exchanger +death.attack.tuberous_exchanger=%1$s tried to operate a potato exchanger +death.attack.tuberous_exchanger.player=%1$s tried to operate a potato exchanger +death.attack.tuberous_exchanger.item=%1$s tried to operate a potato exchanger #Tooltips exchangers.tooltip.durability=Durability exchangers.tooltip.tier=Tier %d -exchangers.tooltip.holdShift=Hold %s for Details -exchangers.tooltip.holdShift.shift=Shift +exchangers.tooltip.hold_shift=Hold %s for Details +exchangers.tooltip.hold_shift.shift=Shift exchangers.tooltip.shift1=Sneak right click on block to select. exchangers.tooltip.shift2=Right click on a block to exchange. exchangers.tooltip.shift3=Use the mode key to switch modes. -exchangers.tooltip.tuberousExchanger.warning=§c§oClever! But not exchangeable. -exchangers.tooltip.selectedblock=§2Selected Block: -exchangers.tooltip.currentrange=§2Current Range: -exchangers.tooltip.maxrange=§2Maximum Range: -exchangers.tooltip.noselectedblock=§4No Selected Block +exchangers.tooltip.tuberous_exchanger.warning=§c§oClever! But not exchangeable. +exchangers.tooltip.selected_block=§2Selected Block: +exchangers.tooltip.current_range=§2Current Range: +exchangers.tooltip.max_range=§2Maximum Range: +exchangers.tooltip.no_selected_block=§4No Selected Block +exchangers.tooltip.silk_touch.on=§fSilk Touch mode is §a§lenabled§r in config. +exchangers.tooltip.silk_touch.off=§fSilk Touch mode is §4§ldisabled§r in config. #Error Messages -exchangers.error.invalidblock.te=§cError: Invalid block! (Tile Entities) -exchangers.error.invalidblock.unbreakable=§cError: Invalid block! (Unbreakable Blocks) -exchangers.error.invalidblock.null=§cError: Invalid block! (Null Display Name) -exchangers.error.outofblock=§cError: Out of block! -exchangers.error.nopower=§cError: Out of power! +exchangers.error.invalid_block.te=§cError: Invalid block! (Tile Entities) +exchangers.error.invalid_block.unbreakable=§cError: Invalid block! (Unbreakable Blocks) +exchangers.error.invalid_block.null=§cError: Invalid block! (Null Display Name) +exchangers.error.out_of_block=§cError: Out of block! +exchangers.error.out_of_power=§cError: Out of power! +exchangers.error.event_cancelled=§cError: Exchange event cancelled by other mods! #Crafting Components #Vanilla diff --git a/src/main/resources/assets/exchangers/lang/pl_PL.lang b/src/main/resources/assets/exchangers/lang/pl_PL.lang index 721fa26..f5e69e9 100644 --- a/src/main/resources/assets/exchangers/lang/pl_PL.lang +++ b/src/main/resources/assets/exchangers/lang/pl_PL.lang @@ -3,33 +3,36 @@ itemGroup.exchangers=Wymieniacze #Key Bindings key.categories.exchangers=Wymieniacze -key.exchangermode=Zmiana Trybu Wymieniaczy +key.exchanger_mode=Zmiana Trybu Wymieniaczy #Death -death.attack.exchangerpotato=%1$s próbował używać ziemniaczanego wymieniacza -death.attack.exchangerpotato.player=%1$s próbował używać ziemniaczanego wymieniacza -death.attack.exchangerpotato.item=%1$s próbował używać ziemniaczanego wymieniacza +death.attack.tuberous_exchanger=%1$s próbował używać ziemniaczanego wymieniacza +death.attack.tuberous_exchanger.player=%1$s próbował używać ziemniaczanego wymieniacza +death.attack.tuberous_exchanger.item=%1$s próbował używać ziemniaczanego wymieniacza #Tooltips exchangers.tooltip.durability=Wytrzymałość exchangers.tooltip.tier=Poziom %d -exchangers.tooltip.holdShift=Przytrzymaj %s dla Szczegółów -exchangers.tooltip.holdShift.shift=Shift +exchangers.tooltip.hold_shift=Przytrzymaj %s dla Szczegółów +exchangers.tooltip.hold_shift.shift=Shift exchangers.tooltip.shift1=Kucając Kucając kliknij prawy przycisk myszki na blok by go wybrać. exchangers.tooltip.shift2=Kliknij prawym przyciskiem myszy na blok by go wymienić. exchangers.tooltip.shift3=Użyj przycisku do zmieniania trybów by zmienić tryb. -exchangers.tooltip.tuberousExchanger.warning=§c§oSprytne! Ale niewymienne. -exchangers.tooltip.selectedblock=§2Wybrany Blok: -exchangers.tooltip.currentrange=§2Aktualny Zasięg: -exchangers.tooltip.maxrange=§2Maksymalny Zasięg: -exchangers.tooltip.noselectedblock=§4Brak Wybranego Bloku +exchangers.tooltip.tuberous_exchanger.warning=§c§oSprytne! Ale niewymienne. +exchangers.tooltip.selected_block=§2Wybrany Blok: +exchangers.tooltip.current_range=§2Aktualny Zasięg: +exchangers.tooltip.max_range=§2Maksymalny Zasięg: +exchangers.tooltip.no_selected_block=§4Brak Wybranego Bloku +exchangers.tooltip.silk_touch.on=§fSilk Touch mode is §a§lenabled§r in config. +exchangers.tooltip.silk_touch.off=§fSilk Touch mode is §4§ldisabled§r in config. #Error Messages -exchangers.error.invalidblock.te=§cError: Nieprwaidłowy Blok! (Tile Entities) -exchangers.error.invalidblock.unbreakable=§cError: Nieprwaidłowy Blok! (Unbreakable Blocks) -exchangers.error.invalidblock.null=§cError: Nieprwaidłowy Blok! (Null Display Name) -exchangers.error.outofblock=§cError: Brak bloków! -exchangers.error.nopower=§cError: Brak Energii! +exchangers.error.invalid_block.te=§cError: Nieprwaidłowy Blok! (Tile Entities) +exchangers.error.invalid_block.unbreakable=§cError: Nieprwaidłowy Blok! (Unbreakable Blocks) +exchangers.error.invalid_block.null=§cError: Nieprwaidłowy Blok! (Null Display Name) +exchangers.error.out_of_block=§cError: Brak bloków! +exchangers.error.out_of_power=§cError: Brak Energii! +exchangers.error.event_cancelled=§cError: Exchange event cancelled by other mods! #Crafting Components #Vanilla diff --git a/src/main/resources/assets/exchangers/lang/pt_BR.lang b/src/main/resources/assets/exchangers/lang/pt_BR.lang index 2596223..a0fb6b5 100644 --- a/src/main/resources/assets/exchangers/lang/pt_BR.lang +++ b/src/main/resources/assets/exchangers/lang/pt_BR.lang @@ -3,33 +3,36 @@ itemGroup.exchangers=Exchangers #Key Bindings key.categories.exchangers=Exchangers -key.exchangermode=Alternar entre modos +key.exchanger_mode=Alternar entre modos #Death -death.attack.exchangerpotato=%1$s Tentou operar um Alterador de Batata -death.attack.exchangerpotato.player=%1$s Tentou operar um Alterador de Batata -death.attack.exchangerpotato.item=%1$s Tentou operar um Alterador de Batata +death.attack.tuberous_exchanger=%1$s Tentou operar um Alterador de Batata +death.attack.tuberous_exchanger.player=%1$s Tentou operar um Alterador de Batata +death.attack.tuberous_exchanger.item=%1$s Tentou operar um Alterador de Batata #Tooltips exchangers.tooltip.durability=Durabilidade exchangers.tooltip.tier=Nível %d -exchangers.tooltip.holdShift=Segure %s para detalhes -exchangers.tooltip.holdShift.shift=Shift +exchangers.tooltip.hold_shift=Segure %s para detalhes +exchangers.tooltip.hold_shift.shift=Shift exchangers.tooltip.shift1=Shift+clique direito em um bloco para selecionar. exchangers.tooltip.shift2=Clique direito em um bloco para alterar. exchangers.tooltip.shift3=Use a tecla de atalho para alternar entre os modos. -exchangers.tooltip.tuberousExchanger.warning=§c§oEsperto! Mas não alterável. -exchangers.tooltip.selectedblock=§2Bloco selecionado: -exchangers.tooltip.currentrange=§2Área Atual: -exchangers.tooltip.maxrange=§2Área Máxima: -exchangers.tooltip.noselectedblock=§4Nenhum bloco selecionado +exchangers.tooltip.tuberous_exchanger.warning=§c§oEsperto! Mas não alterável. +exchangers.tooltip.selected_block=§2Bloco selecionado: +exchangers.tooltip.current_range=§2Área Atual: +exchangers.tooltip.max_range=§2Área Máxima: +exchangers.tooltip.no_selected_block=§4Nenhum bloco selecionado +exchangers.tooltip.silk_touch.on=§fSilk Touch mode is §a§lenabled§r in config. +exchangers.tooltip.silk_touch.off=§fSilk Touch mode is §4§ldisabled§r in config. #Error Messages -exchangers.error.invalidblock.te=§cErro: Bloco inválido! (Tile Entities) -exchangers.error.invalidblock.unbreakable=§cErro: Bloco inválido! (Unbreakable Blocks) -exchangers.error.invalidblock.null=§cErro: Bloco inválido! (Null Display Name) -exchangers.error.outofblock=§cErro: Sem mais blocos! -exchangers.error.nopower=§cErro: Sem energia! +exchangers.error.invalid_block.te=§cErro: Bloco inválido! (Tile Entities) +exchangers.error.invalid_block.unbreakable=§cErro: Bloco inválido! (Unbreakable Blocks) +exchangers.error.invalid_block.null=§cErro: Bloco inválido! (Null Display Name) +exchangers.error.out_of_block=§cErro: Sem mais blocos! +exchangers.error.out_of_power=§cErro: Sem energia! +exchangers.error.event_cancelled=§cErro: Exchange event cancelled by other mods! #Crafting Components #Vanilla diff --git a/src/main/resources/assets/exchangers/lang/zh_CN.lang b/src/main/resources/assets/exchangers/lang/zh_CN.lang index b1c1df9..ce599ce 100644 --- a/src/main/resources/assets/exchangers/lang/zh_CN.lang +++ b/src/main/resources/assets/exchangers/lang/zh_CN.lang @@ -3,33 +3,36 @@ itemGroup.exchangers=方块交换器 #Key Bindings key.categories.exchangers=方块交换器 -key.exchangermode=变更交换器范围 +key.exchanger_mode=变更交换器范围 #Death -death.attack.exchangerpotato=%1$s天真的试图让一个马铃薯交换器工作 -death.attack.exchangerpotato.player=%1$s天真的试图让一个马铃薯交换器工作 -death.attack.exchangerpotato.item=%1$s天真的试图让一个马铃薯交换器工作 +death.attack.tuberous_exchanger=%1$s天真的试图让一个马铃薯交换器工作 +death.attack.tuberous_exchanger.player=%1$s天真的试图让一个马铃薯交换器工作 +death.attack.tuberous_exchanger.item=%1$s天真的试图让一个马铃薯交换器工作 #Tooltips exchangers.tooltip.durability=耐久值 exchangers.tooltip.tier=交换器等级%d -exchangers.tooltip.holdShift=按住%s了解详细信息 -exchangers.tooltip.holdShift.shift=Shift +exchangers.tooltip.hold_shift=按住%s了解详细信息 +exchangers.tooltip.hold_shift.shift=Shift exchangers.tooltip.shift1=对着方块Shift+右键选定方块 exchangers.tooltip.shift2=右键一个方块与选定的方块进行交换 exchangers.tooltip.shift3=使用变更交换器范围键切换模式。 -exchangers.tooltip.tuberousExchanger.warning=§c§o真聪明！但并没有卵用！ -exchangers.tooltip.selectedblock=§2S当前选定方块： -exchangers.tooltip.currentrange=§2当前更替范围 -exchangers.tooltip.maxrange=§2最大更替范围： -exchangers.tooltip.noselectedblock=§4没有选定方块 +exchangers.tooltip.tuberous_exchanger.warning=§c§o真聪明！但并没有卵用！ +exchangers.tooltip.selected_block=§2S当前选定方块： +exchangers.tooltip.current_range=§2当前更替范围 +exchangers.tooltip.max_range=§2最大更替范围： +exchangers.tooltip.no_selected_block=§4没有选定方块 +exchangers.tooltip.silk_touch.on=§f精准采集模式已在配置里§a§l启用§r +exchangers.tooltip.silk_touch.off=§f精准采集模式已在配置里§4§l禁用§r #Error Messages -exchangers.error.invalidblock.te=§c错误：对此方块无效！ (Tile Entities) -exchangers.error.invalidblock.unbreakable=§c错误：对此方块无效！ (Unbreakable Blocks) -exchangers.error.invalidblock.null=§c错误：对此方块无效！ (Null Display Name) -exchangers.error.outofblock=§c错误：选定方块耗尽！ -exchangers.error.nopower=§c错误：能量不足！ +exchangers.error.invalid_block.te=§c错误：对此方块无效！（方块实体） +exchangers.error.invalid_block.unbreakable=§c错误：对此方块无效！（不可破坏的方块） +exchangers.error.invalid_block.null=§c错误：对此方块无效！（空值显示名称） +exchangers.error.out_of_block=§c错误：选定方块耗尽！ +exchangers.error.out_of_power=§c错误：能量不足！ +exchangers.error.event_cancelled=§cError: Exchange event cancelled by other mods! #Crafting Components #Vanilla diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info index efd1661..4bd87bb 100644 --- a/src/main/resources/mcmod.info +++ b/src/main/resources/mcmod.info @@ -3,7 +3,7 @@ "modid": "exchangers", "name": "Exchangers", "description": "Block Exchangers.", - "version": "1.12.2-2.6", + "version": "1.12.2-2.6.1", "mcversion": "1.12", "url": "https://github.com/JackyyTV/Exchangers", "updateUrl": "",