mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-17 02:55:17 +00:00
Update MCP Mappings.
This commit is contained in:
1 parent
8d3685439e
commit
d4f79882f9
37 files changed
+43
-40
No files matched your search
@@ -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);
|
||||
}
|
||||
|
||||
@@ -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<>();
|
||||
|
||||
+2
-2
@@ -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;
|
||||
|
||||
@@ -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)))
|
||||
|
||||
+1
-1
@@ -337,4 +337,4 @@ public class VariantBlockStateBuilder implements IGeneratedBlockstate {
|
||||
};
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -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);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -75,4 +75,4 @@ public class BasicTrade implements ITrade
|
||||
return new MerchantOffer(price, price2, forSale, maxTrades, xp, priceMult);
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
@@ -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() { }
|
||||
}
|
||||
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -62,4 +62,4 @@ public class VillagerTradesEvent extends Event
|
||||
return type;
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
@@ -54,4 +54,4 @@ public class WandererTradesEvent extends Event
|
||||
{
|
||||
return rare;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -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)
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in new issue
Block a user