diff --git a/build.gradle b/build.gradle index 1e42c09a7..f72ab4437 100644 --- a/build.gradle +++ b/build.gradle @@ -43,7 +43,7 @@ group = "vazkii.botania" // http://maven.apache.org/guides/mini/guide-naming-con archivesBaseName = config.mod_name minecraft { - version = "${config.mc_version}-${config.forge_version}-${config.mc_version_suffix}" + version = "${config.mc_version}-${config.forge_version}" runDir = "eclipse/assets" mappings = config.mc_mappings diff --git a/build.properties b/build.properties index 97b43ac34..1ceab45d7 100644 --- a/build.properties +++ b/build.properties @@ -3,9 +3,8 @@ version=r2.0 dir_output=../Build Output/Botania/ mc_mappings=snapshot_20160518 -forge_version=12.18.0.1986 -mc_version_suffix=1.10.0 -mc_version=1.10 +forge_version=12.18.1.2076 +mc_version=1.10.2 cf_meta_version=1.10.2 dir_repo=./ build_number=321 diff --git a/src/main/java/vazkii/botania/client/core/handler/MultiblockBlockAccess.java b/src/main/java/vazkii/botania/client/core/handler/MultiblockBlockAccess.java index 12e3c993f..768cdec89 100644 --- a/src/main/java/vazkii/botania/client/core/handler/MultiblockBlockAccess.java +++ b/src/main/java/vazkii/botania/client/core/handler/MultiblockBlockAccess.java @@ -85,9 +85,9 @@ public class MultiblockBlockAccess implements IBlockAccess { @Nonnull @Override - public Biome getBiome(@Nonnull BlockPos pos) { + public Biome getBiomeGenForCoords(@Nonnull BlockPos pos) { if(hasBlockAccess) - return originalBlockAccess.getBiome(pos); + return originalBlockAccess.getBiomeGenForCoords(pos); return null; } diff --git a/src/main/java/vazkii/botania/client/model/PlatformModel.java b/src/main/java/vazkii/botania/client/model/PlatformModel.java index 5ae521951..49764605b 100644 --- a/src/main/java/vazkii/botania/client/model/PlatformModel.java +++ b/src/main/java/vazkii/botania/client/model/PlatformModel.java @@ -146,8 +146,8 @@ public class PlatformModel implements IBakedModel { @Nonnull @Override - public Biome getBiome(@Nonnull BlockPos pos) { - return compose.getBiome(pos); + public Biome getBiomeGenForCoords(@Nonnull BlockPos pos) { + return compose.getBiomeGenForCoords(pos); } @Override diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileGaiaHead.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileGaiaHead.java index a0761b115..d5de22f41 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileGaiaHead.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileGaiaHead.java @@ -63,7 +63,7 @@ public class RenderTileGaiaHead extends TileEntitySkullRenderer { profile = ((EntityPlayer) mc.getRenderViewEntity()).getGameProfile(); } else if (view instanceof EntitySkeleton) { skullType = 0; - if (((EntitySkeleton) view).getSkeletonType() == SkeletonType.WITHER) + if (((EntitySkeleton) view).func_189771_df() == SkeletonType.WITHER) skullType = 1; } else if(view instanceof EntityWither) skullType = 1; diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java index 9ad0fcc22..a92d1d7f2 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java @@ -348,7 +348,7 @@ public class RenderTileTinyPotato extends TileEntitySpecialRenderer types = Arrays.asList(BiomeDictionary.getTypesForBiome(supertile.getWorld().getBiome(coords))); + List types = Arrays.asList(BiomeDictionary.getTypesForBiome(supertile.getWorld().getBiomeGenForCoords(coords))); TIntArrayList values = new TIntArrayList(); for(int i = 0; i < 8; i++) { diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileDaybloom.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileDaybloom.java index d3118f373..ed783f822 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileDaybloom.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileDaybloom.java @@ -59,7 +59,7 @@ public class SubTileDaybloom extends SubTilePassiveGenerating { @Override public boolean canGeneratePassively() { - boolean rain = supertile.getWorld().getBiome(supertile.getPos()).getRainfall() > 0 && (supertile.getWorld().isRaining() || supertile.getWorld().isThundering()); + boolean rain = supertile.getWorld().getBiomeGenForCoords(supertile.getPos()).getRainfall() > 0 && (supertile.getWorld().isRaining() || supertile.getWorld().isThundering()); return supertile.getWorld().isDaytime() && !rain && supertile.getWorld().canBlockSeeSky(supertile.getPos().up()); } diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileHydroangeas.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileHydroangeas.java index 2c312c928..dfda50d4f 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileHydroangeas.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileHydroangeas.java @@ -180,7 +180,7 @@ public class SubTileHydroangeas extends SubTilePassiveGenerating { @Override public int getDelayBetweenPassiveGeneration() { - boolean rain = supertile.getWorld().getBiome(supertile.getPos()).getRainfall() > 0 && (supertile.getWorld().isRaining() || supertile.getWorld().isThundering()); + boolean rain = supertile.getWorld().getBiomeGenForCoords(supertile.getPos()).getRainfall() > 0 && (supertile.getWorld().isRaining() || supertile.getWorld().isThundering()); return rain ? 1 : 2; } diff --git a/src/main/java/vazkii/botania/common/core/handler/BiomeDecorationHandler.java b/src/main/java/vazkii/botania/common/core/handler/BiomeDecorationHandler.java index 7e420810c..ad5e9df1b 100644 --- a/src/main/java/vazkii/botania/common/core/handler/BiomeDecorationHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/BiomeDecorationHandler.java @@ -36,8 +36,8 @@ public final class BiomeDecorationHandler { boolean flowers = true; if(event.getWorld().provider instanceof IFlowerlessWorld) flowers = ((IFlowerlessWorld) event.getWorld().provider).generateFlowers(event.getWorld()); - else if(event.getWorld().getBiome(event.getPos()) instanceof IFlowerlessBiome) - flowers = ((IFlowerlessBiome) event.getWorld().getBiome(event.getPos())).canGenerateFlowers(event.getWorld(), event.getPos().getX(), event.getPos().getZ()); + else if(event.getWorld().getBiomeGenForCoords(event.getPos()) instanceof IFlowerlessBiome) + flowers = ((IFlowerlessBiome) event.getWorld().getBiomeGenForCoords(event.getPos())).canGenerateFlowers(event.getWorld(), event.getPos().getX(), event.getPos().getZ()); if(!flowers) return; diff --git a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java index ec4c331af..0a2cb5ecf 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java +++ b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java @@ -638,7 +638,7 @@ public class EntityDoppleganger extends EntityLiving implements IBotaniaBoss { entity = new EntitySkeleton(worldObj); entity.setItemStackToSlot(EntityEquipmentSlot.MAINHAND, new ItemStack(Items.BOW)); if(worldObj.rand.nextInt(8) == 0) { - ((EntitySkeleton) entity).setSkeletonType(SkeletonType.WITHER); + ((EntitySkeleton) entity).func_189768_a(SkeletonType.WITHER); entity.setItemStackToSlot(EntityEquipmentSlot.MAINHAND, new ItemStack(hard ? ModItems.elementiumSword : Items.STONE_SWORD)); } break; diff --git a/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java b/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java index b3643d874..fd9df9ade 100644 --- a/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java +++ b/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java @@ -252,7 +252,7 @@ public class ItemLaputaShard extends ItemMod implements ILensEffect, ITinyPlanet TileEntity tile = null; NBTTagCompound tilecmp = ItemNBTHelper.getCompound(lens, TAG_TILE, false); if(tilecmp.hasKey("id")) - tile = TileEntity.create(entity.worldObj, tilecmp); + tile = TileEntity.func_190200_a(entity.worldObj, tilecmp); entity.worldObj.setBlockState(pos, block.getStateFromMeta(meta), 1 | 2); entity.worldObj.playEvent(2001, pos, Block.getStateId(block.getStateFromMeta(meta))); diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumAxe.java b/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumAxe.java index f4ee342b4..5f0fc1b75 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumAxe.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumAxe.java @@ -42,7 +42,7 @@ public class ItemElementiumAxe extends ItemManasteelAxe { int looting = EnchantmentHelper.getEnchantmentLevel(Enchantments.FORTUNE, weapon); if(event.getEntityLiving() instanceof EntitySkeleton && rand.nextInt(26) <= 3 + looting) - addDrop(event, new ItemStack(Items.SKULL, 1, ((EntitySkeleton) event.getEntityLiving()).getSkeletonType().ordinal())); + addDrop(event, new ItemStack(Items.SKULL, 1, ((EntitySkeleton) event.getEntityLiving()).func_189771_df().ordinal())); else if(event.getEntityLiving() instanceof EntityZombie && !(event.getEntityLiving() instanceof EntityPigZombie) && rand.nextInt(26) <= 2 + 2 * looting) addDrop(event, new ItemStack(Items.SKULL, 1, 2)); else if(event.getEntityLiving() instanceof EntityCreeper && rand.nextInt(26) <= 2 + 2 * looting)