2.7.1 Update

- Added a harvest level gating system for all the Exchangers, closes #47 - Fixed a block dupe exploit with certain item containers, closes #48 - Exchanged blocks now drop on player's position instead of the blocks' positions - All vanilla Exchangers are now repairable in Anvil except for Wooden Exchanger - Tuberous Exchanger now only damages player if the player right click with it on any blocks - Added a missing translation for the Force Drop Items mode keybind
JackyyTV · Mar 4, 2018 · f02ed6c · tterrag1098 · Apr 9, 2018 · JackyyTV
1 parent 67f6c57
commit f02ed6c
Show file tree

Hide file tree

Showing 55 changed files with 378 additions and 128 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -2,6 +2,6 @@
 # This is required to provide enough memory for the Minecraft decompilation process.
 org.gradle.jvmargs=-Xmx4G
 mc_version=1.12.2
-forge_version=1.12.2-14.23.2.2618
-mod_version=2.7
-mappings_version=snapshot_20180219
+forge_version=1.12.2-14.23.2.2624
+mod_version=2.7.1
+mappings_version=snapshot_20180304
diff --git a/src/main/java/jackyy/exchangers/Exchangers.java b/src/main/java/jackyy/exchangers/Exchangers.java
@@ -19,7 +19,7 @@
 @Mod(modid = Exchangers.MODID, version = Exchangers.VERSION, name = Exchangers.MODNAME, dependencies = Exchangers.DEPENDS, certificateFingerprint = "@FINGERPRINT@", acceptedMinecraftVersions = Exchangers.MCVERSION, useMetadata = true)
 public class Exchangers {
 
-    public static final String VERSION = "1.12.2-2.7";
+    public static final String VERSION = "1.12.2-2.7.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/handler/ClientEventsHandler.java b/src/main/java/jackyy/exchangers/handler/ClientEventsHandler.java
@@ -44,8 +44,8 @@
 @SideOnly(Side.CLIENT)
 public class ClientEventsHandler {
 
-    public static Minecraft mc = FMLClientHandler.instance().getClient();
-    public static final String DEV_CAPE = "https://jackyytv.github.io/imgs/mc_mods/exchangers/capes/cape_dev.png";
+    private static Minecraft mc = FMLClientHandler.instance().getClient();
+    private static final String DEV_CAPE = "https://jackyytv.github.io/imgs/mc_mods/exchangers/capes/cape_dev.png";
 
     private Map<String, CapeBufferDownload> buffer = new HashMap<>();
 

diff --git a/src/main/java/jackyy/exchangers/handler/ExchangerHandler.java b/src/main/java/jackyy/exchangers/handler/ExchangerHandler.java
@@ -28,7 +28,7 @@
 import net.minecraftforge.common.util.BlockSnapshot;
 import net.minecraftforge.event.world.BlockEvent;
 import net.minecraftforge.items.CapabilityItemHandler;
-import net.minecraftforge.items.wrapper.InvWrapper;
+import net.minecraftforge.items.IItemHandler;
 
 import java.util.*;
 
@@ -62,12 +62,13 @@ public static void setDefaultTagCompound(ItemStack stack) {
             compound.setBoolean("forceDropItems", false);
             stack.setTagCompound(compound);
         } else {
-            if (stack.getTagCompound().hasKey("Energy") && !stack.getTagCompound().hasKey("mode")) {
+            if (!stack.getTagCompound().hasKey("block")) {
                 stack.getTagCompound().setString("block", "minecraft:air");
+            } else if (!stack.getTagCompound().hasKey("meta")) {
                 stack.getTagCompound().setInteger("meta", 0);
+            } else if (!stack.getTagCompound().hasKey("mode")) {
                 stack.getTagCompound().setInteger("mode", 0);
-            }
-            if (!stack.getTagCompound().hasKey("forceDropItems")) {
+            } else if (!stack.getTagCompound().hasKey("forceDropItems")) {
                 stack.getTagCompound().setBoolean("forceDropItems", false);
             }
         }
@@ -88,15 +89,14 @@ public void addInformation(ItemStack stack, World world, List<String> tooltip, I
         if (StringHelper.isShiftKeyDown()) {
             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 {
                 Block block = Block.getBlockFromName(id);
                 int meta = compound.getInteger("meta");
                 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()]);
             }
+            tooltip.add(StringHelper.localize("tooltip.current_range") + " " + modeSwitchList[compound.getInteger("mode")]);
+            tooltip.add(StringHelper.localize("tooltip.max_range") + " " + modeSwitchList[getMaxRange()]);
+            tooltip.add(StringHelper.localize("tooltip.max_harvest_level") + " " + StringHelper.formatHarvestLevel(getHarvestLevel()));
             if (ModConfig.misc.doExchangersSilkTouch) {
                 tooltip.add(StringHelper.localize("tooltip.silk_touch.on"));
             } else {
@@ -172,8 +172,7 @@ public static 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) {
@@ -212,6 +211,9 @@ private void placeBlock(ItemStack stack, EntityPlayer player, World world, Block
         } else if (!isCreative() && isPowered() && stack.getTagCompound().getInteger("Energy") < getPerBlockEnergy(stack)) {
             ChatHelper.msgPlayer(player, "error.out_of_power");
             return;
+        } else if (!isCreative() && getHarvestLevel() < oldblock.getHarvestLevel(oldState)) {
+            ChatHelper.msgPlayer(player, "error.low_harvest_level");
+            return;
         }
         Set<BlockPos> coordinates = findSuitableBlocks(stack, world, side, pos, oldblock, oldmeta);
         boolean notEnough = false;
@@ -224,12 +226,12 @@ private void placeBlock(ItemStack stack, EntityPlayer player, World world, Block
                     if (!player.capabilities.isCreativeMode && !isCreative()) {
                         if (ModConfig.misc.doExchangersSilkTouch || EnchantmentHelper.getEnchantmentLevel(Enchantments.SILK_TOUCH, stack) > 0) {
                             ItemStack oldblockItem = oldblock.getItem(world, pos, oldState);
-                            giveItem(world, player, pos, oldblockItem);
+                            giveItem(world, player, oldblockItem);
                         } else {
                             int fortuneLevel = EnchantmentHelper.getEnchantmentLevel(Enchantments.FORTUNE, stack);
                             List<ItemStack> oldblockItems = oldblock.getDrops(world, pos, oldState, fortuneLevel);
                             for (ItemStack oldblockItem : oldblockItems) {
-                                giveItem(world, player, pos, oldblockItem);
+                                giveItem(world, player, oldblockItem);
                             }
                         }
                         if (!isPowered()) {
@@ -385,15 +387,19 @@ private boolean consumeItemInInventory(Item item, int meta, InventoryPlayer play
         if (player.capabilities.isCreativeMode || isCreative()) {
             return true;
         }
-        IInventory inv = playerInv;
-        int i = findItem(item, meta, inv);
+        int i = findItem(item, meta, playerInv);
         if (i < 0) {
-            inv = findItemHolder(item, meta, inv);
+            IItemHandler inv = findItemHolder(playerInv);
             if (inv == null)
                 return false;
-            i = findItem(item, meta, inv);
+            i = findItemInContainer(item, meta, inv);
+            if (i < 0)
+                return false;
+            ItemStack extracted = inv.extractItem(i, 1, false);
+            return extracted != ItemStack.EMPTY;
+        } else {
+            playerInv.decrStackSize(i, 1);
         }
-        inv.decrStackSize(i, 1);
         return true;
     }
 
@@ -407,20 +413,28 @@ private static int findItem(Item item, int meta, IInventory inv) {
         return -1;
     }
 
-    private static IInventory findItemHolder(Item item, int meta, IInventory inv) {
-        for (int i = 0; i < 36; i++) {
+    private static int findItemInContainer(Item item, int meta, IItemHandler inv) {
+        for (int i = 0; i < inv.getSlots(); i++) {
+            ItemStack stack = inv.getStackInSlot(i);
+            if (stack != ItemStack.EMPTY && (stack.getItem() == item) && (meta == stack.getItemDamage())) {
+                return i;
+            }
+        }
+        return -1;
+    }
+
+    private static IItemHandler findItemHolder(IInventory inv) {
+        for (int i = 0; i < inv.getSizeInventory(); i++) {
             ItemStack stack = inv.getStackInSlot(i);
             if (stack != ItemStack.EMPTY && stack.hasCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, null)) {
-                InvWrapper invW = (InvWrapper) stack.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, null);
-                if (findItem(item, meta, invW.getInv()) != -1)
-                    return invW.getInv();
+                return stack.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, null);
             }
         }
         return null;
     }
 
-    private static void giveItem(World world, EntityPlayer player, BlockPos pos, ItemStack oldStack) {
-        EntityItem entityItem = new EntityItem(world, pos.getX(), pos.getY(), pos.getZ(), oldStack);
+    private static void giveItem(World world, EntityPlayer player, ItemStack oldStack) {
+        EntityItem entityItem = new EntityItem(world, player.posX, player.posY, player.posZ, oldStack);
         if (player.getHeldItemMainhand().getTagCompound().getBoolean("forceDropItems")) {
             world.spawnEntity(entityItem);
         } else {

diff --git a/src/main/java/jackyy/exchangers/helper/EnergyHelper.java b/src/main/java/jackyy/exchangers/helper/EnergyHelper.java
@@ -6,12 +6,10 @@
 public class EnergyHelper {
 
     public static ItemStack setDefaultEnergyTag(ItemStack container, int energy) {
-
         if (!container.hasTagCompound()) {
             container.setTagCompound(new NBTTagCompound());
         }
         container.getTagCompound().setInteger("Energy", energy);
-
         return container;
     }
 

diff --git a/src/main/java/jackyy/exchangers/helper/StringHelper.java b/src/main/java/jackyy/exchangers/helper/StringHelper.java
@@ -7,6 +7,7 @@
 
 import java.text.NumberFormat;
 
+@SuppressWarnings("deprecation")
 public class StringHelper {
 
     public static String getTierText(int tier) {
@@ -25,7 +26,10 @@ public static String formatNumber(long number) {
         return NumberFormat.getInstance().format(number);
     }
 
-    @SuppressWarnings("deprecation")
+    public static String formatHarvestLevel(int harvestLevel) {
+        return localize("harvest_level." + harvestLevel);
+    }
+
     public static String localize(String unlocalized, Object... args) {
         String toLocalize = Exchangers.MODID + "." + unlocalized;
         if (args != null && args.length > 0) {
@@ -36,4 +40,4 @@ public static String localize(String unlocalized, Object... args) {
         }
     }
 
-}
+}
diff --git a/src/main/java/jackyy/exchangers/item/ItemCoreBase.java b/src/main/java/jackyy/exchangers/item/ItemCoreBase.java
@@ -10,7 +10,7 @@
 
 public class ItemCoreBase extends Item {
 
-    public ItemCoreBase(){
+    public ItemCoreBase() {
         setMaxStackSize(16);
         setCreativeTab(Exchangers.TAB);
     }

diff --git a/src/main/java/jackyy/exchangers/item/ItemExchangerBase.java b/src/main/java/jackyy/exchangers/item/ItemExchangerBase.java
@@ -17,7 +17,7 @@
 
 public class ItemExchangerBase extends ExchangerHandler {
 
-    public ItemExchangerBase(){
+    public ItemExchangerBase() {
         setMaxStackSize(1);
         setCreativeTab(Exchangers.TAB);
     }
@@ -42,8 +42,7 @@ public void addInformation(ItemStack stack, World world, List<String> tooltip, I
         }
 	}
 
-    @Override
-    @SideOnly(Side.CLIENT)
+    @Override @SideOnly(Side.CLIENT)
     public void getSubItems(CreativeTabs tab, NonNullList<ItemStack> list) {
         if (isInCreativeTab(tab)) {
             if (checkLoaded()) {

diff --git a/src/main/java/jackyy/exchangers/item/ItemExchangerBasePowered.java b/src/main/java/jackyy/exchangers/item/ItemExchangerBasePowered.java
@@ -26,13 +26,10 @@
 
 import java.util.List;
 
-@Optional.InterfaceList(value = {
-        @Optional.Interface(iface = "cofh.redstoneflux.api.IEnergyContainerItem", modid = "redstoneflux"),
-        @Optional.Interface(iface = "cofh.core.item.IEnchantableItem", modid = "cofhcore")
-})
+@Optional.Interface(iface = "cofh.core.item.IEnchantableItem", modid = "cofhcore")
 public class ItemExchangerBasePowered extends ItemExchangerBase implements IEnergyContainerItem, IEnchantableItem {
 
-    public ItemExchangerBasePowered(){
+    public ItemExchangerBasePowered() {
         setMaxDamage(1);
     }
 
@@ -84,8 +81,7 @@ public void addInformation(ItemStack stack, World world, List<String> tooltip, I
         }
 	}
 
-	@Override
-	@SideOnly(Side.CLIENT)
+	@Override @SideOnly(Side.CLIENT)
     public void getSubItems(CreativeTabs tab, NonNullList<ItemStack> list) {
 	    if (isInCreativeTab(tab)) {
             if (checkLoaded()) {
@@ -106,7 +102,7 @@ public boolean isPowered() {
 	}
 
     /* CAPABILITIES */
-    @Override @Optional.Method(modid = "redstoneflux")
+    @Override
     public ICapabilityProvider initCapabilities(ItemStack stack, NBTTagCompound nbt) {
         return new EnergyContainerItemWrapper(stack, this);
     }

diff --git a/src/main/java/jackyy/exchangers/item/enderio/ItemConductiveIronExchanger.java b/src/main/java/jackyy/exchangers/item/enderio/ItemConductiveIronExchanger.java
@@ -13,7 +13,7 @@
 
 public class ItemConductiveIronExchanger extends ItemExchangerBasePowered {
 
-    public ItemConductiveIronExchanger(){
+    public ItemConductiveIronExchanger() {
         setRegistryName(Exchangers.MODID + ":conductive_iron_exchanger");
         setUnlocalizedName(Exchangers.MODID + ".conductive_iron_exchanger");
     }
@@ -43,6 +43,11 @@ public int getTier() {
         return 1;
     }
 
+    @Override
+    public int getHarvestLevel() {
+        return ModConfig.enderIOTweaks.conductiveMaxHarvestLevel;
+    }
+
     @Override
     public int getMaxRange() {
         return MODE_3X3;

diff --git a/src/main/java/jackyy/exchangers/item/enderio/ItemDarkSteelExchanger.java b/src/main/java/jackyy/exchangers/item/enderio/ItemDarkSteelExchanger.java
@@ -13,7 +13,7 @@
 
 public class ItemDarkSteelExchanger extends ItemExchangerBasePowered {
 
-    public ItemDarkSteelExchanger(){
+    public ItemDarkSteelExchanger() {
         setRegistryName(Exchangers.MODID + ":dark_steel_exchanger");
         setUnlocalizedName(Exchangers.MODID + ".dark_steel_exchanger");
     }
@@ -43,6 +43,11 @@ public int getTier() {
         return 5;
     }
 
+    @Override
+    public int getHarvestLevel() {
+        return ModConfig.enderIOTweaks.darkSteelMaxHarvestLevel;
+    }
+
     @Override
     public int getMaxRange() {
         return MODE_13X13;

diff --git a/src/main/java/jackyy/exchangers/item/enderio/ItemEIOExchangerCoreT1.java b/src/main/java/jackyy/exchangers/item/enderio/ItemEIOExchangerCoreT1.java
@@ -13,7 +13,7 @@
 
 public class ItemEIOExchangerCoreT1 extends ItemCoreBase {
 
-    public ItemEIOExchangerCoreT1(){
+    public ItemEIOExchangerCoreT1() {
         setRegistryName(Exchangers.MODID + ":eio_exchanger_core_tier1");
         setUnlocalizedName(Exchangers.MODID + ".eio_exchanger_core_tier1");
     }

diff --git a/src/main/java/jackyy/exchangers/item/enderio/ItemEIOExchangerCoreT2.java b/src/main/java/jackyy/exchangers/item/enderio/ItemEIOExchangerCoreT2.java
@@ -13,7 +13,7 @@
 
 public class ItemEIOExchangerCoreT2 extends ItemCoreBase {
 
-    public ItemEIOExchangerCoreT2(){
+    public ItemEIOExchangerCoreT2() {
         setRegistryName(Exchangers.MODID + ":eio_exchanger_core_tier2");
         setUnlocalizedName(Exchangers.MODID + ".eio_exchanger_core_tier2");
     }

diff --git a/src/main/java/jackyy/exchangers/item/enderio/ItemEIOExchangerCoreT3.java b/src/main/java/jackyy/exchangers/item/enderio/ItemEIOExchangerCoreT3.java
@@ -13,7 +13,7 @@
 
 public class ItemEIOExchangerCoreT3 extends ItemCoreBase {
 
-    public ItemEIOExchangerCoreT3(){
+    public ItemEIOExchangerCoreT3() {
         setRegistryName(Exchangers.MODID + ":eio_exchanger_core_tier3");
         setUnlocalizedName(Exchangers.MODID + ".eio_exchanger_core_tier3");
     }

diff --git a/src/main/java/jackyy/exchangers/item/enderio/ItemElectricalSteelExchanger.java b/src/main/java/jackyy/exchangers/item/enderio/ItemElectricalSteelExchanger.java
@@ -13,7 +13,7 @@
 
 public class ItemElectricalSteelExchanger extends ItemExchangerBasePowered {
 
-    public ItemElectricalSteelExchanger(){
+    public ItemElectricalSteelExchanger() {
         setRegistryName(Exchangers.MODID + ":electrical_steel_exchanger");
         setUnlocalizedName(Exchangers.MODID + ".electrical_steel_exchanger");
     }
@@ -43,6 +43,11 @@ public int getTier() {
         return 3;
     }
 
+    @Override
+    public int getHarvestLevel() {
+        return ModConfig.enderIOTweaks.electricalSteelMaxHarvestLevel;
+    }
+
     @Override
     public int getMaxRange() {
         return MODE_9X9;

diff --git a/src/main/java/jackyy/exchangers/item/enderio/ItemEnergeticExchanger.java b/src/main/java/jackyy/exchangers/item/enderio/ItemEnergeticExchanger.java
@@ -13,7 +13,7 @@
 
 public class ItemEnergeticExchanger extends ItemExchangerBasePowered {
 
-    public ItemEnergeticExchanger(){
+    public ItemEnergeticExchanger() {
         setRegistryName(Exchangers.MODID + ":energetic_exchanger");
         setUnlocalizedName(Exchangers.MODID + ".energetic_exchanger");
     }
@@ -43,6 +43,11 @@ public int getTier() {
         return 4;
     }
 
+    @Override
+    public int getHarvestLevel() {
+        return ModConfig.enderIOTweaks.energeticMaxHarvestLevel;
+    }
+
     @Override
     public int getMaxRange() {
         return MODE_11X11;