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

This commit is contained in:
cpw committed 2019-06-21 22:42:33 -04:00
commit 83a0dc2ef9
17 files changed
+116 -38

No files matched your search

@@ -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);
@@ -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;
}
@@ -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;
}
@@ -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())
@@ -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;
}
}
+2
View File
@@ -80,3 +80,5 @@ net/minecraft/world/storage/loot/LootEntryEmpty.<init>(II[Lnet/minecraft/world/s
net/minecraft/world/storage/loot/LootEntryItem.<init>(Lnet/minecraft/item/Item;II[Lnet/minecraft/world/storage/loot/functions/LootFunction;[Lnet/minecraft/world/storage/loot/conditions/LootCondition;Ljava/lang/String;)V=|p_i46644_1_,p_i46644_2_,p_i46644_3_,p_i46644_4_,p_i46644_5_,entryName
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_