Update MCP Mappings.

build.gradle

@@ -64,7 +64,7 @@ ext {
         ]
     }
     MAPPING_CHANNEL = 'snapshot'
-    MAPPING_VERSION = '20200225-1.15.1'
+    MAPPING_VERSION = '20200514-1.15.1'
     MC_VERSION = '1.15.2'
     MCP_VERSION = '20200515.085601'
 }

patches/minecraft/net/minecraft/block/FlowerPotBlock.java.patch

@@ -22,7 +22,7 @@
 +    *
 +    * @param emptyPot    The empty pot for this pot, or null for self.
 +    * @param p_i48395_1_ The flower block.
-+    * @param p_i48395_2_
++    * @param properties
 +    */
 +   public FlowerPotBlock(@javax.annotation.Nullable java.util.function.Supplier<FlowerPotBlock> emptyPot, java.util.function.Supplier<? extends Block> p_i48395_1_, Block.Properties p_i48395_2_) {
        super(p_i48395_2_);

src/main/java/net/minecraftforge/client/model/FancyMissingModel.java

@@ -91,7 +91,7 @@ final class FancyMissingModel implements IUnbakedModel
     }
 
     @Override
-    public Collection<Material> getTextures(Function<ResourceLocation, IUnbakedModel> p_225614_1_, Set<com.mojang.datafixers.util.Pair<String, String>> p_225614_2_)
+    public Collection<Material> getTextures(Function<ResourceLocation, IUnbakedModel> modelGetter, Set<com.mojang.datafixers.util.Pair<String, String>> missingTextureErrors)
     {
         return ImmutableList.of(font2);
     }

src/main/java/net/minecraftforge/client/model/ModelLoader.java

@@ -65,11 +65,11 @@ public final class ModelLoader extends ModelBakery
         return isLoading;
     }
 
-    public ModelLoader(IResourceManager manager, BlockColors colours, IProfiler profiler, int p_i226056_4_)
+    public ModelLoader(IResourceManager manager, BlockColors colours, IProfiler profiler, int maxMipmapLevel)
     {
         super(manager, colours, false);
         instance = this;
-        processLoading(profiler, p_i226056_4_);
+        processLoading(profiler, maxMipmapLevel);
     }
 
     private static Set<ResourceLocation> specialModels = new HashSet<>();

src/main/java/net/minecraftforge/client/model/animation/TileEntityRendererAnimation.java

@@ -49,9 +49,9 @@ import net.minecraftforge.common.util.LazyOptional;
  */
 public class TileEntityRendererAnimation<T extends TileEntity> extends TileEntityRenderer<T> implements IEventHandler<T>
 {
-    public TileEntityRendererAnimation(TileEntityRendererDispatcher p_i226006_1_)
+    public TileEntityRendererAnimation(TileEntityRendererDispatcher rendererDispatcherIn)
     {
-        super(p_i226006_1_);
+        super(rendererDispatcherIn);
     }
 
     protected static BlockRendererDispatcher blockRenderer;

src/main/java/net/minecraftforge/client/model/b3d/B3DLoader.java

@@ -446,7 +446,7 @@ public enum B3DLoader implements ISelectiveResourceReloadListener
         }
 
         @Override
-        public Collection<Material> getTextures(Function<ResourceLocation, IUnbakedModel> p_225614_1_, Set<com.mojang.datafixers.util.Pair<String, String>> p_225614_2_)
+        public Collection<Material> getTextures(Function<ResourceLocation, IUnbakedModel> modelGetter, Set<com.mojang.datafixers.util.Pair<String, String>> missingTextureErrors)
         {
             return textures.values().stream().filter(loc -> !loc.startsWith("#"))
                     .map(t -> new Material(AtlasTexture.LOCATION_BLOCKS_TEXTURE, new ResourceLocation(t)))

src/main/java/net/minecraftforge/client/model/generators/VariantBlockStateBuilder.java

@@ -337,4 +337,4 @@ public class VariantBlockStateBuilder implements IGeneratedBlockstate {
             };
         }
     }
-}
+}

src/main/java/net/minecraftforge/client/model/pipeline/ForgeBlockModelRenderer.java

@@ -51,7 +51,7 @@ public class ForgeBlockModelRenderer extends BlockModelRenderer
     }
 
     @Override
