Skip to content

Commit b10fcfb

Browse files
PepperCode1PepperCode1
committed
Port to 1.21.6
1 parent 4050d7e commit b10fcfb

File tree

12 files changed

+68
-93
lines changed

12 files changed

+68
-93
lines changed

‎gradle.properties‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,16 @@ org.gradle.parallel = true
44

55
# Fabric Properties
66
loom_version = 1.12.7
7-
minecraft_version = 1.21.5
8-
yarn_mappings = 1.21.5+build.1
7+
minecraft_version = 1.21.6
8+
yarn_mappings = 1.21.6+build.1
99
loader_version = 0.17.3
1010

1111
# Mod Properties
1212
mod_version = 3.0.1
13-
mod_minecraft_version = 1.21.5
13+
mod_minecraft_version = 1.21.6
1414
maven_group = me.pepperbell
1515
archives_base_name = continuity
1616

1717
# Dependencies
18-
fabric_version = 0.120.0+1.21.5
19-
modmenu_version = 14.0.0-rc.2
18+
fabric_version = 0.128.2+1.21.6
19+
modmenu_version = 15.0.0

‎src/main/java/me/pepperbell/continuity/client/mixin/RenderLayersMixin.java‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,18 @@
77

88
import me.pepperbell.continuity.client.config.ContinuityConfig;
99
import me.pepperbell.continuity.client.resource.CustomBlockLayers;
10+
import net.fabricmc.fabric.api.renderer.v1.render.RenderLayerHelper;
1011
import net.minecraft.block.BlockState;
12+
import net.minecraft.client.render.BlockRenderLayer;
1113
import net.minecraft.client.render.RenderLayer;
1214
import net.minecraft.client.render.RenderLayers;
1315

