Skip to content

Commit cb9b4a8

Browse files
committed
Your irregularly scheduled maintenance
- Use InvalidateRenderStateCallback instead of BlockModelsMixin to clear SpriteCalculator cache - Do not pass unnecessary parameters to EmissiveBlockQuadTransform - Add/remove some annotations - Update build dependencies - Bump version
1 parent c2b1d3c commit cb9b4a8

File tree

16 files changed

+23
-46
lines changed

16 files changed

+23
-46
lines changed

gradle.properties

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@ org.gradle.jvmargs = -Xmx1G
33
org.gradle.parallel = true
44

55
# Fabric Properties
6-
loom_version = 1.6.11
6+
loom_version = 1.10.5
77
minecraft_version = 1.20.1
88
yarn_mappings = 1.20.1+build.10
9-
loader_version = 0.15.10
9+
loader_version = 0.16.14
1010

1111
# Mod Properties
12-
mod_version = 3.0.0
12+
mod_version = 3.0.1
1313
mod_minecraft_version = 1.20.1
1414
maven_group = me.pepperbell
1515
archives_base_name = continuity

gradle/wrapper/gradle-wrapper.jar

252 Bytes
Binary file not shown.

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

gradlew

Lines changed: 5 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gradlew.bat

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/main/java/me/pepperbell/continuity/client/ContinuityClient.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@
4040
import me.pepperbell.continuity.client.resource.ModelWrappingHandler;
4141
import me.pepperbell.continuity.client.util.RenderUtil;
4242
import me.pepperbell.continuity.client.util.biome.BiomeHolderManager;
43-
import me.pepperbell.continuity.client.util.biome.BiomeRetriever;
4443
import me.pepperbell.continuity.impl.client.ProcessingDataKeyRegistryImpl;
4544
import net.fabricmc.api.ClientModInitializer;
4645
import net.fabricmc.fabric.api.resource.ResourceManagerHelper;
@@ -58,7 +57,6 @@ public class ContinuityClient implements ClientModInitializer {
5857
public void onInitializeClient() {
5958
ProcessingDataKeyRegistryImpl.INSTANCE.init();
6059
BiomeHolderManager.init();
61-
BiomeRetriever.init();
6260
ProcessingDataKeys.init();
6361
ModelWrappingHandler.init();
6462
RenderUtil.ReloadListener.init();

src/main/java/me/pepperbell/continuity/client/mixin/BlockModelsMixin.java

Lines changed: 0 additions & 17 deletions
This file was deleted.

src/main/java/me/pepperbell/continuity/client/model/EmissiveBakedModel.java

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ public void emitBlockQuads(BlockRenderView blockView, BlockState state, BlockPos
6666
}
6767

6868
MeshBuilder meshBuilder = container.meshBuilder;
69-
quadTransform.prepare(meshBuilder.getEmitter(), blockView, state, pos, context, ContinuityConfig.INSTANCE.useManualCulling.get());
69+
quadTransform.prepare(meshBuilder.getEmitter(), state, context, ContinuityConfig.INSTANCE.useManualCulling.get());
7070

7171
context.pushTransform(quadTransform);
7272
super.emitBlockQuads(blockView, state, pos, randomSupplier, context);
@@ -120,9 +120,7 @@ public boolean isVanillaAdapter() {
120120

121121
protected static class EmissiveBlockQuadTransform implements RenderContext.QuadTransform {
122122
protected QuadEmitter emitter;
123-
protected BlockRenderView blockView;
124123
protected BlockState state;
125-
protected BlockPos pos;
126124
protected RenderContext renderContext;
127125
protected boolean useManualCulling;
128126

@@ -177,11 +175,9 @@ public boolean didEmit() {
177175
return didEmit;
178176
}
179177

180-
public void prepare(QuadEmitter emitter, BlockRenderView blockView, BlockState state, BlockPos pos, RenderContext renderContext, boolean useManualCulling) {
178+
public void prepare(QuadEmitter emitter, BlockState state, RenderContext renderContext, boolean useManualCulling) {
181179
this.emitter = emitter;
182-
this.blockView = blockView;
183180
this.state = state;
184-
this.pos = pos;
185181
this.renderContext = renderContext;
186182
this.useManualCulling = useManualCulling;
187183

@@ -193,9 +189,7 @@ public void prepare(QuadEmitter emitter, BlockRenderView blockView, BlockState s
193189

194190
public void reset() {
195191
emitter = null;
196-
blockView = null;
197192
state = null;
198-
pos = null;
199193
renderContext = null;
200194
useManualCulling = false;
201195

src/main/java/me/pepperbell/continuity/client/model/QuadProcessors.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
import java.util.concurrent.locks.StampedLock;
55
import java.util.function.Function;
66

7-
import org.jetbrains.annotations.ApiStatus;
8-
97
import it.unimi.dsi.fastutil.Hash;
108
import it.unimi.dsi.fastutil.objects.ObjectArrayList;
119
import it.unimi.dsi.fastutil.objects.Reference2ReferenceOpenHashMap;
@@ -48,7 +46,6 @@ private static Slice computeSlice(BlockState state, Sprite sprite) {
4846
return new Slice(processors, multipassProcessors);
4947
}
5048

51-
@ApiStatus.Internal
5249
public static void reload(List<QuadProcessors.ProcessorHolder> processorHolders) {
5350
QuadProcessors.processorHolders = processorHolders.toArray(ProcessorHolder[]::new);
5451
CACHE.clear();

src/main/java/me/pepperbell/continuity/client/properties/BaseCtmProperties.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -635,20 +635,19 @@ protected void resolveTiles() {
635635
} else if (tile.equals(SPECIAL_DEFAULT_ID)) {
636636
spriteId = SPECIAL_DEFAULT_SPRITE_ID;
637637
} else {
638-
String namespace = tile.getNamespace();
639638
String path = tile.getPath();
640639
if (path.startsWith("textures/")) {
641640
path = path.substring(9);
642641
if (path.endsWith(".png")) {
643642
path = path.substring(0, path.length() - 4);
644643
}
645644

646-
spriteId = TextureUtil.toSpriteId(new Identifier(namespace, path));
645+
spriteId = TextureUtil.toSpriteId(tile.withPath(path));
647646
textureDependencies.add(spriteId);
648647
} else if (redirectHandler != null) {
649648
path = redirectHandler.getSourceSpritePath(path);
650649

651-
spriteId = TextureUtil.toSpriteId(new Identifier(namespace, path));
650+
spriteId = TextureUtil.toSpriteId(tile.withPath(path));
652651
textureDependencies.add(spriteId);
653652
} else {
654653
spriteId = TextureUtil.MISSING_SPRITE_ID;

0 commit comments

Comments
 (0)