-    public boolean renderModelFlat(ILightReader world, IBakedModel model, BlockState state, BlockPos pos, MatrixStack matrixStack, IVertexBuilder buffer, boolean checkSides, Random rand, long seed, int p_228806_11_, IModelData modelData)
+    public boolean renderModelFlat(ILightReader world, IBakedModel model, BlockState state, BlockPos pos, MatrixStack matrixStack, IVertexBuilder buffer, boolean checkSides, Random rand, long seed, int combinedOverlayIn, IModelData modelData)
     {
         if(ForgeConfig.CLIENT.experimentalForgeLightPipelineEnabled.get())
         {
@@ -66,12 +66,12 @@ public class ForgeBlockModelRenderer extends BlockModelRenderer
         }
         else
         {
-            return super.renderModelFlat(world, model, state, pos, matrixStack, buffer, checkSides, rand, seed, p_228806_11_, modelData);
+            return super.renderModelFlat(world, model, state, pos, matrixStack, buffer, checkSides, rand, seed, combinedOverlayIn, modelData);
         }
     }
 
     @Override
-    public boolean renderModelSmooth(ILightReader world, IBakedModel model, BlockState state, BlockPos pos, MatrixStack matrixStack, IVertexBuilder buffer, boolean checkSides, Random rand, long seed, int p_228805_11_, IModelData modelData)
+    public boolean renderModelSmooth(ILightReader world, IBakedModel model, BlockState state, BlockPos pos, MatrixStack matrixStack, IVertexBuilder buffer, boolean checkSides, Random rand, long seed, int combinedOverlayIn, IModelData modelData)
     {
         if(ForgeConfig.CLIENT.experimentalForgeLightPipelineEnabled.get())
         {
@@ -86,7 +86,7 @@ public class ForgeBlockModelRenderer extends BlockModelRenderer
         }
         else
         {
-            return super.renderModelSmooth(world, model, state, pos, matrixStack, buffer, checkSides, rand, seed, p_228805_11_, modelData);
+            return super.renderModelSmooth(world, model, state, pos, matrixStack, buffer, checkSides, rand, seed, combinedOverlayIn, modelData);
         }
     }
 

src/main/java/net/minecraftforge/common/BasicTrade.java

@@ -75,4 +75,4 @@ public class BasicTrade implements ITrade
         return new MerchantOffer(price, price2, forSale, maxTrades, xp, priceMult);
     }
 
-}
+}

src/main/java/net/minecraftforge/common/DimensionManager.java

@@ -510,7 +510,7 @@ public class DimensionManager
     private static class NoopChunkStatusListener implements IChunkStatusListener
     {
         @Override public void start(ChunkPos center) { }
-        @Override public void statusChanged(ChunkPos p_219508_1_, ChunkStatus p_219508_2_) { }
+        @Override public void statusChanged(ChunkPos chunkPosition, ChunkStatus newStatus) { }
         @Override public void stop() { }
     }
 

src/main/java/net/minecraftforge/common/util/ITeleporter.java

@@ -59,4 +59,4 @@ public interface ITeleporter {
     default Entity placeEntity(Entity entity, ServerWorld currentWorld, ServerWorld destWorld, float yaw, Function<Boolean, Entity> repositionEntity) {
        return repositionEntity.apply(true);
     }
-}
+}

src/main/java/net/minecraftforge/event/village/VillagerTradesEvent.java

@@ -62,4 +62,4 @@ public class VillagerTradesEvent extends Event
         return type;
     }
 
-}
+}

src/main/java/net/minecraftforge/event/village/WandererTradesEvent.java

@@ -54,4 +54,4 @@ public class WandererTradesEvent extends Event
     {
         return rare;
     }
-}
+}

src/main/java/net/minecraftforge/items/SlotItemHandler.java

@@ -63,7 +63,7 @@ public class SlotItemHandler extends Slot
     }
 
     @Override
-    public void onSlotChange(@Nonnull ItemStack p_75220_1_, @Nonnull ItemStack p_75220_2_)
+    public void onSlotChange(@Nonnull ItemStack oldStackIn, @Nonnull ItemStack newStackIn)
     {
 
     }

src/main/java/net/minecraftforge/registries/GameData.java

@@ -95,6 +95,8 @@ import java.util.stream.Collectors;
 
 import static net.minecraftforge.registries.ForgeRegistry.REGISTRIES;
 
