From eff42f6066673db0c4e12e1c1e18a98ec1e9c0a2 Mon Sep 17 00:00:00 2001 From: cpw Date: Fri, 19 Jul 2019 11:55:30 -0400 Subject: [PATCH] Update mappings to 20190719 in prep for 1.14.4.. Signed-off-by: cpw --- build.gradle | 2 +- .../net/minecraftforge/client/ForgeHooksClient.java | 2 +- .../java/net/minecraftforge/client/ForgeIngameGui.java | 6 +++--- .../net/minecraftforge/client/gui/ScrollPanel.java | 2 +- .../net/minecraftforge/common/DimensionManager.java | 10 +++++----- .../common/extensions/IForgeDimension.java | 2 +- .../net/minecraftforge/event/ForgeEventFactory.java | 2 +- .../net/minecraftforge/fml/client/EarlyLoaderGUI.java | 6 +++--- .../fml/client/registry/RenderingRegistry.java | 2 +- src/main/resources/forge.exc | 4 +++- 10 files changed, 20 insertions(+), 18 deletions(-) diff --git a/build.gradle b/build.gradle index 95b40da79..63929a9ab 100644 --- a/build.gradle +++ b/build.gradle @@ -48,7 +48,7 @@ ext { ] } MAPPING_CHANNEL = 'snapshot' - MAPPING_VERSION = '20190621-1.14.2' + MAPPING_VERSION = '20190719-1.14.3' MC_VERSION = '1.14.3' MCP_VERSION = '20190624.152911' } diff --git a/src/main/java/net/minecraftforge/client/ForgeHooksClient.java b/src/main/java/net/minecraftforge/client/ForgeHooksClient.java index b87388a4a..857051d4c 100644 --- a/src/main/java/net/minecraftforge/client/ForgeHooksClient.java +++ b/src/main/java/net/minecraftforge/client/ForgeHooksClient.java @@ -899,7 +899,7 @@ public class ForgeHooksClient public static void refreshResources(Minecraft mc, VanillaResourceType... types) { SelectiveReloadStateHandler.INSTANCE.beginReload(ReloadRequirements.include(types)); - mc.func_213237_g(); + mc.reloadResources(); SelectiveReloadStateHandler.INSTANCE.endReload(); } diff --git a/src/main/java/net/minecraftforge/client/ForgeIngameGui.java b/src/main/java/net/minecraftforge/client/ForgeIngameGui.java index 385ccbb7d..f38d07bdd 100644 --- a/src/main/java/net/minecraftforge/client/ForgeIngameGui.java +++ b/src/main/java/net/minecraftforge/client/ForgeIngameGui.java @@ -124,7 +124,7 @@ public class ForgeIngameGui extends IngameGui GlStateManager.enableBlend(); if (renderVignette && Minecraft.isFancyGraphicsEnabled()) { - func_212303_b(mc.getRenderViewEntity()); + renderVignette(mc.getRenderViewEntity()); } else { @@ -262,7 +262,7 @@ public class ForgeIngameGui extends IngameGui } @Override - protected void func_212303_b(Entity entity) + protected void renderVignette(Entity entity) { if (pre(VIGNETTE)) { @@ -271,7 +271,7 @@ public class ForgeIngameGui extends IngameGui GlStateManager.blendFuncSeparate(GlStateManager.SourceFactor.SRC_ALPHA, GlStateManager.DestFactor.ONE_MINUS_SRC_ALPHA, GlStateManager.SourceFactor.ONE, GlStateManager.DestFactor.ZERO); return; } - super.func_212303_b(entity); + super.renderVignette(entity); post(VIGNETTE); } diff --git a/src/main/java/net/minecraftforge/client/gui/ScrollPanel.java b/src/main/java/net/minecraftforge/client/gui/ScrollPanel.java index df52d5ac8..84592610e 100644 --- a/src/main/java/net/minecraftforge/client/gui/ScrollPanel.java +++ b/src/main/java/net/minecraftforge/client/gui/ScrollPanel.java @@ -267,4 +267,4 @@ public abstract class ScrollPanel extends FocusableGui implements IRenderable { return Collections.emptyList(); } -} \ No newline at end of file +} diff --git a/src/main/java/net/minecraftforge/common/DimensionManager.java b/src/main/java/net/minecraftforge/common/DimensionManager.java index c2057a8e6..435d522c9 100644 --- a/src/main/java/net/minecraftforge/common/DimensionManager.java +++ b/src/main/java/net/minecraftforge/common/DimensionManager.java @@ -198,11 +198,11 @@ public class DimensionManager @SuppressWarnings("deprecation") public static ServerWorld initWorld(MinecraftServer server, DimensionType dim) { - Validate.isTrue(dim != DimensionType.field_223227_a_, "Can not hotload overworld. This must be loaded at all times by main Server."); + Validate.isTrue(dim != DimensionType.OVERWORLD, "Can not hotload overworld. This must be loaded at all times by main Server."); Validate.notNull(server, "Must provide server when creating world"); Validate.notNull(dim, "Must provide dimension when creating world"); - ServerWorld overworld = getWorld(server, DimensionType.field_223227_a_, false, false); + ServerWorld overworld = getWorld(server, DimensionType.OVERWORLD, false, false); Validate.notNull(overworld, "Cannot Hotload Dim: Overworld is not Loaded!"); @SuppressWarnings("resource") @@ -477,8 +477,8 @@ public class DimensionManager private static class NoopChunkStatusListener implements IChunkStatusListener { - @Override public void func_219509_a(ChunkPos p_219509_1_) { } - @Override public void func_219508_a(ChunkPos p_219508_1_, ChunkStatus p_219508_2_) { } - @Override public void func_219510_b() { } + @Override public void start(ChunkPos center) { } + @Override public void statusChanged(ChunkPos p_219508_1_, ChunkStatus p_219508_2_) { } + @Override public void stop() { } } } diff --git a/src/main/java/net/minecraftforge/common/extensions/IForgeDimension.java b/src/main/java/net/minecraftforge/common/extensions/IForgeDimension.java index c802a4204..870c6645f 100644 --- a/src/main/java/net/minecraftforge/common/extensions/IForgeDimension.java +++ b/src/main/java/net/minecraftforge/common/extensions/IForgeDimension.java @@ -290,7 +290,7 @@ public interface IForgeDimension */ default boolean shouldMapSpin(String entity, double x, double z, double rotation) { - return getDimension().getType() == DimensionType.field_223228_b_; + return getDimension().getType() == DimensionType.THE_NETHER; } /** diff --git a/src/main/java/net/minecraftforge/event/ForgeEventFactory.java b/src/main/java/net/minecraftforge/event/ForgeEventFactory.java index 5b8f3d8d5..61ad4dc00 100644 --- a/src/main/java/net/minecraftforge/event/ForgeEventFactory.java +++ b/src/main/java/net/minecraftforge/event/ForgeEventFactory.java @@ -671,7 +671,7 @@ public class ForgeEventFactory MinecraftForge.EVENT_BUS.post(event); Result result = event.getResult(); - return result == Result.DEFAULT ? world.getGameRules().func_223586_b(GameRules.field_223599_b) : result == Result.ALLOW; + return result == Result.DEFAULT ? world.getGameRules().getBoolean(GameRules.MOB_GRIEFING) : result == Result.ALLOW; } public static boolean saplingGrowTree(IWorld world, Random rand, BlockPos pos) diff --git a/src/main/java/net/minecraftforge/fml/client/EarlyLoaderGUI.java b/src/main/java/net/minecraftforge/fml/client/EarlyLoaderGUI.java index 21c266480..7a322ac38 100644 --- a/src/main/java/net/minecraftforge/fml/client/EarlyLoaderGUI.java +++ b/src/main/java/net/minecraftforge/fml/client/EarlyLoaderGUI.java @@ -62,12 +62,12 @@ public class EarlyLoaderGUI { void renderTick() { if (handledElsewhere) return; - int guiScale = window.func_216521_a(0, false); - window.func_216525_a(guiScale); + int guiScale = window.calcGuiScale(0, false); + window.setGuiScale(guiScale); GlStateManager.clearColor(1.0f, 1.0f, 1.0f, 1.0f); GlStateManager.clear(GL11.GL_COLOR_BUFFER_BIT, Minecraft.IS_RUNNING_ON_MAC); - window.func_216522_a(Minecraft.IS_RUNNING_ON_MAC); + window.loadGUIRenderMatrix(Minecraft.IS_RUNNING_ON_MAC); renderMessages(); window.update(false); } diff --git a/src/main/java/net/minecraftforge/fml/client/registry/RenderingRegistry.java b/src/main/java/net/minecraftforge/fml/client/registry/RenderingRegistry.java index b48d01845..19b97ebcc 100644 --- a/src/main/java/net/minecraftforge/fml/client/registry/RenderingRegistry.java +++ b/src/main/java/net/minecraftforge/fml/client/registry/RenderingRegistry.java @@ -51,6 +51,6 @@ public class RenderingRegistry @SuppressWarnings("unchecked") private static void register(EntityRendererManager manager, Class entityClass, IRenderFactory renderFactory) { - manager.func_217782_a(entityClass, ((IRenderFactory)renderFactory).createRenderFor(manager)); + manager.register(entityClass, ((IRenderFactory)renderFactory).createRenderFor(manager)); } } diff --git a/src/main/resources/forge.exc b/src/main/resources/forge.exc index e8d45beb4..d8b7ca2ee 100644 --- a/src/main/resources/forge.exc +++ b/src/main/resources/forge.exc @@ -81,4 +81,6 @@ net/minecraft/world/storage/loot/LootEntryItem.(Lnet/minecraft/item/Item;I net/minecraft/world/storage/loot/LootEntryTable.(Lnet/minecraft/util/ResourceLocation;II[Lnet/minecraft/world/storage/loot/conditions/LootCondition;Ljava/lang/String;)V=|p_i46639_1_,p_i46639_2_,p_i46639_3_,p_i46639_4_,entryName net/minecraft/world/storage/loot/LootPool.([Lnet/minecraft/world/storage/loot/LootEntry;[Lnet/minecraft/world/storage/loot/conditions/LootCondition;Lnet/minecraft/world/storage/loot/RandomValueRange;Lnet/minecraft/world/storage/loot/RandomValueRange;Ljava/lang/String;)V=|p_i46643_1_,p_i46643_2_,p_i46643_3_,p_i46643_4_ -net/minecraft/util/shapes/EntitySelectionContext.(Lnet/minecraft/entity/Entity;ZDLnet/minecraft/item/Item;)V=|entity,p_i51181_1_,p_i51181_2_,p_i51181_4_ \ No newline at end of file +net/minecraft/util/math/shapes/EntitySelectionContext.(Lnet/minecraft/entity/Entity;ZDLnet/minecraft/item/Item;)V=|entityIn,p_i51181_1_,p_i51181_2_,p_i51181_4_ + +net/minecraft/item/BoneMealItem.applyBonemeal(Lnet/minecraft/item/ItemStack;Lnet/minecraft/world/World;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/entity/player/PlayerEntity;)Z=|p_195966_0_,p_195966_1_,p_195966_2_,player \ No newline at end of file