From 083daeb5ed8e01518132c441f68eca88e2d59800 Mon Sep 17 00:00:00 2001 From: mezz Date: Tue, 3 Oct 2017 22:08:36 -0700 Subject: [PATCH] Update mcp mappings to 20171003 --- build.gradle | 2 +- .../net/minecraftforge/client/ForgeHooksClient.java | 2 +- .../net/minecraftforge/common/BiomeDictionary.java | 10 +++++----- .../java/net/minecraftforge/common/ForgeHooks.java | 2 +- .../java/net/minecraftforge/registries/GameData.java | 2 +- .../net/minecraftforge/debug/ItemLayerModelDebug.java | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/build.gradle b/build.gradle index 8f891094b..913c905e4 100644 --- a/build.gradle +++ b/build.gradle @@ -30,7 +30,7 @@ apply plugin: "net.minecraftforge.gradle.launch4j" minecraft.version = "1.12.2" minecraft { - mappings = 'snapshot_nodoc_20170624' + mappings = 'snapshot_nodoc_20171003' workspaceDir = "projects" versionJson = "jsons/${minecraft.version}-dev.json" buildUserdev = true diff --git a/src/main/java/net/minecraftforge/client/ForgeHooksClient.java b/src/main/java/net/minecraftforge/client/ForgeHooksClient.java index 6e72c06c1..6aa2e5ea8 100644 --- a/src/main/java/net/minecraftforge/client/ForgeHooksClient.java +++ b/src/main/java/net/minecraftforge/client/ForgeHooksClient.java @@ -271,7 +271,7 @@ public class ForgeHooksClient { BlockPos pos = center.add(x, 0, z); Biome biome = world.getBiome(pos); - int colour = biome.getSkyColorByTemp(biome.getFloatTemperature(pos)); + int colour = biome.getSkyColorByTemp(biome.getTemperature(pos)); r += (colour & 0xFF0000) >> 16; g += (colour & 0x00FF00) >> 8; b += colour & 0x0000FF; diff --git a/src/main/java/net/minecraftforge/common/BiomeDictionary.java b/src/main/java/net/minecraftforge/common/BiomeDictionary.java index bedcbda83..08cbcd05a 100644 --- a/src/main/java/net/minecraftforge/common/BiomeDictionary.java +++ b/src/main/java/net/minecraftforge/common/BiomeDictionary.java @@ -255,7 +255,7 @@ public class BiomeDictionary { if (biome.decorator.treesPerChunk >= 3) { - if (biome.isHighHumidity() && biome.getTemperature() >= 0.9F) + if (biome.isHighHumidity() && biome.getDefaultTemperature() >= 0.9F) { BiomeDictionary.addTypes(biome, JUNGLE); } @@ -263,7 +263,7 @@ public class BiomeDictionary { BiomeDictionary.addTypes(biome, FOREST); - if (biome.getTemperature() <= 0.2f) + if (biome.getDefaultTemperature() <= 0.2f) { BiomeDictionary.addTypes(biome, CONIFEROUS); } @@ -287,12 +287,12 @@ public class BiomeDictionary BiomeDictionary.addTypes(biome, DRY); } - if (biome.getTemperature() > 0.85f) + if (biome.getDefaultTemperature() > 0.85f) { BiomeDictionary.addTypes(biome, HOT); } - if (biome.getTemperature() < 0.15f) + if (biome.getDefaultTemperature() < 0.15f) { BiomeDictionary.addTypes(biome, COLD); } @@ -338,7 +338,7 @@ public class BiomeDictionary BiomeDictionary.addTypes(biome, SNOWY); } - if (biome.topBlock != Blocks.SAND && biome.getTemperature() >= 1.0f && biome.getRainfall() < 0.2f) + if (biome.topBlock != Blocks.SAND && biome.getDefaultTemperature() >= 1.0f && biome.getRainfall() < 0.2f) { BiomeDictionary.addTypes(biome, SAVANNA); } diff --git a/src/main/java/net/minecraftforge/common/ForgeHooks.java b/src/main/java/net/minecraftforge/common/ForgeHooks.java index 6c81e94c0..8fd4472d5 100644 --- a/src/main/java/net/minecraftforge/common/ForgeHooks.java +++ b/src/main/java/net/minecraftforge/common/ForgeHooks.java @@ -780,7 +780,7 @@ public class ForgeHooks && !itemstack.getItem().canDestroyBlockInCreative(world, pos, itemstack, entityPlayer)) preCancelEvent = true; - if (gameType.isAdventure()) + if (gameType.hasLimitedInteractions()) { if (gameType == GameType.SPECTATOR) preCancelEvent = true; diff --git a/src/main/java/net/minecraftforge/registries/GameData.java b/src/main/java/net/minecraftforge/registries/GameData.java index 111f2ec71..18946032c 100644 --- a/src/main/java/net/minecraftforge/registries/GameData.java +++ b/src/main/java/net/minecraftforge/registries/GameData.java @@ -423,7 +423,7 @@ public class GameData @Override public ItemStack getCraftingResult(InventoryCrafting inv) { return result; } @Override public boolean canFit(int width, int height) { return false; } @Override public ItemStack getRecipeOutput() { return result; } - @Override public boolean isHidden() { return true; } + @Override public boolean isDynamic() { return true; } } } diff --git a/src/test/java/net/minecraftforge/debug/ItemLayerModelDebug.java b/src/test/java/net/minecraftforge/debug/ItemLayerModelDebug.java index 8b725439a..9448d813d 100644 --- a/src/test/java/net/minecraftforge/debug/ItemLayerModelDebug.java +++ b/src/test/java/net/minecraftforge/debug/ItemLayerModelDebug.java @@ -93,7 +93,7 @@ public class ItemLayerModelDebug } @Override - public float getStrVsBlock(ItemStack stack, IBlockState state) + public float getDestroySpeed(ItemStack stack, IBlockState state) { return 10f; }