From b8964b6eca631b6a2c7c39bfa3da1842feb470b9 Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Tue, 28 Nov 2017 17:25:36 +0000 Subject: [PATCH 1/2] Update mappings --- build.gradle | 2 +- .../techreborn/items/tools/ItemAdvancedChainsaw.java | 4 ++-- .../items/tools/ItemAdvancedJackhammer.java | 2 +- .../java/techreborn/items/tools/ItemChainsaw.java | 2 +- .../items/tools/ItemDiamondJackhammer.java | 2 +- src/main/java/techreborn/items/tools/ItemDrill.java | 12 ++++++------ .../java/techreborn/items/tools/ItemJackhammer.java | 6 +++--- .../java/techreborn/items/tools/ItemOmniTool.java | 2 +- .../java/techreborn/items/tools/ItemRockCutter.java | 6 +++--- .../techreborn/items/tools/ItemSteelJackhammer.java | 2 +- src/main/java/techreborn/items/tools/ItemTRAxe.java | 2 +- 11 files changed, 21 insertions(+), 21 deletions(-) diff --git a/build.gradle b/build.gradle index ced32b2d1..00531dd2c 100644 --- a/build.gradle +++ b/build.gradle @@ -88,7 +88,7 @@ if (ENV.BUILD_NUMBER) { minecraft { version = "1.12.2-14.23.0.2552" - mappings = "snapshot_20170624" + mappings = "snapshot_20171003" replace "@MODVERSION@", project.version useDepAts = true runDir = "run" diff --git a/src/main/java/techreborn/items/tools/ItemAdvancedChainsaw.java b/src/main/java/techreborn/items/tools/ItemAdvancedChainsaw.java index 84783a413..afa7b4aab 100644 --- a/src/main/java/techreborn/items/tools/ItemAdvancedChainsaw.java +++ b/src/main/java/techreborn/items/tools/ItemAdvancedChainsaw.java @@ -82,8 +82,8 @@ public class ItemAdvancedChainsaw extends ItemChainsaw { } @Override - public float getStrVsBlock(ItemStack stack, IBlockState state) { - return super.getStrVsBlock(stack, state); + public float getDestroySpeed(ItemStack stack, IBlockState state) { + return super.getDestroySpeed(stack, state); } @Override diff --git a/src/main/java/techreborn/items/tools/ItemAdvancedJackhammer.java b/src/main/java/techreborn/items/tools/ItemAdvancedJackhammer.java index ee9cbe186..752d62719 100644 --- a/src/main/java/techreborn/items/tools/ItemAdvancedJackhammer.java +++ b/src/main/java/techreborn/items/tools/ItemAdvancedJackhammer.java @@ -38,7 +38,7 @@ public class ItemAdvancedJackhammer extends ItemJackhammer { public ItemAdvancedJackhammer() { super(ToolMaterial.IRON, "techreborn.advancedJackhammer", ConfigTechReborn.AdvancedJackhammerCharge); this.cost = 250; - this.efficiencyOnProperMaterial = 60F; + this.efficiency = 60F; } @SideOnly(Side.CLIENT) diff --git a/src/main/java/techreborn/items/tools/ItemChainsaw.java b/src/main/java/techreborn/items/tools/ItemChainsaw.java index 83f1eccdc..004be5ede 100644 --- a/src/main/java/techreborn/items/tools/ItemChainsaw.java +++ b/src/main/java/techreborn/items/tools/ItemChainsaw.java @@ -60,7 +60,7 @@ public class ItemChainsaw extends ItemAxe implements IEnergyItemInfo, IEnergyInt public ItemChainsaw(ToolMaterial material, String unlocalizedName, int energyCapacity, float unpoweredSpeed) { super(material); - efficiencyOnProperMaterial = 20F; + efficiency = 20F; setCreativeTab(TechRebornCreativeTab.instance); setMaxStackSize(1); setUnlocalizedName(unlocalizedName); diff --git a/src/main/java/techreborn/items/tools/ItemDiamondJackhammer.java b/src/main/java/techreborn/items/tools/ItemDiamondJackhammer.java index 1ad8f830e..db6d4c190 100644 --- a/src/main/java/techreborn/items/tools/ItemDiamondJackhammer.java +++ b/src/main/java/techreborn/items/tools/ItemDiamondJackhammer.java @@ -38,7 +38,7 @@ public class ItemDiamondJackhammer extends ItemJackhammer { public ItemDiamondJackhammer() { super(ToolMaterial.DIAMOND, "techreborn.diamondJackhammer", ConfigTechReborn.DiamondJackhammerCharge); this.cost = 100; - this.efficiencyOnProperMaterial = 16F; + this.efficiency = 16F; } @SideOnly(Side.CLIENT) diff --git a/src/main/java/techreborn/items/tools/ItemDrill.java b/src/main/java/techreborn/items/tools/ItemDrill.java index b2bccd381..41d646bd4 100644 --- a/src/main/java/techreborn/items/tools/ItemDrill.java +++ b/src/main/java/techreborn/items/tools/ItemDrill.java @@ -54,7 +54,7 @@ public class ItemDrill extends ItemPickaxe implements IEnergyItemInfo, IEnergyIn public ItemDrill(ToolMaterial material, String unlocalizedName, int energyCapacity, float unpoweredSpeed, float efficiencyOnProperMaterial) { super(material); - this.efficiencyOnProperMaterial = efficiencyOnProperMaterial; + this.efficiency = efficiencyOnProperMaterial; setCreativeTab(TechRebornCreativeTab.instance); setMaxStackSize(1); setUnlocalizedName(unlocalizedName); @@ -73,15 +73,15 @@ public class ItemDrill extends ItemPickaxe implements IEnergyItemInfo, IEnergyIn } @Override - public float getStrVsBlock(ItemStack stack, IBlockState state) { + public float getDestroySpeed(ItemStack stack, IBlockState state) { if (!PoweredItem.canUseEnergy(cost, stack)) { return unpoweredSpeed; } - if (Items.WOODEN_PICKAXE.getStrVsBlock(stack, state) > 1.0F - || Items.WOODEN_SHOVEL.getStrVsBlock(stack, state) > 1.0F) { - return efficiencyOnProperMaterial; + if (Items.WOODEN_PICKAXE.getDestroySpeed(stack, state) > 1.0F + || Items.WOODEN_SHOVEL.getDestroySpeed(stack, state) > 1.0F) { + return efficiency; } else { - return super.getStrVsBlock(stack, state); + return super.getDestroySpeed(stack, state); } } diff --git a/src/main/java/techreborn/items/tools/ItemJackhammer.java b/src/main/java/techreborn/items/tools/ItemJackhammer.java index 000f14688..ceea31909 100644 --- a/src/main/java/techreborn/items/tools/ItemJackhammer.java +++ b/src/main/java/techreborn/items/tools/ItemJackhammer.java @@ -59,7 +59,7 @@ public class ItemJackhammer extends ItemPickaxe implements IEnergyItemInfo, IEne public ItemJackhammer(ToolMaterial material, String unlocalizedName, int energyCapacity) { super(material); - efficiencyOnProperMaterial = 20F; + efficiency = 20F; setCreativeTab(TechRebornCreativeTab.instance); setMaxStackSize(1); setMaxDamage(240); @@ -84,9 +84,9 @@ public class ItemJackhammer extends ItemPickaxe implements IEnergyItemInfo, IEne } @Override - public float getStrVsBlock(ItemStack stack, IBlockState state) { + public float getDestroySpeed(ItemStack stack, IBlockState state) { if ((OreDictUtils.isOre(state, "stone") || state.getBlock() == Blocks.STONE) && PoweredItem.canUseEnergy(cost, stack)) { - return efficiencyOnProperMaterial; + return efficiency; } else { return 0.5F; } diff --git a/src/main/java/techreborn/items/tools/ItemOmniTool.java b/src/main/java/techreborn/items/tools/ItemOmniTool.java index 8e63ab517..efb6db7af 100644 --- a/src/main/java/techreborn/items/tools/ItemOmniTool.java +++ b/src/main/java/techreborn/items/tools/ItemOmniTool.java @@ -61,7 +61,7 @@ public class ItemOmniTool extends ItemPickaxe implements IEnergyItemInfo, IEnerg public ItemOmniTool() { super(ToolMaterial.DIAMOND); - efficiencyOnProperMaterial = 13F; + efficiency = 13F; setCreativeTab(TechRebornCreativeTab.instance); setMaxStackSize(1); setMaxDamage(200); diff --git a/src/main/java/techreborn/items/tools/ItemRockCutter.java b/src/main/java/techreborn/items/tools/ItemRockCutter.java index d73054495..1ff210ab8 100644 --- a/src/main/java/techreborn/items/tools/ItemRockCutter.java +++ b/src/main/java/techreborn/items/tools/ItemRockCutter.java @@ -63,7 +63,7 @@ public class ItemRockCutter extends ItemPickaxe implements IEnergyItemInfo, IEne setUnlocalizedName("techreborn.rockcutter"); setCreativeTab(TechRebornCreativeTab.instance); setMaxStackSize(1); - efficiencyOnProperMaterial = 16F; + efficiency = 16F; } @Override @@ -98,11 +98,11 @@ public class ItemRockCutter extends ItemPickaxe implements IEnergyItemInfo, IEne } @Override - public float getStrVsBlock(ItemStack stack, IBlockState state) { + public float getDestroySpeed(ItemStack stack, IBlockState state) { if (!PoweredItem.canUseEnergy(cost, stack)) { return 2F; } else { - return Items.DIAMOND_PICKAXE.getStrVsBlock(stack, state); + return Items.DIAMOND_PICKAXE.getDestroySpeed(stack, state); } } diff --git a/src/main/java/techreborn/items/tools/ItemSteelJackhammer.java b/src/main/java/techreborn/items/tools/ItemSteelJackhammer.java index 16634c050..e02b09c72 100644 --- a/src/main/java/techreborn/items/tools/ItemSteelJackhammer.java +++ b/src/main/java/techreborn/items/tools/ItemSteelJackhammer.java @@ -38,7 +38,7 @@ public class ItemSteelJackhammer extends ItemJackhammer { public ItemSteelJackhammer() { super(ToolMaterial.DIAMOND, "techreborn.steelJackhammer", ConfigTechReborn.SteelJackhammerCharge); this.cost = 50; - this.efficiencyOnProperMaterial = 12F; + this.efficiency = 12F; } @SideOnly(Side.CLIENT) diff --git a/src/main/java/techreborn/items/tools/ItemTRAxe.java b/src/main/java/techreborn/items/tools/ItemTRAxe.java index a8f1966d6..a7e94bd35 100644 --- a/src/main/java/techreborn/items/tools/ItemTRAxe.java +++ b/src/main/java/techreborn/items/tools/ItemTRAxe.java @@ -30,7 +30,7 @@ import techreborn.events.TRRecipeHandler; public class ItemTRAxe extends ItemAxe { public ItemTRAxe(ToolMaterial material) { - super(material, material.getDamageVsEntity() + 5.75F, (material.getDamageVsEntity() + 6.75F) * -0.344444F); + super(material, material.getAttackDamage() + 5.75F, (material.getAttackDamage() + 6.75F) * -0.344444F); setUnlocalizedName(material.name().toLowerCase() + "Axe"); setCreativeTab(TechRebornCreativeTabMisc.instance); TRRecipeHandler.hideEntry(this); From 4d043faa2711a03d733719457bec980f20b34a28 Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Wed, 29 Nov 2017 09:35:00 +0000 Subject: [PATCH 2/2] Fixes #1344 --- .../techreborn/tiles/multiblock/TileIndustrialGrinder.java | 5 ++++- .../techreborn/tiles/multiblock/TileIndustrialSawmill.java | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/main/java/techreborn/tiles/multiblock/TileIndustrialGrinder.java b/src/main/java/techreborn/tiles/multiblock/TileIndustrialGrinder.java index 1fc2bc87e..3a6038ca9 100644 --- a/src/main/java/techreborn/tiles/multiblock/TileIndustrialGrinder.java +++ b/src/main/java/techreborn/tiles/multiblock/TileIndustrialGrinder.java @@ -24,6 +24,8 @@ package techreborn.tiles.multiblock; +import net.minecraft.block.BlockLiquid; +import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; @@ -34,6 +36,7 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.IFluidBlock; import net.minecraftforge.fluids.capability.CapabilityFluidHandler; import reborncore.api.recipe.IRecipeCrafterProvider; import reborncore.api.tile.IInventoryProvider; @@ -97,7 +100,7 @@ public class TileIndustrialGrinder extends TilePowerAcceptor implements IToolDro final boolean blade = this.multiblockChecker.checkRingY(1, 1, MultiblockChecker.REINFORCED_CASING, new BlockPos(0, 1, 0)); final IBlockState centerBlock = this.multiblockChecker.getBlock(0, 1, 0); - final boolean center = centerBlock.getBlock() == Blocks.WATER; + final boolean center = ((centerBlock.getBlock() instanceof BlockLiquid || centerBlock.getBlock() instanceof IFluidBlock) && centerBlock.getBlock().getMaterial(centerBlock) == Material.WATER); return down && center && blade && up; } diff --git a/src/main/java/techreborn/tiles/multiblock/TileIndustrialSawmill.java b/src/main/java/techreborn/tiles/multiblock/TileIndustrialSawmill.java index fd625f324..0c55291c0 100644 --- a/src/main/java/techreborn/tiles/multiblock/TileIndustrialSawmill.java +++ b/src/main/java/techreborn/tiles/multiblock/TileIndustrialSawmill.java @@ -24,6 +24,8 @@ package techreborn.tiles.multiblock; +import net.minecraft.block.BlockLiquid; +import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; @@ -33,6 +35,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; import net.minecraftforge.common.capabilities.Capability; +import net.minecraftforge.fluids.IFluidBlock; import net.minecraftforge.fluids.capability.CapabilityFluidHandler; import reborncore.api.recipe.IBaseRecipeType; import reborncore.api.recipe.RecipeHandler; @@ -162,7 +165,7 @@ public class TileIndustrialSawmill extends TilePowerAcceptor final boolean blade = this.multiblockChecker.checkRingY(1, 1, MultiblockChecker.REINFORCED_CASING, new BlockPos(0, 1, 0)); final IBlockState centerBlock = this.multiblockChecker.getBlock(0, 1, 0); - final boolean center = centerBlock.getBlock() == Blocks.WATER; + final boolean center = ((centerBlock.getBlock() instanceof BlockLiquid || centerBlock.getBlock() instanceof IFluidBlock) && centerBlock.getBlock().getMaterial(centerBlock) == Material.WATER); return down && center && blade && up; }