diff options
-rw-r--r-- | build.properties | 2 | ||||
-rw-r--r-- | libs/gregtech-5.09.26-dev.jar (renamed from libs/gregtech-5.09.25-dev.jar) | bin | 9215701 -> 9222876 bytes | |||
-rw-r--r-- | src/main/java/com/detrav/DetravScannerMod.java | 2 | ||||
-rw-r--r-- | src/main/java/com/detrav/gui/containers/DetravPortableAnvilContainer.java | 2 | ||||
-rw-r--r-- | src/main/java/com/detrav/gui/containers/DetravPortableChargerContainer.java | 2 | ||||
-rw-r--r-- | src/main/java/com/detrav/utils/PortableAnvilInventory.java | 2 |
6 files changed, 6 insertions, 4 deletions
diff --git a/build.properties b/build.properties index 94a52ca076..a94c5df48f 100644 --- a/build.properties +++ b/build.properties @@ -1,7 +1,7 @@ minecraft.version=1.7.10 forge.version=10.13.4.1566-1.7.10 -detravscanner.version=0.26.0 +detravscanner.version=0.27.0 ae2.version=rv2-beta-33 applecore.version=1.7.10-1.2.1+107.59407 diff --git a/libs/gregtech-5.09.25-dev.jar b/libs/gregtech-5.09.26-dev.jar Binary files differindex 568a636f72..46de858d38 100644 --- a/libs/gregtech-5.09.25-dev.jar +++ b/libs/gregtech-5.09.26-dev.jar diff --git a/src/main/java/com/detrav/DetravScannerMod.java b/src/main/java/com/detrav/DetravScannerMod.java index 3e68c7128a..c581b7bd3a 100644 --- a/src/main/java/com/detrav/DetravScannerMod.java +++ b/src/main/java/com/detrav/DetravScannerMod.java @@ -22,7 +22,7 @@ import net.minecraftforge.common.config.Configuration; public class DetravScannerMod { public static final String MODID = "detravscannermod"; - public static final String VERSION = "0.26"; + public static final String VERSION = "0.27"; public static final CreativeTabs TAB_DETRAV = new DetravCreativeTab(); diff --git a/src/main/java/com/detrav/gui/containers/DetravPortableAnvilContainer.java b/src/main/java/com/detrav/gui/containers/DetravPortableAnvilContainer.java index 4f4b73fe4a..1dc0b4aa50 100644 --- a/src/main/java/com/detrav/gui/containers/DetravPortableAnvilContainer.java +++ b/src/main/java/com/detrav/gui/containers/DetravPortableAnvilContainer.java @@ -8,7 +8,7 @@ import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.*; import net.minecraft.item.ItemStack; import net.minecraft.world.World; -import gregtech.common.items.armor.SlotLocked; +import gregtech.common.items.armor.gui.SlotLocked; /** * Created by Detrav on 30.10.2016. diff --git a/src/main/java/com/detrav/gui/containers/DetravPortableChargerContainer.java b/src/main/java/com/detrav/gui/containers/DetravPortableChargerContainer.java index 3d5685ada8..6111a31418 100644 --- a/src/main/java/com/detrav/gui/containers/DetravPortableChargerContainer.java +++ b/src/main/java/com/detrav/gui/containers/DetravPortableChargerContainer.java @@ -5,7 +5,7 @@ import com.detrav.net.DetravNetwork; import com.detrav.net.DetravPortableChargerPacket01; import gregtech.api.items.GT_MetaBase_Item; import gregtech.api.util.GT_ModHandler; -import gregtech.common.items.armor.SlotLocked; +import gregtech.common.items.armor.gui.SlotLocked; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; diff --git a/src/main/java/com/detrav/utils/PortableAnvilInventory.java b/src/main/java/com/detrav/utils/PortableAnvilInventory.java index d0a2add486..e6d56a3464 100644 --- a/src/main/java/com/detrav/utils/PortableAnvilInventory.java +++ b/src/main/java/com/detrav/utils/PortableAnvilInventory.java @@ -3,6 +3,7 @@ package com.detrav.utils; import gregtech.api.enums.Materials; import gregtech.api.items.GT_MetaGenerated_Tool; import gregtech.api.util.GT_Recipe; +import gregtech.api.util.GT_Utility; import gregtech.common.items.GT_MetaGenerated_Tool_01; import net.minecraft.inventory.InventoryBasic; import net.minecraft.item.ItemStack; @@ -35,6 +36,7 @@ public class PortableAnvilInventory extends InventoryBasic { FluidStack fStack = recipe.getFluidOutput(0); if (fStack.getFluidID() == fluidID) { ItemStack gtCopy = gtTool; + //make copy float amount = fStack.amount * 2f / 1000f; long maxDamage = GT_MetaGenerated_Tool.getToolMaxDamage(gtCopy); long damage = GT_MetaGenerated_Tool.getToolDamage(gtCopy); |