+import net.minecraftforge.fml.common.EnhancedRuntimeException.WrappedPrintStream;
+
 /**
  * INTERNAL ONLY
  * MODDERS SHOULD HAVE NO REASON TO USE THIS CLASS

src/main/resources/forge.exc

@@ -1,5 +1,6 @@
 net/minecraft/block/FireBlock.tryCatchFire(Lnet/minecraft/world/World;Lnet/minecraft/util/math/BlockPos;ILjava/util/Random;ILnet/minecraft/util/Direction;)V=|p_176536_1_,p_176536_2_,p_176536_3_,p_176536_4_,p_176536_5_,face
 net/minecraft/block/FlowerPotBlock.<init>(Lnet/minecraft/block/FlowerPotBlock;Lnet/minecraft/block/Block;Lnet/minecraft/block/Block$Properties;)V=|emptyPot,p_i48395_1_,p_i48395_2_
+net/minecraft/block/FlowerPotBlock.<init>(Ljava/util/function/Supplier;Ljava/util/function/Supplier;Lnet/minecraft/block/Block$Properties;)V=|emptyPot,p_i48395_1_,p_i48395_2_
 net/minecraft/block/PoweredRailBlock.<init>(Lnet/minecraft/block/Block$Properties;Z)=|p_i48349_1_,isActivator
 net/minecraft/block/RedstoneWireBlock.canConnectTo(Lnet/minecraft/block/BlockState;Lnet/minecraft/world/IBlockReader;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/util/Direction;)Z=|p_176343_0_,world,pos,p_176343_1_
 

src/test/java/net/minecraftforge/debug/block/CustomPlantTypeTest.java

@@ -121,4 +121,4 @@ public class CustomPlantTypeTest
             return block == CUSTOM_SOIL;
         }
     }
-}
+}

src/test/java/net/minecraftforge/debug/block/package-info.java

@@ -22,4 +22,4 @@
 package net.minecraftforge.debug.block;
 
 import javax.annotation.ParametersAreNonnullByDefault;
-import mcp.MethodsReturnNonnullByDefault;
+import mcp.MethodsReturnNonnullByDefault;

src/test/java/net/minecraftforge/debug/chat/package-info.java

@@ -22,4 +22,4 @@
 package net.minecraftforge.debug.chat;
 
 import javax.annotation.ParametersAreNonnullByDefault;
-import mcp.MethodsReturnNonnullByDefault;
+import mcp.MethodsReturnNonnullByDefault;

src/test/java/net/minecraftforge/debug/client/model/package-info.java

@@ -22,4 +22,4 @@
 package net.minecraftforge.debug.client.model;
 
 import javax.annotation.ParametersAreNonnullByDefault;
-import mcp.MethodsReturnNonnullByDefault;
+import mcp.MethodsReturnNonnullByDefault;

src/test/java/net/minecraftforge/debug/client/package-info.java

@@ -22,4 +22,4 @@
 package net.minecraftforge.debug.client;
 
 import javax.annotation.ParametersAreNonnullByDefault;
-import mcp.MethodsReturnNonnullByDefault;
+import mcp.MethodsReturnNonnullByDefault;

src/test/java/net/minecraftforge/debug/client/rendering/package-info.java

@@ -22,4 +22,4 @@
 package net.minecraftforge.debug.client.rendering;
 
 import javax.annotation.ParametersAreNonnullByDefault;
-import mcp.MethodsReturnNonnullByDefault;
+import mcp.MethodsReturnNonnullByDefault;

src/test/java/net/minecraftforge/debug/entity/living/package-info.java

@@ -22,4 +22,4 @@
 package net.minecraftforge.debug.entity.living;
 
 import javax.annotation.ParametersAreNonnullByDefault;
-import mcp.MethodsReturnNonnullByDefault;
+import mcp.MethodsReturnNonnullByDefault;

src/test/java/net/minecraftforge/debug/entity/package-info.java

@@ -22,4 +22,4 @@
 package net.minecraftforge.debug.entity;
 
 import javax.annotation.ParametersAreNonnullByDefault;
-import mcp.MethodsReturnNonnullByDefault;
+import mcp.MethodsReturnNonnullByDefault;

src/test/java/net/minecraftforge/debug/entity/player/package-info.java

@@ -22,4 +22,4 @@
 package net.minecraftforge.debug.entity.player;
 
 import javax.annotation.ParametersAreNonnullByDefault;
-import mcp.MethodsReturnNonnullByDefault;
+import mcp.MethodsReturnNonnullByDefault;

src/test/java/net/minecraftforge/debug/fluid/package-info.java

@@ -22,4 +22,4 @@
 package net.minecraftforge.debug.fluid;
 
 import javax.annotation.ParametersAreNonnullByDefault;
-import mcp.MethodsReturnNonnullByDefault;
+import mcp.MethodsReturnNonnullByDefault;

src/test/java/net/minecraftforge/debug/gameplay/advancement/package-info.java

@@ -22,4 +22,4 @@
 package net.minecraftforge.debug.gameplay.advancement;
 
 import javax.annotation.ParametersAreNonnullByDefault;
-import mcp.MethodsReturnNonnullByDefault;
+import mcp.MethodsReturnNonnullByDefault;

src/test/java/net/minecraftforge/debug/gameplay/loot/package-info.java

@@ -22,4 +22,4 @@
 package net.minecraftforge.debug.gameplay.loot;
 
 import javax.annotation.ParametersAreNonnullByDefault;
-import mcp.MethodsReturnNonnullByDefault;
+import mcp.MethodsReturnNonnullByDefault;

src/test/java/net/minecraftforge/debug/gameplay/package-info.java

@@ -22,4 +22,4 @@
 package net.minecraftforge.debug.gameplay;
 
 import javax.annotation.ParametersAreNonnullByDefault;
-import mcp.MethodsReturnNonnullByDefault;
+import mcp.MethodsReturnNonnullByDefault;

src/test/java/net/minecraftforge/debug/item/package-info.java

@@ -22,4 +22,4 @@
 package net.minecraftforge.debug.item;
 
 import javax.annotation.ParametersAreNonnullByDefault;
-import mcp.MethodsReturnNonnullByDefault;
+import mcp.MethodsReturnNonnullByDefault;

src/test/java/net/minecraftforge/debug/misc/package-info.java

@@ -22,4 +22,4 @@
 package net.minecraftforge.debug.misc;
 
 import javax.annotation.ParametersAreNonnullByDefault;
-import mcp.MethodsReturnNonnullByDefault;
+import mcp.MethodsReturnNonnullByDefault;

src/test/java/net/minecraftforge/debug/mod/package-info.java

@@ -22,4 +22,4 @@
 package net.minecraftforge.debug.mod;
 
 import javax.annotation.ParametersAreNonnullByDefault;
-import mcp.MethodsReturnNonnullByDefault;
+import mcp.MethodsReturnNonnullByDefault;

src/test/java/net/minecraftforge/debug/network/package-info.java

@@ -22,4 +22,4 @@
 package net.minecraftforge.debug.network;
 
 import javax.annotation.ParametersAreNonnullByDefault;
-import mcp.MethodsReturnNonnullByDefault;
+import mcp.MethodsReturnNonnullByDefault;

src/test/java/net/minecraftforge/debug/package-info.java

@@ -23,4 +23,4 @@ package net.minecraftforge.debug;
 
 import mcp.MethodsReturnNonnullByDefault;
 
-import javax.annotation.ParametersAreNonnullByDefault;
+import javax.annotation.ParametersAreNonnullByDefault;

src/test/java/net/minecraftforge/debug/util/package-info.java

@@ -22,4 +22,4 @@
 package net.minecraftforge.debug.util;
 
 import javax.annotation.ParametersAreNonnullByDefault;
-import mcp.MethodsReturnNonnullByDefault;
+import mcp.MethodsReturnNonnullByDefault;

src/test/java/net/minecraftforge/debug/world/package-info.java

@@ -22,4 +22,4 @@
 package net.minecraftforge.debug.world;
 
 import javax.annotation.ParametersAreNonnullByDefault;
-import mcp.MethodsReturnNonnullByDefault;
+import mcp.MethodsReturnNonnullByDefault;

src/test/java/net/minecraftforge/test/package-info.java

@@ -23,4 +23,4 @@ package net.minecraftforge.test;
 
 import mcp.MethodsReturnNonnullByDefault;
 
-import javax.annotation.ParametersAreNonnullByDefault;
+import javax.annotation.ParametersAreNonnullByDefault;