1.18.x Omnibus (#8239)

This commit is contained in:
sciwhiz12 authored and GitHub committed 2022-03-01 18:59:37 +00:00
1 parent 4011c3fb07
commit 34291c1fb2
89 files changed
+1014 -1192

No files matched your search

@@ -112,8 +112,8 @@ public abstract class BakedModelWrapper<T extends BakedModel> implements BakedMo
@Nonnull
@Override
public IModelData getModelData(@Nonnull BlockAndTintGetter world, @Nonnull BlockPos pos, @Nonnull BlockState state, @Nonnull IModelData tileData)
public IModelData getModelData(@Nonnull BlockAndTintGetter level, @Nonnull BlockPos pos, @Nonnull BlockState state, @Nonnull IModelData modelData)
{
return originalModel.getModelData(world, pos, state, tileData);
return originalModel.getModelData(level, pos, state, modelData);
}
}
@@ -72,12 +72,12 @@ public class CompositeModel implements IDynamicBakedModel
@Nonnull
@Override
public IModelData getModelData(@Nonnull BlockAndTintGetter world, @Nonnull BlockPos pos, @Nonnull BlockState state, @Nonnull IModelData tileData)
public IModelData getModelData(@Nonnull BlockAndTintGetter level, @Nonnull BlockPos pos, @Nonnull BlockState state, @Nonnull IModelData modelData)
{
CompositeModelData composite = new CompositeModelData();
for(Map.Entry<String, BakedModel> entry : bakedParts.entrySet())
{
composite.putSubmodelData(entry.getKey(), entry.getValue().getModelData(world, pos, state, ModelDataWrapper.wrap(tileData)));
composite.putSubmodelData(entry.getKey(), entry.getValue().getModelData(level, pos, state, ModelDataWrapper.wrap(modelData)));
}
return composite;
}
@@ -237,9 +237,9 @@ public final class DynamicBucketModel implements IModelGeometry<DynamicBucketMod
}
@Override
public BakedModel resolve(BakedModel originalModel, ItemStack stack, @Nullable ClientLevel world, @Nullable LivingEntity entity, int seed)
public BakedModel resolve(BakedModel originalModel, ItemStack stack, @Nullable ClientLevel level, @Nullable LivingEntity entity, int seed)
{
BakedModel overriden = nested.resolve(originalModel, stack, world, entity, seed);
BakedModel overriden = nested.resolve(originalModel, stack, level, entity, seed);
if (overriden != originalModel) return overriden;
return FluidUtil.getFluidContained(stack)
.map(fluidStack -> {
@@ -37,13 +37,13 @@ public class ModelDataManager
private static final Map<ChunkPos, Map<BlockPos, IModelData>> modelDataCache = new ConcurrentHashMap<>();
private static void cleanCaches(Level world)
private static void cleanCaches(Level level)
{
Preconditions.checkNotNull(world, "World must not be null");
Preconditions.checkArgument(world == Minecraft.getInstance().level, "Cannot use model data for a world other than the current client world");
if (world != currentLevel.get())
Preconditions.checkNotNull(level, "Level must not be null");
Preconditions.checkArgument(level == Minecraft.getInstance().level, "Cannot use model data for a level other than the current client level");
if (level != currentLevel.get())
{
currentLevel = new WeakReference<>(world);
currentLevel = new WeakReference<>(level);
needModelDataRefresh.clear();
modelDataCache.clear();
}
@@ -52,16 +52,16 @@ public class ModelDataManager
public static void requestModelDataRefresh(BlockEntity te)
{
Preconditions.checkNotNull(te, "Tile entity must not be null");
Level world = te.getLevel();
Level level = te.getLevel();
cleanCaches(world);
cleanCaches(level);
needModelDataRefresh.computeIfAbsent(new ChunkPos(te.getBlockPos()), $ -> Collections.synchronizedSet(new HashSet<>()))
.add(te.getBlockPos());
}
private static void refreshModelData(Level world, ChunkPos chunk)
private static void refreshModelData(Level level, ChunkPos chunk)
{
cleanCaches(world);
cleanCaches(level);
Set<BlockPos> needUpdate = needModelDataRefresh.remove(chunk);
if (needUpdate != null)
@@ -69,7 +69,7 @@ public class ModelDataManager
Map<BlockPos, IModelData> data = modelDataCache.computeIfAbsent(chunk, $ -> new ConcurrentHashMap<>());
for (BlockPos pos : needUpdate)
{
BlockEntity toUpdate = world.getBlockEntity(pos);
BlockEntity toUpdate = level.getBlockEntity(pos);
if (toUpdate != null && !toUpdate.isRemoved())
{
data.put(pos, toUpdate.getModelData());
@@ -92,15 +92,15 @@ public class ModelDataManager
modelDataCache.remove(chunk);
}
public static @Nullable IModelData getModelData(Level world, BlockPos pos)
public static @Nullable IModelData getModelData(Level level, BlockPos pos)
{
return getModelData(world, new ChunkPos(pos)).get(pos);
return getModelData(level, new ChunkPos(pos)).get(pos);
}
public static Map<BlockPos, IModelData> getModelData(Level world, ChunkPos pos)
public static Map<BlockPos, IModelData> getModelData(Level level, ChunkPos pos)
{
Preconditions.checkArgument(world.isClientSide, "Cannot request model data for server world");
refreshModelData(world, pos);
Preconditions.checkArgument(level.isClientSide, "Cannot request model data for server level");
refreshModelData(level, pos);
return modelDataCache.getOrDefault(pos, Collections.emptyMap());
}
}
@@ -156,9 +156,9 @@ public class PerspectiveMapWrapper implements IDynamicBakedModel
@Nullable
@Override
public BakedModel resolve(BakedModel model, ItemStack stack, @Nullable ClientLevel worldIn, @Nullable LivingEntity entityIn, int seed)
public BakedModel resolve(BakedModel model, ItemStack stack, @Nullable ClientLevel level, @Nullable LivingEntity entity, int seed)
{
model = parent.getOverrides().resolve(parent, stack, worldIn, entityIn, seed);
model = parent.getOverrides().resolve(parent, stack, level, entity, seed);
return new PerspectiveMapWrapper(model, transforms);
}
@@ -21,7 +21,7 @@ public class MultipartModelData implements IModelData
{
public static final ModelProperty<MultipartModelData> MULTIPART_DATA = new ModelProperty<>();
public static IModelData create(List<Pair<Predicate<BlockState>, BakedModel>> selectors, BlockAndTintGetter world, BlockPos pos, BlockState state, IModelData tileData)
public static IModelData create(List<Pair<Predicate<BlockState>, BakedModel>> selectors, BlockAndTintGetter level, BlockPos pos, BlockState state, IModelData tileData)
{
MultipartModelData multipartData = new MultipartModelData(tileData);
for (Pair<Predicate<BlockState>, BakedModel> selector : selectors)
@@ -29,7 +29,7 @@ public class MultipartModelData implements IModelData
if (selector.getLeft().test(state))
{
BakedModel part = selector.getRight();
IModelData partData = part.getModelData(world, pos, state, tileData);
IModelData partData = part.getModelData(level, pos, state, tileData);
multipartData.setPartData(part, partData);
}
}
@@ -186,7 +186,7 @@ public class ModelBuilder<T extends ModelBuilder<T>> extends ModelFile {
/**
* Use a custom loader instead of the vanilla elements.
* @param customLoaderFactory
* @param customLoaderFactory function that returns the custom loader to set, given this and the {@link #existingFileHelper}
* @return the custom loader builder
*/
public <L extends CustomLoaderBuilder<T>> L customLoader(BiFunction<T, ExistingFileHelper, L> customLoaderFactory)
@@ -37,7 +37,7 @@ public class ForgeBlockModelRenderer extends ModelBlockRenderer
}
@Override
public boolean tesselateWithoutAO(BlockAndTintGetter world, BakedModel model, BlockState state, BlockPos pos, PoseStack matrixStack, VertexConsumer buffer, boolean checkSides, Random rand, long seed, int combinedOverlayIn, IModelData modelData)
public boolean tesselateWithoutAO(BlockAndTintGetter level, BakedModel model, BlockState state, BlockPos pos, PoseStack poseStack, VertexConsumer buffer, boolean checkSides, Random rand, long seed, int packedOverlay, IModelData modelData)
{
if(ForgeConfig.CLIENT.experimentalForgeLightPipelineEnabled.get())
{
@@ -46,18 +46,18 @@ public class ForgeBlockModelRenderer extends ModelBlockRenderer
VertexLighterFlat lighter = lighterFlat.get();
lighter.setParent(consumer);
lighter.setTransform(matrixStack.last());
lighter.setTransform(poseStack.last());
return render(lighter, world, model, state, pos, matrixStack, checkSides, rand, seed, modelData);
return render(lighter, level, model, state, pos, poseStack, checkSides, rand, seed, modelData);
}
else
{
return super.tesselateWithoutAO(world, model, state, pos, matrixStack, buffer, checkSides, rand, seed, combinedOverlayIn, modelData);
return super.tesselateWithoutAO(level, model, state, pos, poseStack, buffer, checkSides, rand, seed, packedOverlay, modelData);
}
}
@Override
public boolean tesselateWithAO(BlockAndTintGetter world, BakedModel model, BlockState state, BlockPos pos, PoseStack matrixStack, VertexConsumer buffer, boolean checkSides, Random rand, long seed, int combinedOverlayIn, IModelData modelData)
public boolean tesselateWithAO(BlockAndTintGetter level, BakedModel model, BlockState state, BlockPos pos, PoseStack poseStack, VertexConsumer buffer, boolean checkSides, Random rand, long seed, int packedOverlay, IModelData modelData)
{
if(ForgeConfig.CLIENT.experimentalForgeLightPipelineEnabled.get())
{
@@ -66,19 +66,19 @@ public class ForgeBlockModelRenderer extends ModelBlockRenderer
VertexLighterSmoothAo lighter = lighterSmooth.get();
lighter.setParent(consumer);
lighter.setTransform(matrixStack.last());
lighter.setTransform(poseStack.last());
return render(lighter, world, model, state, pos, matrixStack, checkSides, rand, seed, modelData);
return render(lighter, level, model, state, pos, poseStack, checkSides, rand, seed, modelData);
}
else
{
return super.tesselateWithAO(world, model, state, pos, matrixStack, buffer, checkSides, rand, seed, combinedOverlayIn, modelData);
return super.tesselateWithAO(level, model, state, pos, poseStack, buffer, checkSides, rand, seed, packedOverlay, modelData);
}
}
public static boolean render(VertexLighterFlat lighter, BlockAndTintGetter world, BakedModel model, BlockState state, BlockPos pos, PoseStack matrixStack, boolean checkSides, Random rand, long seed, IModelData modelData)
public static boolean render(VertexLighterFlat lighter, BlockAndTintGetter level, BakedModel model, BlockState state, BlockPos pos, PoseStack poseStack, boolean checkSides, Random rand, long seed, IModelData modelData)
{
lighter.setWorld(world);
lighter.setWorld(level);
lighter.setState(state);
lighter.setBlockPos(pos);
boolean empty = true;
@@ -99,7 +99,7 @@ public class ForgeBlockModelRenderer extends ModelBlockRenderer
quads = model.getQuads(state, side, rand, modelData);
if(!quads.isEmpty())
{
if(!checkSides || Block.shouldRenderFace(state, world, pos, side, pos.relative(side)))
if(!checkSides || Block.shouldRenderFace(state, level, pos, side, pos.relative(side)))
{
if(empty) lighter.updateBlockInfo();
empty = false;
@@ -295,9 +295,9 @@ public class VertexLighterFlat extends QuadGatheringTransformer
this.diffuse = diffuse;
}
public void setWorld(BlockAndTintGetter world)
public void setWorld(BlockAndTintGetter level)
{
blockInfo.setLevel(world);
blockInfo.setLevel(level);
}
public void setState(BlockState state)