From 40c4fc5d1f6ab376c2ce14f1144c4cd83b727e11 Mon Sep 17 00:00:00 2001 From: mezz Date: Thu, 23 Jun 2016 02:19:36 -0700 Subject: [PATCH] Update for Minecraft 1.10 --- gradle.properties | 10 +++++----- src/main/java/forestry/Forestry.java | 4 ++-- .../forestry/apiculture/entities/AIAvoidPlayers.java | 2 +- .../apiculture/worldgen/VillageApiaristHouse.java | 7 ++----- .../recipes/jei/WorktableRecipeTransferHandler.java | 10 ++++------ 5 files changed, 14 insertions(+), 19 deletions(-) diff --git a/gradle.properties b/gradle.properties index 6710f343c..57f17462c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,10 +1,10 @@ -mcversion=1.9.4 -forgeversion=12.17.0.1968 +mcversion=1.10 +forgeversion=12.18.0.1981-1.10.0 mcp_mappings=snapshot_20160525 -jei_version=3.6.4.+ +jei_version=3.7.0.+ ic2_version=2.5.5-ex19 version_major=5 -version_minor=0 -version_patch=23 +version_minor=1 +version_patch=0 diff --git a/src/main/java/forestry/Forestry.java b/src/main/java/forestry/Forestry.java index 8df484deb..ef28b8b07 100644 --- a/src/main/java/forestry/Forestry.java +++ b/src/main/java/forestry/Forestry.java @@ -49,7 +49,7 @@ import forestry.plugins.PluginManager; name = "Forestry", version = Constants.VERSION, guiFactory = "forestry.core.config.ForestryGuiConfigFactory", - dependencies = "required-after:Forge@[12.17.0.1963,);" + dependencies = "required-after:Forge@[12.18.0.1981,);" + "after:Buildcraft|Core@[7.2,);" + "after:BuildCraft|Energy@[7.2,);" + "after:ExtrabiomesXL;" @@ -57,7 +57,7 @@ import forestry.plugins.PluginManager; + "after:IC2@[2.3.235,);" + "after:Natura@[2.2.0,);" + "after:HardcoreEnderExpansion;" - + "after:JEI@[3.6.4,);" + + "after:JEI@[3.7.0,);" + "after:basemetals;") public class Forestry { diff --git a/src/main/java/forestry/apiculture/entities/AIAvoidPlayers.java b/src/main/java/forestry/apiculture/entities/AIAvoidPlayers.java index c513dbf9c..2848d03cb 100644 --- a/src/main/java/forestry/apiculture/entities/AIAvoidPlayers.java +++ b/src/main/java/forestry/apiculture/entities/AIAvoidPlayers.java @@ -66,7 +66,7 @@ public class AIAvoidPlayers extends EntityAIBase { } path = pathNavigator.getPathToXYZ(randomTarget.xCoord, randomTarget.yCoord, randomTarget.zCoord); - return path != null && path.isDestinationSame(randomTarget); + return path != null; } @Override diff --git a/src/main/java/forestry/apiculture/worldgen/VillageApiaristHouse.java b/src/main/java/forestry/apiculture/worldgen/VillageApiaristHouse.java index 83f5bffe5..7ab3e0a83 100644 --- a/src/main/java/forestry/apiculture/worldgen/VillageApiaristHouse.java +++ b/src/main/java/forestry/apiculture/worldgen/VillageApiaristHouse.java @@ -69,7 +69,6 @@ public class VillageApiaristHouse extends StructureVillagePieces.House1 { private static final Random random = new Random(); private int averageGroundLevel = -1; - private boolean isInDesert = false; private IBlockState planks; private IBlockState slabs; private IBlockState logs; @@ -86,8 +85,6 @@ public class VillageApiaristHouse extends StructureVillagePieces.House1 { public VillageApiaristHouse(StructureVillagePieces.Start startPiece, int componentType, Random random, StructureBoundingBox boundingBox, EnumFacing facing) { super(startPiece, componentType, random, boundingBox, facing); - isInDesert = startPiece.inDesert; - createBuildingBlocks(random); } @@ -280,7 +277,7 @@ public class VillageApiaristHouse extends StructureVillagePieces.House1 { private void buildGarden(World world, StructureBoundingBox box) { Block ground = Blocks.DIRT; - if (isInDesert) { + if (field_189928_h == 1) { // desert ground = Blocks.SAND; } @@ -293,7 +290,7 @@ public class VillageApiaristHouse extends StructureVillagePieces.House1 { private void plantFlowerGarden(World world, StructureBoundingBox box, int minX, int minY, int minZ, int maxX, int maxY, int maxZ) { - if (isInDesert) { + if (field_189928_h == 1) { // desert setBlockState(world, Blocks.CACTUS.getDefaultState(), 4, 1, 7, box); return; } diff --git a/src/main/java/forestry/factory/recipes/jei/WorktableRecipeTransferHandler.java b/src/main/java/forestry/factory/recipes/jei/WorktableRecipeTransferHandler.java index ddbca540f..18cb8590b 100644 --- a/src/main/java/forestry/factory/recipes/jei/WorktableRecipeTransferHandler.java +++ b/src/main/java/forestry/factory/recipes/jei/WorktableRecipeTransferHandler.java @@ -6,19 +6,17 @@ import java.util.Collections; import java.util.List; import java.util.Map; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.Container; -import net.minecraft.item.ItemStack; - import forestry.factory.gui.ContainerWorktable; import forestry.factory.inventory.InventoryCraftingForestry; import forestry.factory.recipes.MemorizedRecipe; - +import mezz.jei.api.gui.IGuiIngredient; import mezz.jei.api.gui.IRecipeLayout; import mezz.jei.api.recipe.VanillaRecipeCategoryUid; import mezz.jei.api.recipe.transfer.IRecipeTransferError; import mezz.jei.api.recipe.transfer.IRecipeTransferHandler; -import mezz.jei.gui.ingredients.IGuiIngredient; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Container; +import net.minecraft.item.ItemStack; class WorktableRecipeTransferHandler implements IRecipeTransferHandler { @Override