1416
@Mixin(RenderLayers.class)
1517
abstract class RenderLayersMixin {
16-
@Inject(method = "getBlockLayer(Lnet/minecraft/block/BlockState;)Lnet/minecraft/client/render/RenderLayer;", at = @At("HEAD"), cancellable = true)
17-
private static void continuity$onHeadGetBlockLayer(BlockState state, CallbackInfoReturnable<RenderLayer> cir) {
18+
@Inject(method = "getBlockLayer(Lnet/minecraft/block/BlockState;)Lnet/minecraft/client/render/BlockRenderLayer;", at = @At("HEAD"), cancellable = true)
19+
private static void continuity$onHeadGetBlockLayer(BlockState state, CallbackInfoReturnable<BlockRenderLayer> cir) {
1820
if (!CustomBlockLayers.isEmpty() && ContinuityConfig.INSTANCE.customBlockLayers.get()) {
19-
RenderLayer layer = CustomBlockLayers.getLayer(state);
21+
BlockRenderLayer layer = CustomBlockLayers.getLayer(state);
2022
if (layer != null) {
2123
cir.setReturnValue(layer);
2224
}
@@ -26,9 +28,9 @@ abstract class RenderLayersMixin {
2628
@Inject(method = "getMovingBlockLayer(Lnet/minecraft/block/BlockState;)Lnet/minecraft/client/render/RenderLayer;", at = @At("HEAD"), cancellable = true)
2729
private static void continuity$onHeadGetMovingBlockLayer(BlockState state, CallbackInfoReturnable<RenderLayer> cir) {
2830
if (!CustomBlockLayers.isEmpty() && ContinuityConfig.INSTANCE.customBlockLayers.get()) {
29-
RenderLayer layer = CustomBlockLayers.getLayer(state);
31+
BlockRenderLayer layer = CustomBlockLayers.getLayer(state);
3032
if (layer != null) {
31-
cir.setReturnValue(layer == RenderLayer.getTranslucent() ? RenderLayer.getTranslucentMovingBlock() : layer);
33+
cir.setReturnValue(RenderLayerHelper.getMovingBlockLayer(layer));
3234
}
3335
}
3436
}

‎src/main/java/me/pepperbell/continuity/client/model/EmissiveBlockStateModel.java‎

Lines changed: 8 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,13 @@
99
import me.pepperbell.continuity.client.util.QuadUtil;
1010
import me.pepperbell.continuity.client.util.RenderUtil;
1111
import net.fabricmc.fabric.api.client.model.loading.v1.wrapper.WrapperBlockStateModel;
12-
import net.fabricmc.fabric.api.renderer.v1.material.BlendMode;
13-
import net.fabricmc.fabric.api.renderer.v1.material.MaterialFinder;
14-
import net.fabricmc.fabric.api.renderer.v1.material.RenderMaterial;
1512
import net.fabricmc.fabric.api.renderer.v1.mesh.MutableMesh;
1613
import net.fabricmc.fabric.api.renderer.v1.mesh.MutableQuadView;
1714
import net.fabricmc.fabric.api.renderer.v1.mesh.QuadEmitter;
1815
import net.fabricmc.fabric.api.renderer.v1.mesh.QuadTransform;
1916
import net.fabricmc.fabric.api.util.TriState;
2017
import net.minecraft.block.BlockState;
21-
import net.minecraft.client.render.RenderLayer;
18+
import net.minecraft.client.render.BlockRenderLayer;
2219
import net.minecraft.client.render.RenderLayers;
2320
import net.minecraft.client.render.model.BlockStateModel;
2421
import net.minecraft.client.texture.Sprite;
@@ -28,22 +25,6 @@
2825
import net.minecraft.world.BlockRenderView;
2926

3027
public class EmissiveBlockStateModel extends WrapperBlockStateModel {
31-
protected static final RenderMaterial[] EMISSIVE_MATERIALS;
32-
protected static final RenderMaterial DEFAULT_EMISSIVE_MATERIAL;
33-
protected static final RenderMaterial CUTOUT_MIPPED_EMISSIVE_MATERIAL;
34-
35-
static {
36-
BlendMode[] blendModes = BlendMode.values();
37-
EMISSIVE_MATERIALS = new RenderMaterial[blendModes.length];
38-
MaterialFinder finder = RenderUtil.getMaterialFinder();
39-
for (BlendMode blendMode : blendModes) {
40-
EMISSIVE_MATERIALS[blendMode.ordinal()] = finder.emissive(true).disableDiffuse(true).ambientOcclusion(TriState.FALSE).blendMode(blendMode).find();
41-
}
42-
43-
DEFAULT_EMISSIVE_MATERIAL = EMISSIVE_MATERIALS[BlendMode.DEFAULT.ordinal()];
44-
CUTOUT_MIPPED_EMISSIVE_MATERIAL = EMISSIVE_MATERIALS[BlendMode.CUTOUT_MIPPED.ordinal()];
45-
}
46-
4728
public EmissiveBlockStateModel(BlockStateModel wrapped) {
4829
super(wrapped);
4930
}
@@ -126,27 +107,22 @@ public boolean transform(MutableQuadView quad) {
126107
Sprite emissiveSprite = EmissiveSpriteApi.get().getEmissiveSprite(sprite);
127108
if (emissiveSprite != null) {
128109
emitter.copyFrom(quad);
110+
emitter.emissive(true).diffuseShade(false).ambientOcclusion(TriState.FALSE);
129111

130-
BlendMode blendMode = quad.material().blendMode();
131-
RenderMaterial emissiveMaterial;
132-
if (blendMode == BlendMode.DEFAULT) {
112+
BlockRenderLayer renderLayer = quad.renderLayer();
113+
if (renderLayer == null) {
133114
if (calculateDefaultLayer) {
134-
isDefaultLayerSolid = RenderLayers.getBlockLayer(state) == RenderLayer.getSolid();
115+
isDefaultLayerSolid = RenderLayers.getBlockLayer(state) == BlockRenderLayer.SOLID;
135116
calculateDefaultLayer = false;
136117
}
137118

138119
if (isDefaultLayerSolid) {
139-
emissiveMaterial = CUTOUT_MIPPED_EMISSIVE_MATERIAL;
140-
} else {
141-
emissiveMaterial = DEFAULT_EMISSIVE_MATERIAL;
120+
emitter.renderLayer(BlockRenderLayer.CUTOUT_MIPPED);
142121
}
143-
} else if (blendMode == BlendMode.SOLID) {
144-
emissiveMaterial = CUTOUT_MIPPED_EMISSIVE_MATERIAL;
145-
} else {
146-
emissiveMaterial = EMISSIVE_MATERIALS[blendMode.ordinal()];
122+
} else if (renderLayer == BlockRenderLayer.SOLID) {
123+
emitter.renderLayer(BlockRenderLayer.CUTOUT_MIPPED);
147124
}
148125

149-
emitter.material(emissiveMaterial);
150126
QuadUtil.interpolate(emitter, sprite, emissiveSprite);
151127
emitter.emit();
152128
}

‎src/main/java/me/pepperbell/continuity/client/processor/overlay/SimpleOverlayQuadProcessor.java‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@
1111
import me.pepperbell.continuity.client.util.QuadUtil;
1212
import me.pepperbell.continuity.client.util.RenderUtil;
1313
import me.pepperbell.continuity.client.util.TextureUtil;
14-
import net.fabricmc.fabric.api.renderer.v1.material.BlendMode;
15-
import net.fabricmc.fabric.api.renderer.v1.material.RenderMaterial;
1614
import net.fabricmc.fabric.api.renderer.v1.mesh.MutableQuadView;
15+
import net.fabricmc.fabric.api.util.TriState;
1716
import net.minecraft.block.BlockState;
17+
import net.minecraft.client.render.BlockRenderLayer;
1818
import net.minecraft.client.texture.Sprite;
1919
import net.minecraft.util.math.BlockPos;
2020
import net.minecraft.util.math.random.Random;
@@ -24,21 +24,23 @@ public class SimpleOverlayQuadProcessor extends SimpleQuadProcessor {
2424
protected int tintIndex;
2525
@Nullable
2626
protected BlockState tintBlock;
27-
protected RenderMaterial material;
27+
protected BlockRenderLayer layer;
28+
protected TriState ao;
2829

29-
public SimpleOverlayQuadProcessor(SpriteProvider spriteProvider, ProcessingPredicate processingPredicate, int tintIndex, @Nullable BlockState tintBlock, BlendMode layer) {
30+
public SimpleOverlayQuadProcessor(SpriteProvider spriteProvider, ProcessingPredicate processingPredicate, int tintIndex, @Nullable BlockState tintBlock, BlockRenderLayer layer) {
3031
super(spriteProvider, processingPredicate);
3132
this.tintIndex = tintIndex;
3233
this.tintBlock = tintBlock;
33-
material = RenderUtil.findOverlayMaterial(layer, this.tintBlock);
34+
this.layer = layer;
35+
this.ao = RenderUtil.aoFromTintBlock(tintBlock);
3436
}
3537

3638
@Override
3739
public ProcessingResult processQuad(MutableQuadView quad, Sprite sprite, BlockRenderView blockView, BlockPos pos, BlockState appearanceState, BlockState state, Random random, int pass, ProcessingContext context) {
3840
if (processingPredicate.shouldProcessQuad(quad, sprite, blockView, pos, appearanceState, state, context)) {
3941
Sprite newSprite = spriteProvider.getSprite(quad, sprite, blockView, pos, appearanceState, state, random, context);
4042
if (newSprite != null && !TextureUtil.isMissingSprite(newSprite)) {
41-
QuadUtil.emitOverlayQuad(context.getExtraQuadEmitter(), quad.lightFace(), newSprite, RenderUtil.getTintColor(tintBlock, blockView, pos, tintIndex), material);
43+
QuadUtil.emitOverlayQuad(context.getExtraQuadEmitter(), quad.lightFace(), newSprite, RenderUtil.getTintColor(tintBlock, blockView, pos, tintIndex), layer, ao);
4244
}
4345
}
4446
return ProcessingResult.NEXT_PROCESSOR;

‎src/main/java/me/pepperbell/continuity/client/processor/overlay/StandardOverlayQuadProcessor.java‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@
1919
import me.pepperbell.continuity.client.util.RenderUtil;
2020
import me.pepperbell.continuity.client.util.SpriteCalculator;
2121
import me.pepperbell.continuity.client.util.TextureUtil;
22-
import net.fabricmc.fabric.api.renderer.v1.material.BlendMode;
23-
import net.fabricmc.fabric.api.renderer.v1.material.RenderMaterial;
2422
import net.fabricmc.fabric.api.renderer.v1.mesh.MutableQuadView;
2523
import net.fabricmc.fabric.api.renderer.v1.mesh.QuadEmitter;
24+
import net.fabricmc.fabric.api.util.TriState;
2625
import net.minecraft.block.BlockState;
26+
import net.minecraft.client.render.BlockRenderLayer;
2727
import net.minecraft.client.texture.Sprite;
2828
import net.minecraft.util.Identifier;
2929
import net.minecraft.util.math.BlockPos;
@@ -45,9 +45,10 @@ public class StandardOverlayQuadProcessor extends AbstractQuadProcessor {
4545
protected int tintIndex;
4646
@Nullable
4747
protected BlockState tintBlock;
48-
protected RenderMaterial material;
48+
protected BlockRenderLayer layer;
49+
protected TriState ao;
4950

50-
public StandardOverlayQuadProcessor(Sprite[] sprites, ProcessingPredicate processingPredicate, @Nullable Set<Identifier> matchTilesSet, @Nullable Predicate<BlockState> matchBlocksPredicate, @Nullable Set<Identifier> connectTilesSet, @Nullable Predicate<BlockState> connectBlocksPredicate, ConnectionPredicate connectionPredicate, int tintIndex, @Nullable BlockState tintBlock, BlendMode layer) {
51+
public StandardOverlayQuadProcessor(Sprite[] sprites, ProcessingPredicate processingPredicate, @Nullable Set<Identifier> matchTilesSet, @Nullable Predicate<BlockState> matchBlocksPredicate, @Nullable Set<Identifier> connectTilesSet, @Nullable Predicate<BlockState> connectBlocksPredicate, ConnectionPredicate connectionPredicate, int tintIndex, @Nullable BlockState tintBlock, BlockRenderLayer layer) {
5152
super(sprites, processingPredicate);
5253
this.matchTilesSet = matchTilesSet;
5354
this.matchBlocksPredicate = matchBlocksPredicate;
@@ -57,7 +58,8 @@ public StandardOverlayQuadProcessor(Sprite[] sprites, ProcessingPredicate proces
5758

5859
this.tintIndex = tintIndex;
5960
this.tintBlock = tintBlock;
60-
material = RenderUtil.findOverlayMaterial(layer, this.tintBlock);
61+
this.layer = layer;
62+
this.ao = RenderUtil.aoFromTintBlock(tintBlock);
6163

6264
// Turn all missing sprites into null, since it is more efficient to check for a null sprite than a missing
6365
// sprite. There is no functional difference between missing and null sprites for this processor.
@@ -77,7 +79,7 @@ public ProcessingResult processQuadInner(MutableQuadView quad, Sprite sprite, Bl
7779
QuadEmitter emitter = context.getExtraQuadEmitter();
7880
int tintColor = RenderUtil.getTintColor(tintBlock, blockView, pos, tintIndex);
7981
for (int i = 0; i < collector.spriteAmount; i++) {
80-
QuadUtil.emitOverlayQuad(emitter, lightFace, collector.sprites[i], tintColor, material);
82+
QuadUtil.emitOverlayQuad(emitter, lightFace, collector.sprites[i], tintColor, layer, ao);
8183
}
8284
collector.clear();
8385
}

‎src/main/java/me/pepperbell/continuity/client/properties/overlay/OverlayPropertiesSection.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
import org.jetbrains.annotations.Nullable;
77

88
import me.pepperbell.continuity.client.ContinuityClient;
9-
import net.fabricmc.fabric.api.renderer.v1.material.BlendMode;
109
import net.minecraft.block.Block;
1110
import net.minecraft.block.BlockState;
11+
import net.minecraft.client.render.BlockRenderLayer;
1212
import net.minecraft.registry.Registries;
1313
import net.minecraft.util.Identifier;
1414
import net.minecraft.util.InvalidIdentifierException;
@@ -21,7 +21,7 @@ public class OverlayPropertiesSection {
2121
protected int tintIndex = -1;
2222
@Nullable
2323
protected BlockState tintBlock;
24-
protected BlendMode layer = BlendMode.CUTOUT_MIPPED;
24+
protected BlockRenderLayer layer = BlockRenderLayer.CUTOUT_MIPPED;
2525

2626
public OverlayPropertiesSection(Properties properties, Identifier resourceId, String packId) {
2727
this.properties = properties;
@@ -92,9 +92,9 @@ protected void parseLayer() {
9292

9393
String layerStr1 = layerStr.trim().toLowerCase(Locale.ROOT);
9494
switch (layerStr1) {
95-
case "cutout_mipped" -> layer = BlendMode.CUTOUT_MIPPED;
96-
case "cutout" -> layer = BlendMode.CUTOUT;
97-
case "translucent" -> layer = BlendMode.TRANSLUCENT;
95+
case "cutout_mipped" -> layer = BlockRenderLayer.CUTOUT_MIPPED;
96+
case "cutout" -> layer = BlockRenderLayer.CUTOUT;
97+
case "translucent" -> layer = BlockRenderLayer.TRANSLUCENT;
9898
default -> ContinuityClient.LOGGER.warn("Unknown 'layer' value '" + layerStr + " in file '" + resourceId + "' in pack '" + packId + "'");
9999
}
100100
}
@@ -108,7 +108,7 @@ public BlockState getTintBlock() {
108108
return tintBlock;
109109
}
110110

111-
public BlendMode getLayer() {
111+
public BlockRenderLayer getLayer() {
112112
return layer;
113113
}
114114

‎src/main/java/me/pepperbell/continuity/client/resource/CustomBlockLayers.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
import net.fabricmc.fabric.api.resource.ResourceManagerHelper;
1515
import net.fabricmc.fabric.api.resource.SimpleSynchronousResourceReloadListener;
1616
import net.minecraft.block.BlockState;
17-
import net.minecraft.client.render.RenderLayer;
17+
import net.minecraft.client.render.BlockRenderLayer;
1818
import net.minecraft.resource.Resource;
1919
import net.minecraft.resource.ResourceManager;
2020
import net.minecraft.resource.ResourceType;
@@ -38,7 +38,7 @@ public static boolean isEmpty() {
3838
}
3939

4040
@Nullable
41-
public static RenderLayer getLayer(BlockState state) {
41+
public static BlockRenderLayer getLayer(BlockState state) {
4242
if (!disableSolidCheck) {
4343
if (state.isOpaqueFullCube()) {
4444
return null;
@@ -110,22 +110,22 @@ public Identifier getFabricId() {
110110
}
111111

112112
private enum BlockLayer {
113-
SOLID(RenderLayer.getSolid()),
114-
CUTOUT(RenderLayer.getCutout()),
115-
CUTOUT_MIPPED(RenderLayer.getCutoutMipped()),
116-
TRANSLUCENT(RenderLayer.getTranslucent());
113+
SOLID(BlockRenderLayer.SOLID),
114+
CUTOUT(BlockRenderLayer.CUTOUT),
115+
CUTOUT_MIPPED(BlockRenderLayer.CUTOUT_MIPPED),
116+
TRANSLUCENT(BlockRenderLayer.TRANSLUCENT);
117117

118118
public static final BlockLayer[] VALUES = values();
119119

120-
private final RenderLayer layer;
120+
private final BlockRenderLayer layer;
121121
private final String key;
122122

123-
BlockLayer(RenderLayer layer) {
123+
BlockLayer(BlockRenderLayer layer) {
124124
this.layer = layer;
125125
key = name().toLowerCase(Locale.ROOT);
126126
}
127127

128-
public RenderLayer getLayer() {
128+
public BlockRenderLayer getLayer() {
129129
return layer;
130130
}
131131

‎src/main/java/me/pepperbell/continuity/client/util/QuadUtil.java‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
11
package me.pepperbell.continuity.client.util;
22

3-
import net.fabricmc.fabric.api.renderer.v1.material.RenderMaterial;
3+
import org.jetbrains.annotations.Nullable;
4+
45
import net.fabricmc.fabric.api.renderer.v1.mesh.MutableQuadView;
56
import net.fabricmc.fabric.api.renderer.v1.mesh.QuadEmitter;
67
import net.fabricmc.fabric.api.renderer.v1.mesh.QuadView;
8+
import net.fabricmc.fabric.api.util.TriState;
9+
import net.minecraft.client.render.BlockRenderLayer;
710
import net.minecraft.client.texture.Sprite;
811
import net.minecraft.util.math.Direction;
912
import net.minecraft.util.math.MathHelper;
@@ -38,11 +41,12 @@ public static void assignLerpedUvs(MutableQuadView quad, Sprite sprite) {
3841
quad.uv(3, lerpedMaxU, lerpedMinV);
3942
}
4043

41-
public static void emitOverlayQuad(QuadEmitter emitter, Direction face, Sprite sprite, int color, RenderMaterial material) {
44+
public static void emitOverlayQuad(QuadEmitter emitter, Direction face, Sprite sprite, int color, @Nullable BlockRenderLayer renderLayer, TriState ao) {
4245
emitter.square(face, 0, 0, 1, 1, 0);
4346
emitter.color(color, color, color, color);
4447
assignLerpedUvs(emitter, sprite);
45-
emitter.material(material);
48+
emitter.renderLayer(renderLayer);
49+
emitter.ambientOcclusion(ao);
4650
emitter.emit();
4751
}
4852

‎src/main/java/me/pepperbell/continuity/client/util/RenderUtil.java‎

Lines changed: 4 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,6 @@
66
import org.jetbrains.annotations.Nullable;
77

88
import me.pepperbell.continuity.client.ContinuityClient;
9-
import net.fabricmc.fabric.api.renderer.v1.Renderer;
10-
import net.fabricmc.fabric.api.renderer.v1.material.BlendMode;
11-
import net.fabricmc.fabric.api.renderer.v1.material.MaterialFinder;
12-
import net.fabricmc.fabric.api.renderer.v1.material.RenderMaterial;
139
import net.fabricmc.fabric.api.renderer.v1.model.SpriteFinder;
1410
import net.fabricmc.fabric.api.resource.ResourceManagerHelper;
1511
import net.fabricmc.fabric.api.resource.ResourceReloadListenerKeys;
@@ -30,8 +26,6 @@ public final class RenderUtil {
3026
private static final BlockColors BLOCK_COLORS = MinecraftClient.getInstance().getBlockColors();
3127
private static final BakedModelManager MODEL_MANAGER = MinecraftClient.getInstance().getBakedModelManager();
3228

33-
private static final ThreadLocal<MaterialFinder> MATERIAL_FINDER = ThreadLocal.withInitial(() -> Renderer.get().materialFinder());
34-
3529
private static SpriteFinder blockAtlasSpriteFinder;
3630

3731
public static int getTintColor(@Nullable BlockState state, BlockRenderView blockView, BlockPos pos, int tintIndex) {
@@ -41,25 +35,18 @@ public static int getTintColor(@Nullable BlockState state, BlockRenderView block
4135
return 0xFF000000 | BLOCK_COLORS.getColor(state, blockView, pos, tintIndex);
4236
}
4337

44-
public static RenderMaterial findOverlayMaterial(BlendMode blendMode, @Nullable BlockState tintBlock) {
45-
MaterialFinder finder = getMaterialFinder();
46-
finder.blendMode(blendMode);
38+
public static TriState aoFromTintBlock(@Nullable BlockState tintBlock) {
4739
if (tintBlock != null) {
48-
finder.ambientOcclusion(TriState.of(canHaveAO(tintBlock)));
40+
return TriState.of(canHaveAO(tintBlock));
4941
} else {
50-
finder.ambientOcclusion(TriState.TRUE);
42+
return TriState.TRUE;
5143
}
52-
return finder.find();
5344
}
5445

5546
public static boolean canHaveAO(BlockState state) {
5647
return state.getLuminance() == 0;
5748
}
5849

59-
public static MaterialFinder getMaterialFinder() {
60-
return MATERIAL_FINDER.get().clear();
61-
}
62-
6350
public static SpriteFinder getSpriteFinder() {
6451
return blockAtlasSpriteFinder;
6552
}
@@ -75,7 +62,7 @@ public static void init() {
7562

7663
@Override
7764
public void reload(ResourceManager manager) {
78-
blockAtlasSpriteFinder = SpriteFinder.get(MODEL_MANAGER.getAtlas(SpriteAtlasTexture.BLOCK_ATLAS_TEXTURE));
65+
blockAtlasSpriteFinder = MODEL_MANAGER.getAtlas(SpriteAtlasTexture.BLOCK_ATLAS_TEXTURE).spriteFinder();
7966
}
8067

8168
@Override

0 commit comments

Comments
 (0)