Update mappings to 20190719 in prep for 1.14.4..

Signed-off-by: cpw <cpw+github@weeksfamily.ca>
This commit is contained in:
cpw committed 2019-07-19 11:55:30 -04:00
1 parent 9f5ce12754
commit eff42f6066
10 files changed
+20 -18

No files matched your search

@@ -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();
}
@@ -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);
}
@@ -267,4 +267,4 @@ public abstract class ScrollPanel extends FocusableGui implements IRenderable
{
return Collections.emptyList();
}
}
}
@@ -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() { }
}
}
@@ -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;
}
/**
@@ -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)
@@ -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);
}
@@ -51,6 +51,6 @@ public class RenderingRegistry
@SuppressWarnings("unchecked")
private static <T extends Entity> void register(EntityRendererManager manager, Class<T> entityClass, IRenderFactory<?> renderFactory)
{
manager.func_217782_a(entityClass, ((IRenderFactory<T>)renderFactory).createRenderFor(manager));
manager.register(entityClass, ((IRenderFactory<T>)renderFactory).createRenderFor(manager));
}
}