keith/ForgePatch
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Wiki Activity

Update mappings to 20190719 in prep for 1.14.4..

Browse source 
Signed-off-by: cpw <cpw+github@weeksfamily.ca>
This commit is contained in:
cpw 2019-07-19 11:55:30 -04:00
parent 9f5ce12754
commit eff42f6066
No known key found for this signature in database
GPG key ID: 8EB3DF749553B1B7
10 changed files with 20 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build.gradle
View file

@ -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'
}

2
src/main/java/net/minecraftforge/client/ForgeHooksClient.java
View file

@ -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();
}

6
src/main/java/net/minecraftforge/client/ForgeIngameGui.java
View file

@ -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);
}

10
src/main/java/net/minecraftforge/common/DimensionManager.java
View file

@ -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() { }
}
}

2
src/main/java/net/minecraftforge/common/extensions/IForgeDimension.java
View file

@ -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;
}
/**

2
src/main/java/net/minecraftforge/event/ForgeEventFactory.java
View file

@ -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)

6
src/main/java/net/minecraftforge/fml/client/EarlyLoaderGUI.java
View file

@ -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);
}

2
src/main/java/net/minecraftforge/fml/client/registry/RenderingRegistry.java
View file

@ -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));
}
}

4
src/main/resources/forge.exc
View file

@ -81,4 +81,6 @@ net/minecraft/world/storage/loot/LootEntryItem.<init>(Lnet/minecraft/item/Item;I
net/minecraft/world/storage/loot/LootEntryTable.<init>(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.<init>([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.<init>(Lnet/minecraft/entity/Entity;ZDLnet/minecraft/item/Item;)V=|entity,p_i51181_1_,p_i51181_2_,p_i51181_4_
net/minecraft/util/math/shapes/EntitySelectionContext.<init>(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