Merge remote-tracking branch 'origin/1.14.x' into 1.14.x

src/main/java/net/minecraftforge/client/ForgeHooksClient.java

@@ -371,7 +371,7 @@ public class ForgeHooksClient
         MinecraftForge.EVENT_BUS.post(new EntityViewRenderEvent.RenderFogEvent(fogRenderer, renderer, info, partial, mode, distance));
     }
 
-    public static void onModelBake(ModelManager modelManager, Map<ModelResourceLocation, IBakedModel> modelRegistry, ModelLoader modelLoader)
+    public static void onModelBake(ModelManager modelManager, Map<ResourceLocation, IBakedModel> modelRegistry, ModelLoader modelLoader)
     {
         MinecraftForge.EVENT_BUS.post(new ModelBakeEvent(modelManager, modelRegistry, modelLoader));
         modelLoader.onPostBakeEvent(modelRegistry);

src/main/java/net/minecraftforge/client/event/ModelBakeEvent.java

@@ -24,6 +24,7 @@ import java.util.Map;
 import net.minecraft.client.renderer.model.IBakedModel;
 import net.minecraft.client.renderer.model.ModelManager;
 import net.minecraft.client.renderer.model.ModelResourceLocation;
+import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.client.model.ModelLoader;
 
 /**
@@ -34,10 +35,10 @@ import net.minecraftforge.client.model.ModelLoader;
 public class ModelBakeEvent extends net.minecraftforge.eventbus.api.Event
 {
     private final ModelManager modelManager;
-    private final Map<ModelResourceLocation, IBakedModel> modelRegistry;
+    private final Map<ResourceLocation, IBakedModel> modelRegistry;
     private final ModelLoader modelLoader;
 
-    public ModelBakeEvent(ModelManager modelManager, Map<ModelResourceLocation, IBakedModel> modelRegistry, ModelLoader modelLoader)
+    public ModelBakeEvent(ModelManager modelManager, Map<ResourceLocation, IBakedModel> modelRegistry, ModelLoader modelLoader)
     {
         this.modelManager = modelManager;
         this.modelRegistry = modelRegistry;
@@ -49,7 +50,7 @@ public class ModelBakeEvent extends net.minecraftforge.eventbus.api.Event
         return modelManager;
     }
 
-    public Map<ModelResourceLocation, IBakedModel> getModelRegistry()
+    public Map<ResourceLocation, IBakedModel> getModelRegistry()
     {
         return modelRegistry;
     }

src/main/java/net/minecraftforge/client/event/RenderGameOverlayEvent.java

@@ -33,6 +33,11 @@ public class RenderGameOverlayEvent extends Event
     {
         return partialTicks;
     }
+    
+    public MainWindow getWindow()
+    {
+        return window;
+    }
 
     public ElementType getType()
     {
@@ -66,17 +71,20 @@ public class RenderGameOverlayEvent extends Event
     }
 
     private final float partialTicks;
+    private final MainWindow window;
     private final ElementType type;
 
-    public RenderGameOverlayEvent(float partialTicks, MainWindow resolution)
+    public RenderGameOverlayEvent(float partialTicks, MainWindow window)
     {
         this.partialTicks = partialTicks;
+        this.window = window;
         this.type = null;
     }
 
     private RenderGameOverlayEvent(RenderGameOverlayEvent parent, ElementType type)
     {
         this.partialTicks = parent.getPartialTicks();
+        this.window = parent.getWindow();
         this.type = type;
     }
 

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

@@ -943,7 +943,7 @@ public final class ModelLoader extends ModelBakery
     /**
      * Internal, do not use.
      */
-    public void onPostBakeEvent(Map<ModelResourceLocation, IBakedModel> modelRegistry)
+    public void onPostBakeEvent(Map<ResourceLocation, IBakedModel> modelRegistry)
     {
         IBakedModel missingModel = modelRegistry.get(MODEL_MISSING);
         for(Map.Entry<ResourceLocation, Exception> entry : loadingExceptions.entrySet())

src/main/java/net/minecraftforge/common/extensions/IForgeSelectionContext.java

@@ -0,0 +1,13 @@
+package net.minecraftforge.common.extensions;
+
+import javax.annotation.Nullable;
+
+import net.minecraft.entity.Entity;
+
+public interface IForgeSelectionContext
+{
+    default @Nullable Entity getEntity()
+    {
+        return null;
+    }
+}