From c98b3e59574631510e15b21e288a43a27cedc2b8 Mon Sep 17 00:00:00 2001 From: PepperCode1 <44146161+PepperCode1@users.noreply.github.com> Date: Tue, 9 Aug 2022 17:06:51 -0700 Subject: [PATCH] More innerSeams, less confusion - Add `innerSeams` support to all applicable methods (`horizontal`, `vertical`, `h+v`, `v+h`, `top`) - Rewrite connection map calculation for some processors to be more efficient and compact - Change BlockState retrieval across all processors to be more efficient and make more sense - Change seeding method for `random` - Move check for one sprite from RandomSpriteProvider to Factory - Remove StandardOverlayQuadProcessor.BlockStateAndBoolean - Do not normalize normal vector if its length is zero in CompactCTMQuadProcessor - Move OptionalListCreator into CTMPropertiesLoader - Standardize locations of Override and Nullable annotations - Require Fabric API >=0.58.0 --- gradle.properties | 6 +- gradle/wrapper/gradle-wrapper.jar | Bin 59536 -> 60756 bytes gradle/wrapper/gradle-wrapper.properties | 2 +- gradlew | 16 ++-- gradlew.bat | 14 ++-- .../continuity/client/ContinuityClient.java | 11 ++- .../LifecycledResourceManagerImplMixin.java | 3 +- .../mixin/SpriteAtlasTextureDataMixin.java | 3 +- .../continuity/client/mixin/SpriteMixin.java | 3 +- .../client/model/EmissiveUnbakedModel.java | 2 +- .../client/model/WrappingUnbakedModel.java | 6 +- .../processor/CompactCTMQuadProcessor.java | 21 ++--- .../processor/ConnectingQuadProcessor.java | 4 +- .../client/processor/ConnectionPredicate.java | 18 +++- .../processor/HorizontalQuadProcessor.java | 20 ++--- .../HorizontalVerticalQuadProcessor.java | 47 ++++------- .../client/processor/ProcessingDataKeys.java | 1 - .../client/processor/TopQuadProcessor.java | 22 ++--- .../VerticalHorizontalQuadProcessor.java | 47 +++++------ .../processor/VerticalQuadProcessor.java | 20 ++--- .../overlay/StandardOverlayQuadProcessor.java | 78 +++++++----------- .../processor/simple/CTMSpriteProvider.java | 32 ++----- .../processor/simple/FixedSpriteProvider.java | 3 + .../simple/RandomSpriteProvider.java | 49 +++++------ .../simple/RepeatSpriteProvider.java | 3 + .../processor/simple/SpriteProvider.java | 3 + .../properties/ConnectingCTMProperties.java | 18 ++-- .../properties/PropertiesParsingHelper.java | 2 +- .../client/resource/CTMPropertiesLoader.java | 20 ++++- .../client/resource/ModelWrappingHandler.java | 9 +- .../continuity/client/util/MathUtil.java | 22 +++++ .../client/util/OptionalListCreator.java | 28 ------- .../continuity/client/util/QuadUtil.java | 4 +- .../client/util/RandomIndexProvider.java | 6 +- src/main/resources/fabric.mod.json | 2 +- 35 files changed, 263 insertions(+), 282 deletions(-) delete mode 100644 src/main/java/me/pepperbell/continuity/client/util/OptionalListCreator.java diff --git a/gradle.properties b/gradle.properties index 70092fcf..88bdbc0f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,8 +4,8 @@ org.gradle.jvmargs = -Xmx1G # Fabric Properties loom_version = 0.12-SNAPSHOT minecraft_version = 1.19 - yarn_mappings = 1.19+build.1 - loader_version = 0.14.6 + yarn_mappings = 1.19+build.4 + loader_version = 0.14.9 # Mod Properties mod_version = 2.0.1 @@ -14,4 +14,4 @@ org.gradle.jvmargs = -Xmx1G archives_base_name = continuity # Dependencies - fabric_version = 0.55.1+1.19 + fabric_version = 0.58.0+1.19 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 7454180f2ae8848c63b8b4dea2cb829da983f2fa..249e5832f090a2944b7473328c07c9755baa3196 100644 GIT binary patch delta 10158 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 delta 9041 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 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 2e6e5897..ae04661e 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index c53aefaa..a69d9cb6 100755 --- a/gradlew +++ b/gradlew @@ -1,7 +1,7 @@ #!/bin/sh # -# Copyright © 2015-2021 the original authors. +# Copyright © 2015-2021 the original authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -32,10 +32,10 @@ # Busybox and similar reduced shells will NOT work, because this script # requires all of these POSIX shell features: # * functions; -# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», -# «${var#prefix}», «${var%suffix}», and «$( cmd )»; -# * compound commands having a testable exit status, especially «case»; -# * various built-in commands including «command», «set», and «ulimit». +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». # # Important for patching: # @@ -205,6 +205,12 @@ set -- \ org.gradle.wrapper.GradleWrapperMain \ "$@" +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + # Use "xargs" to parse quoted args. # # With -n1 it outputs one arg per line, with the quotes and backslashes removed. diff --git a/gradlew.bat b/gradlew.bat index 107acd32..f127cfd4 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -14,7 +14,7 @@ @rem limitations under the License. @rem -@if "%DEBUG%" == "" @echo off +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -25,7 +25,7 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute +if %ERRORLEVEL% equ 0 goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -75,13 +75,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar :end @rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd +if %ERRORLEVEL% equ 0 goto mainEnd :fail rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% :mainEnd if "%OS%"=="Windows_NT" endlocal diff --git a/src/main/java/me/pepperbell/continuity/client/ContinuityClient.java b/src/main/java/me/pepperbell/continuity/client/ContinuityClient.java index 90232e93..b0103eca 100644 --- a/src/main/java/me/pepperbell/continuity/client/ContinuityClient.java +++ b/src/main/java/me/pepperbell/continuity/client/ContinuityClient.java @@ -22,7 +22,6 @@ import me.pepperbell.continuity.client.processor.simple.SimpleQuadProcessor; import me.pepperbell.continuity.client.properties.BaseCTMProperties; import me.pepperbell.continuity.client.properties.CompactConnectingCTMProperties; -import me.pepperbell.continuity.client.properties.ConnectingCTMProperties; import me.pepperbell.continuity.client.properties.RandomCTMProperties; import me.pepperbell.continuity.client.properties.RepeatCTMProperties; import me.pepperbell.continuity.client.properties.StandardConnectingCTMProperties; @@ -94,34 +93,34 @@ public void onInitializeClient() { registry.registerLoader("ctm_compact", loader); loader = CTMLoader.of( - wrapFactory(ConnectingCTMProperties::new, new TileAmountValidator.Exactly<>(4)), + wrapFactory(StandardConnectingCTMProperties::new, new TileAmountValidator.Exactly<>(4)), new HorizontalQuadProcessor.Factory() ); registry.registerLoader("horizontal", loader); registry.registerLoader("bookshelf", loader); loader = CTMLoader.of( - wrapFactory(ConnectingCTMProperties::new, new TileAmountValidator.Exactly<>(4)), + wrapFactory(StandardConnectingCTMProperties::new, new TileAmountValidator.Exactly<>(4)), new VerticalQuadProcessor.Factory() ); registry.registerLoader("vertical", loader); loader = CTMLoader.of( - wrapFactory(ConnectingCTMProperties::new, new TileAmountValidator.Exactly<>(7)), + wrapFactory(StandardConnectingCTMProperties::new, new TileAmountValidator.Exactly<>(7)), new HorizontalVerticalQuadProcessor.Factory() ); registry.registerLoader("horizontal+vertical", loader); registry.registerLoader("h+v", loader); loader = CTMLoader.of( - wrapFactory(ConnectingCTMProperties::new, new TileAmountValidator.Exactly<>(7)), + wrapFactory(StandardConnectingCTMProperties::new, new TileAmountValidator.Exactly<>(7)), new VerticalHorizontalQuadProcessor.Factory() ); registry.registerLoader("vertical+horizontal", loader); registry.registerLoader("v+h", loader); loader = CTMLoader.of( - wrapFactory(ConnectingCTMProperties::new, new TileAmountValidator.Exactly<>(1)), + wrapFactory(StandardConnectingCTMProperties::new, new TileAmountValidator.Exactly<>(1)), new TopQuadProcessor.Factory() ); registry.registerLoader("top", loader); diff --git a/src/main/java/me/pepperbell/continuity/client/mixin/LifecycledResourceManagerImplMixin.java b/src/main/java/me/pepperbell/continuity/client/mixin/LifecycledResourceManagerImplMixin.java index d7680b9d..82ffb472 100644 --- a/src/main/java/me/pepperbell/continuity/client/mixin/LifecycledResourceManagerImplMixin.java +++ b/src/main/java/me/pepperbell/continuity/client/mixin/LifecycledResourceManagerImplMixin.java @@ -46,7 +46,8 @@ private Identifier redirectGetAllResourcesId(Identifier id) { } @Override - public @Nullable ResourceRedirectHandler getRedirectHandler() { + @Nullable + public ResourceRedirectHandler getRedirectHandler() { return redirectHandler; } } diff --git a/src/main/java/me/pepperbell/continuity/client/mixin/SpriteAtlasTextureDataMixin.java b/src/main/java/me/pepperbell/continuity/client/mixin/SpriteAtlasTextureDataMixin.java index 81f82a6b..7fcd9b72 100644 --- a/src/main/java/me/pepperbell/continuity/client/mixin/SpriteAtlasTextureDataMixin.java +++ b/src/main/java/me/pepperbell/continuity/client/mixin/SpriteAtlasTextureDataMixin.java @@ -16,7 +16,8 @@ public class SpriteAtlasTextureDataMixin implements SpriteAtlasTextureDataExtens private Map emissiveIdMap; @Override - public @Nullable Map getEmissiveIdMap() { + @Nullable + public Map getEmissiveIdMap() { return emissiveIdMap; } diff --git a/src/main/java/me/pepperbell/continuity/client/mixin/SpriteMixin.java b/src/main/java/me/pepperbell/continuity/client/mixin/SpriteMixin.java index 6dc75584..d7c35bde 100644 --- a/src/main/java/me/pepperbell/continuity/client/mixin/SpriteMixin.java +++ b/src/main/java/me/pepperbell/continuity/client/mixin/SpriteMixin.java @@ -13,7 +13,8 @@ public class SpriteMixin implements SpriteExtension { private Sprite emissiveSprite; @Override - public @Nullable Sprite getEmissiveSprite() { + @Nullable + public Sprite getEmissiveSprite() { return emissiveSprite; } diff --git a/src/main/java/me/pepperbell/continuity/client/model/EmissiveUnbakedModel.java b/src/main/java/me/pepperbell/continuity/client/model/EmissiveUnbakedModel.java index fe213998..f119f65d 100644 --- a/src/main/java/me/pepperbell/continuity/client/model/EmissiveUnbakedModel.java +++ b/src/main/java/me/pepperbell/continuity/client/model/EmissiveUnbakedModel.java @@ -17,8 +17,8 @@ public EmissiveUnbakedModel(UnbakedModel wrapped) { super(wrapped); } - @Nullable @Override + @Nullable public BakedModel wrapBaked(@Nullable BakedModel bakedWrapped, ModelLoader loader, Function textureGetter, ModelBakeSettings rotationContainer, Identifier modelId) { if (bakedWrapped == null || bakedWrapped.isBuiltin()) { return bakedWrapped; diff --git a/src/main/java/me/pepperbell/continuity/client/model/WrappingUnbakedModel.java b/src/main/java/me/pepperbell/continuity/client/model/WrappingUnbakedModel.java index 90ce6bd3..cc2bf190 100644 --- a/src/main/java/me/pepperbell/continuity/client/model/WrappingUnbakedModel.java +++ b/src/main/java/me/pepperbell/continuity/client/model/WrappingUnbakedModel.java @@ -36,8 +36,8 @@ public Collection getTextureDependencies(Function textureGetter, ModelBakeSettings rotationContainer, Identifier modelId) { if (isBaking) { return null; @@ -45,9 +45,9 @@ public BakedModel bake(ModelLoader loader, Function te isBaking = true; Map unbakedModels = ((ModelLoaderAccessor) loader).getUnbakedModels(); - UnbakedModel previous = unbakedModels.put(modelId, wrapped); + UnbakedModel previous = unbakedModels.replace(modelId, wrapped); BakedModel bakedWrapped = loader.bake(modelId, rotationContainer); - unbakedModels.put(modelId, previous); + unbakedModels.replace(modelId, previous); BakedModel baked = wrapBaked(bakedWrapped, loader, textureGetter, rotationContainer, modelId); isBaking = false; diff --git a/src/main/java/me/pepperbell/continuity/client/processor/CompactCTMQuadProcessor.java b/src/main/java/me/pepperbell/continuity/client/processor/CompactCTMQuadProcessor.java index e6e66c5e..946250c0 100644 --- a/src/main/java/me/pepperbell/continuity/client/processor/CompactCTMQuadProcessor.java +++ b/src/main/java/me/pepperbell/continuity/client/processor/CompactCTMQuadProcessor.java @@ -54,12 +54,10 @@ public class CompactCTMQuadProcessor extends ConnectingQuadProcessor { ArrayUtils.shift(map[7], 1); } - protected boolean innerSeams; protected Sprite[] replacementSprites; public CompactCTMQuadProcessor(Sprite[] sprites, ProcessingPredicate processingPredicate, ConnectionPredicate connectionPredicate, boolean innerSeams, Sprite[] replacementSprites) { - super(sprites, processingPredicate, connectionPredicate); - this.innerSeams = innerSeams; + super(sprites, processingPredicate, connectionPredicate, innerSeams); this.replacementSprites = replacementSprites; } @@ -115,17 +113,17 @@ public ProcessingResult processQuadInner(MutableQuadView quad, Sprite sprite, Bl boolean vSplit30 = shouldSplitUV(vSignum3, vSignum0); // Cannot split across U and V at the same time - if (uSplit01 & vSplit01 || uSplit12 & vSplit12 || uSplit23 & vSplit23 || uSplit30 & vSplit30) { + if (uSplit01 & vSplit01 | uSplit12 & vSplit12 | uSplit23 & vSplit23 | uSplit30 & vSplit30) { return ProcessingResult.CONTINUE; } // Cannot split across U twice in a row - if (uSplit01 & uSplit12 || uSplit12 & uSplit23 || uSplit23 & uSplit30 || uSplit30 & uSplit01) { + if (uSplit01 & uSplit12 | uSplit12 & uSplit23 | uSplit23 & uSplit30 | uSplit30 & uSplit01) { return ProcessingResult.CONTINUE; } // Cannot split across V twice in a row - if (vSplit01 & vSplit12 || vSplit12 & vSplit23 || vSplit23 & vSplit30 || vSplit30 & vSplit01) { + if (vSplit01 & vSplit12 | vSplit12 & vSplit23 | vSplit23 & vSplit30 | vSplit30 & vSplit01) { return ProcessingResult.CONTINUE; } @@ -551,10 +549,13 @@ public void setLerped(float delta, Vertex vertexA, Vertex vertexB) { normalX = MathHelper.lerp(delta, vertexA.normalX, vertexB.normalX); normalY = MathHelper.lerp(delta, vertexA.normalY, vertexB.normalY); normalZ = MathHelper.lerp(delta, vertexA.normalZ, vertexB.normalZ); - float scale = 1 / (float) Math.sqrt(normalX * normalX + normalY * normalY + normalZ * normalZ); - normalX *= scale; - normalY *= scale; - normalZ *= scale; + float sqLength = normalX * normalX + normalY * normalY + normalZ * normalZ; + if (sqLength != 0) { + float scale = 1 / (float) Math.sqrt(sqLength); + normalX *= scale; + normalY *= scale; + normalZ *= scale; + } } } } diff --git a/src/main/java/me/pepperbell/continuity/client/processor/ConnectingQuadProcessor.java b/src/main/java/me/pepperbell/continuity/client/processor/ConnectingQuadProcessor.java index 76136f27..85738871 100644 --- a/src/main/java/me/pepperbell/continuity/client/processor/ConnectingQuadProcessor.java +++ b/src/main/java/me/pepperbell/continuity/client/processor/ConnectingQuadProcessor.java @@ -4,9 +4,11 @@ public abstract class ConnectingQuadProcessor extends AbstractQuadProcessor { protected ConnectionPredicate connectionPredicate; + protected boolean innerSeams; - public ConnectingQuadProcessor(Sprite[] sprites, ProcessingPredicate processingPredicate, ConnectionPredicate connectionPredicate) { + public ConnectingQuadProcessor(Sprite[] sprites, ProcessingPredicate processingPredicate, ConnectionPredicate connectionPredicate, boolean innerSeams) { super(sprites, processingPredicate); this.connectionPredicate = connectionPredicate; + this.innerSeams = innerSeams; } } diff --git a/src/main/java/me/pepperbell/continuity/client/processor/ConnectionPredicate.java b/src/main/java/me/pepperbell/continuity/client/processor/ConnectionPredicate.java index 25ece2ab..acf0cd56 100644 --- a/src/main/java/me/pepperbell/continuity/client/processor/ConnectionPredicate.java +++ b/src/main/java/me/pepperbell/continuity/client/processor/ConnectionPredicate.java @@ -7,9 +7,21 @@ import net.minecraft.world.BlockRenderView; public interface ConnectionPredicate { - boolean shouldConnect(BlockState state, Sprite quadSprite, BlockPos pos, BlockState to, Direction face, BlockRenderView blockView); + boolean shouldConnect(BlockRenderView blockView, BlockState state, BlockPos pos, BlockState toState, Direction face, Sprite quadSprite); - default boolean shouldConnect(BlockState state, Sprite quadSprite, BlockPos pos, BlockPos toPos, Direction face, BlockRenderView blockView) { - return shouldConnect(state, quadSprite, pos, blockView.getBlockState(toPos), face, blockView); + default boolean shouldConnect(BlockRenderView blockView, BlockState state, BlockPos pos, BlockPos toPos, Direction face, Sprite quadSprite) { + return shouldConnect(blockView, state, pos, blockView.getBlockState(toPos), face, quadSprite); + } + + default boolean shouldConnect(BlockRenderView blockView, BlockState state, BlockPos pos, BlockPos.Mutable toPos, Direction face, Sprite quadSprite, boolean innerSeams) { + if (shouldConnect(blockView, state, pos, toPos, face, quadSprite)) { + if (innerSeams) { + toPos.move(face); + return !shouldConnect(blockView, state, pos, toPos, face, quadSprite); + } else { + return true; + } + } + return false; } } diff --git a/src/main/java/me/pepperbell/continuity/client/processor/HorizontalQuadProcessor.java b/src/main/java/me/pepperbell/continuity/client/processor/HorizontalQuadProcessor.java index ccd54f31..1241bac7 100644 --- a/src/main/java/me/pepperbell/continuity/client/processor/HorizontalQuadProcessor.java +++ b/src/main/java/me/pepperbell/continuity/client/processor/HorizontalQuadProcessor.java @@ -4,7 +4,7 @@ import me.pepperbell.continuity.api.client.QuadProcessor; import me.pepperbell.continuity.client.processor.simple.SimpleQuadProcessor; -import me.pepperbell.continuity.client.properties.ConnectingCTMProperties; +import me.pepperbell.continuity.client.properties.StandardConnectingCTMProperties; import net.fabricmc.fabric.api.renderer.v1.mesh.MutableQuadView; import net.minecraft.block.BlockState; import net.minecraft.client.texture.Sprite; @@ -20,8 +20,8 @@ public class HorizontalQuadProcessor extends ConnectingQuadProcessor { 3, 2, 0, 1, }; - public HorizontalQuadProcessor(Sprite[] sprites, ProcessingPredicate processingPredicate, ConnectionPredicate connectionPredicate) { - super(sprites, processingPredicate, connectionPredicate); + public HorizontalQuadProcessor(Sprite[] sprites, ProcessingPredicate processingPredicate, ConnectionPredicate connectionPredicate, boolean innerSeams) { + super(sprites, processingPredicate, connectionPredicate, innerSeams); } @Override @@ -34,26 +34,24 @@ public ProcessingResult processQuadInner(MutableQuadView quad, Sprite sprite, Bl } protected int getConnections(Direction[] directions, BlockPos.Mutable mutablePos, BlockRenderView blockView, BlockState state, BlockPos pos, Direction face, Sprite quadSprite) { - mutablePos.set(pos); int connections = 0; for (int i = 0; i < 2; i++) { - mutablePos.move(directions[i * 2]); - if (connectionPredicate.shouldConnect(state, quadSprite, pos, mutablePos, face, blockView)) { + mutablePos.set(pos, directions[i * 2]); + if (connectionPredicate.shouldConnect(blockView, state, pos, mutablePos, face, quadSprite, innerSeams)) { connections |= 1 << i; } - mutablePos.set(pos); } return connections; } - public static class Factory extends AbstractQuadProcessorFactory { + public static class Factory extends AbstractQuadProcessorFactory { @Override - public QuadProcessor createProcessor(ConnectingCTMProperties properties, Sprite[] sprites) { - return new HorizontalQuadProcessor(sprites, BaseProcessingPredicate.fromProperties(properties), properties.getConnectionPredicate()); + public QuadProcessor createProcessor(StandardConnectingCTMProperties properties, Sprite[] sprites) { + return new HorizontalQuadProcessor(sprites, BaseProcessingPredicate.fromProperties(properties), properties.getConnectionPredicate(), properties.getInnerSeams()); } @Override - public int getTextureAmount(ConnectingCTMProperties properties) { + public int getTextureAmount(StandardConnectingCTMProperties properties) { return 4; } } diff --git a/src/main/java/me/pepperbell/continuity/client/processor/HorizontalVerticalQuadProcessor.java b/src/main/java/me/pepperbell/continuity/client/processor/HorizontalVerticalQuadProcessor.java index 43b23a94..4afe692c 100644 --- a/src/main/java/me/pepperbell/continuity/client/processor/HorizontalVerticalQuadProcessor.java +++ b/src/main/java/me/pepperbell/continuity/client/processor/HorizontalVerticalQuadProcessor.java @@ -4,7 +4,7 @@ import me.pepperbell.continuity.api.client.QuadProcessor; import me.pepperbell.continuity.client.processor.simple.SimpleQuadProcessor; -import me.pepperbell.continuity.client.properties.ConnectingCTMProperties; +import me.pepperbell.continuity.client.properties.StandardConnectingCTMProperties; import net.fabricmc.fabric.api.renderer.v1.mesh.MutableQuadView; import net.minecraft.block.BlockState; import net.minecraft.client.texture.Sprite; @@ -18,15 +18,15 @@ public class HorizontalVerticalQuadProcessor extends HorizontalQuadProcessor { // 32 16 8 // * // 1 2 4 - protected static final int[] SPRITE_INDEX_MAP_1 = new int[] { + protected static final int[] SECONDARY_SPRITE_INDEX_MAP = new int[] { 3, 3, 6, 3, 3, 3, 3, 3, 3, 3, 6, 3, 3, 3, 3, 3, 4, 4, 5, 4, 4, 4, 4, 4, 3, 3, 6, 3, 3, 3, 3, 3, 3, 3, 6, 3, 3, 3, 3, 3, 3, 3, 6, 3, 3, 3, 3, 3, 3, 3, 6, 3, 3, 3, 3, 3, 3, 3, 6, 3, 3, 3, 3, 3, }; - public HorizontalVerticalQuadProcessor(Sprite[] sprites, ProcessingPredicate processingPredicate, ConnectionPredicate connectionPredicate) { - super(sprites, processingPredicate, connectionPredicate); + public HorizontalVerticalQuadProcessor(Sprite[] sprites, ProcessingPredicate processingPredicate, ConnectionPredicate connectionPredicate, boolean innerSeams) { + super(sprites, processingPredicate, connectionPredicate, innerSeams); } @Override @@ -38,49 +38,38 @@ public ProcessingResult processQuadInner(MutableQuadView quad, Sprite sprite, Bl if (connections != 0) { newSprite = sprites[SPRITE_INDEX_MAP[connections]]; } else { - connections = getConnections1(directions, mutablePos, blockView, state, pos, quad.lightFace(), sprite); - newSprite = sprites[SPRITE_INDEX_MAP_1[connections]]; + int secondaryConnections = getSecondaryConnections(directions, mutablePos, blockView, state, pos, quad.lightFace(), sprite); + newSprite = sprites[SECONDARY_SPRITE_INDEX_MAP[secondaryConnections]]; } return SimpleQuadProcessor.process(quad, sprite, newSprite); } - protected int getConnections1(Direction[] directions, BlockPos.Mutable mutablePos, BlockRenderView blockView, BlockState state, BlockPos pos, Direction face, Sprite quadSprite) { - mutablePos.set(pos); + protected int getSecondaryConnections(Direction[] directions, BlockPos.Mutable mutablePos, BlockRenderView blockView, BlockState state, BlockPos pos, Direction face, Sprite quadSprite) { int connections = 0; for (int i = 0; i < 2; i++) { - mutablePos.move(directions[i * 2 + 1]); - if (connectionPredicate.shouldConnect(state, quadSprite, pos, mutablePos, face, blockView)) { + Direction direction = directions[i * 2 + 1]; + mutablePos.set(pos, direction); + if (connectionPredicate.shouldConnect(blockView, state, pos, mutablePos, face, quadSprite, innerSeams)) { connections |= 1 << (i * 3 + 1); - } - mutablePos.set(pos); - } - for (int i = 0; i < 4; i++) { - int shift = (i / 2) * 3 + 1; - int index1 = i; - int index2 = (i + 1) % 4; - if (((connections >> shift) & 1) == 1) { - mutablePos.move(directions[index1]).move(directions[index2]); - if (connectionPredicate.shouldConnect(state, quadSprite, pos, mutablePos, face, blockView)) { - int shift1 = i % 2; - if (shift1 <= 0) { - shift1--; + for (int j = 0; j < 2; j++) { + mutablePos.set(pos, direction).move(directions[((i + j) % 2) * 2]); + if (connectionPredicate.shouldConnect(blockView, state, pos, mutablePos, face, quadSprite, innerSeams)) { + connections |= 1 << (i * 3 + j * 2); } - connections |= 1 << (shift + shift1); } - mutablePos.set(pos); } } return connections; } - public static class Factory extends AbstractQuadProcessorFactory { + public static class Factory extends AbstractQuadProcessorFactory { @Override - public QuadProcessor createProcessor(ConnectingCTMProperties properties, Sprite[] sprites) { - return new HorizontalVerticalQuadProcessor(sprites, BaseProcessingPredicate.fromProperties(properties), properties.getConnectionPredicate()); + public QuadProcessor createProcessor(StandardConnectingCTMProperties properties, Sprite[] sprites) { + return new HorizontalVerticalQuadProcessor(sprites, BaseProcessingPredicate.fromProperties(properties), properties.getConnectionPredicate(), properties.getInnerSeams()); } @Override - public int getTextureAmount(ConnectingCTMProperties properties) { + public int getTextureAmount(StandardConnectingCTMProperties properties) { return 7; } } diff --git a/src/main/java/me/pepperbell/continuity/client/processor/ProcessingDataKeys.java b/src/main/java/me/pepperbell/continuity/client/processor/ProcessingDataKeys.java index 05ec7132..262fc507 100644 --- a/src/main/java/me/pepperbell/continuity/client/processor/ProcessingDataKeys.java +++ b/src/main/java/me/pepperbell/continuity/client/processor/ProcessingDataKeys.java @@ -15,7 +15,6 @@ public final class ProcessingDataKeys { public static final ProcessingDataKey BIOME_CACHE_KEY = create("biome_cache", BaseProcessingPredicate.BiomeCache::new, BaseProcessingPredicate.BiomeCache::reset); public static final ProcessingDataKey BLOCK_ENTITY_NAME_CACHE_KEY = create("block_entity_name_cache", BaseProcessingPredicate.BlockEntityNameCache::new, BaseProcessingPredicate.BlockEntityNameCache::reset); public static final ProcessingDataKey VERTEX_CONTAINER_KEY = create("vertex_container", CompactCTMQuadProcessor.VertexContainer::new); - public static final ProcessingDataKey BLOCK_STATE_AND_BOOLEAN_KEY = create("block_state_and_boolean", StandardOverlayQuadProcessor.BlockStateAndBoolean::new); public static final ProcessingDataKey STANDARD_OVERLAY_RENDERER_POOL_KEY = create("standard_overlay_renderer_pool", StandardOverlayQuadProcessor.OverlayRendererPool::new, StandardOverlayQuadProcessor.OverlayRendererPool::reset); public static final ProcessingDataKey SIMPLE_OVERLAY_RENDERER_POOL_KEY = create("simple_overlay_renderer_pool", SimpleOverlayQuadProcessor.OverlayRendererPool::new, SimpleOverlayQuadProcessor.OverlayRendererPool::reset); diff --git a/src/main/java/me/pepperbell/continuity/client/processor/TopQuadProcessor.java b/src/main/java/me/pepperbell/continuity/client/processor/TopQuadProcessor.java index c0f98f90..d4a0c453 100644 --- a/src/main/java/me/pepperbell/continuity/client/processor/TopQuadProcessor.java +++ b/src/main/java/me/pepperbell/continuity/client/processor/TopQuadProcessor.java @@ -4,7 +4,7 @@ import me.pepperbell.continuity.api.client.QuadProcessor; import me.pepperbell.continuity.client.processor.simple.SimpleQuadProcessor; -import me.pepperbell.continuity.client.properties.ConnectingCTMProperties; +import me.pepperbell.continuity.client.properties.StandardConnectingCTMProperties; import net.fabricmc.fabric.api.renderer.v1.mesh.MutableQuadView; import net.minecraft.block.BlockState; import net.minecraft.client.texture.Sprite; @@ -15,35 +15,37 @@ import net.minecraft.world.BlockRenderView; public class TopQuadProcessor extends ConnectingQuadProcessor { - public TopQuadProcessor(Sprite[] sprites, ProcessingPredicate processingPredicate, ConnectionPredicate connectionPredicate) { - super(sprites, processingPredicate, connectionPredicate); + public TopQuadProcessor(Sprite[] sprites, ProcessingPredicate processingPredicate, ConnectionPredicate connectionPredicate, boolean innerSeams) { + super(sprites, processingPredicate, connectionPredicate, innerSeams); } @Override public ProcessingResult processQuadInner(MutableQuadView quad, Sprite sprite, BlockRenderView blockView, BlockState state, BlockPos pos, Supplier randomSupplier, int pass, int processorIndex, ProcessingContext context) { Direction lightFace = quad.lightFace(); - Direction.Axis axis = Direction.Axis.Y; + Direction.Axis axis; if (state.contains(Properties.AXIS)) { axis = state.get(Properties.AXIS); + } else { + axis = Direction.Axis.Y; } if (lightFace.getAxis() != axis) { Direction up = Direction.from(axis, Direction.AxisDirection.POSITIVE); - BlockPos.Mutable mutablePos = context.getData(ProcessingDataKeys.MUTABLE_POS_KEY).set(pos); - if (connectionPredicate.shouldConnect(state, sprite, pos, mutablePos.move(up), lightFace, blockView)) { + BlockPos.Mutable mutablePos = context.getData(ProcessingDataKeys.MUTABLE_POS_KEY).set(pos, up); + if (connectionPredicate.shouldConnect(blockView, state, pos, mutablePos, lightFace, sprite, innerSeams)) { return SimpleQuadProcessor.process(quad, sprite, sprites[0]); } } return ProcessingResult.CONTINUE; } - public static class Factory extends AbstractQuadProcessorFactory { + public static class Factory extends AbstractQuadProcessorFactory { @Override - public QuadProcessor createProcessor(ConnectingCTMProperties properties, Sprite[] sprites) { - return new TopQuadProcessor(sprites, BaseProcessingPredicate.fromProperties(properties), properties.getConnectionPredicate()); + public QuadProcessor createProcessor(StandardConnectingCTMProperties properties, Sprite[] sprites) { + return new TopQuadProcessor(sprites, BaseProcessingPredicate.fromProperties(properties), properties.getConnectionPredicate(), properties.getInnerSeams()); } @Override - public int getTextureAmount(ConnectingCTMProperties properties) { + public int getTextureAmount(StandardConnectingCTMProperties properties) { return 1; } } diff --git a/src/main/java/me/pepperbell/continuity/client/processor/VerticalHorizontalQuadProcessor.java b/src/main/java/me/pepperbell/continuity/client/processor/VerticalHorizontalQuadProcessor.java index a7ca8fa8..fbe50031 100644 --- a/src/main/java/me/pepperbell/continuity/client/processor/VerticalHorizontalQuadProcessor.java +++ b/src/main/java/me/pepperbell/continuity/client/processor/VerticalHorizontalQuadProcessor.java @@ -4,7 +4,7 @@ import me.pepperbell.continuity.api.client.QuadProcessor; import me.pepperbell.continuity.client.processor.simple.SimpleQuadProcessor; -import me.pepperbell.continuity.client.properties.ConnectingCTMProperties; +import me.pepperbell.continuity.client.properties.StandardConnectingCTMProperties; import net.fabricmc.fabric.api.renderer.v1.mesh.MutableQuadView; import net.minecraft.block.BlockState; import net.minecraft.client.texture.Sprite; @@ -18,15 +18,15 @@ public class VerticalHorizontalQuadProcessor extends VerticalQuadProcessor { // 32 16 // 1 * 8 // 2 4 - protected static final int[] SPRITE_INDEX_MAP_1 = new int[] { + protected static final int[] SECONDARY_SPRITE_INDEX_MAP = new int[] { 3, 6, 3, 3, 3, 6, 3, 3, 4, 5, 4, 4, 3, 6, 3, 3, 3, 6, 3, 3, 3, 6, 3, 3, 3, 6, 3, 3, 3, 6, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, }; - public VerticalHorizontalQuadProcessor(Sprite[] sprites, ProcessingPredicate processingPredicate, ConnectionPredicate connectionPredicate) { - super(sprites, processingPredicate, connectionPredicate); + public VerticalHorizontalQuadProcessor(Sprite[] sprites, ProcessingPredicate processingPredicate, ConnectionPredicate connectionPredicate, boolean innerSeams) { + super(sprites, processingPredicate, connectionPredicate, innerSeams); } @Override @@ -38,45 +38,38 @@ public ProcessingResult processQuadInner(MutableQuadView quad, Sprite sprite, Bl if (connections != 0) { newSprite = sprites[SPRITE_INDEX_MAP[connections]]; } else { - connections = getConnections1(directions, mutablePos, blockView, state, pos, quad.lightFace(), sprite); - newSprite = sprites[SPRITE_INDEX_MAP_1[connections]]; + int secondaryConnections = getSecondaryConnections(directions, mutablePos, blockView, state, pos, quad.lightFace(), sprite); + newSprite = sprites[SECONDARY_SPRITE_INDEX_MAP[secondaryConnections]]; } return SimpleQuadProcessor.process(quad, sprite, newSprite); } - protected int getConnections1(Direction[] directions, BlockPos.Mutable mutablePos, BlockRenderView blockView, BlockState state, BlockPos pos, Direction face, Sprite quadSprite) { - mutablePos.set(pos); + protected int getSecondaryConnections(Direction[] directions, BlockPos.Mutable mutablePos, BlockRenderView blockView, BlockState state, BlockPos pos, Direction face, Sprite quadSprite) { int connections = 0; for (int i = 0; i < 2; i++) { - mutablePos.move(directions[i * 2]); - if (connectionPredicate.shouldConnect(state, quadSprite, pos, mutablePos, face, blockView)) { - connections |= 1 << i * 3; - } - mutablePos.set(pos); - } - for (int i = 0; i < 4; i++) { - int shift = (i / 2) * 3; - int index1 = i; - int index2 = (i + 1) % 4; - if (((connections >> shift) & 1) == 1) { - mutablePos.move(directions[index1]).move(directions[index2]); - if (connectionPredicate.shouldConnect(state, quadSprite, pos, mutablePos, face, blockView)) { - connections |= 1 << (shift + i % 2 + 1); + Direction direction = directions[i * 2]; + mutablePos.set(pos, direction); + if (connectionPredicate.shouldConnect(blockView, state, pos, mutablePos, face, quadSprite, innerSeams)) { + connections |= 1 << (i * 3); + for (int j = 0; j < 2; j++) { + mutablePos.set(pos, direction).move(directions[((i + j) % 2) * 2 + 1]); + if (connectionPredicate.shouldConnect(blockView, state, pos, mutablePos, face, quadSprite, innerSeams)) { + connections |= 1 << ((i * 3 + j * 2 + 5) % 6); + } } - mutablePos.set(pos); } } return connections; } - public static class Factory extends AbstractQuadProcessorFactory { + public static class Factory extends AbstractQuadProcessorFactory { @Override - public QuadProcessor createProcessor(ConnectingCTMProperties properties, Sprite[] sprites) { - return new VerticalHorizontalQuadProcessor(sprites, BaseProcessingPredicate.fromProperties(properties), properties.getConnectionPredicate()); + public QuadProcessor createProcessor(StandardConnectingCTMProperties properties, Sprite[] sprites) { + return new VerticalHorizontalQuadProcessor(sprites, BaseProcessingPredicate.fromProperties(properties), properties.getConnectionPredicate(), properties.getInnerSeams()); } @Override - public int getTextureAmount(ConnectingCTMProperties properties) { + public int getTextureAmount(StandardConnectingCTMProperties properties) { return 7; } } diff --git a/src/main/java/me/pepperbell/continuity/client/processor/VerticalQuadProcessor.java b/src/main/java/me/pepperbell/continuity/client/processor/VerticalQuadProcessor.java index c44a7b12..2cf5e211 100644 --- a/src/main/java/me/pepperbell/continuity/client/processor/VerticalQuadProcessor.java +++ b/src/main/java/me/pepperbell/continuity/client/processor/VerticalQuadProcessor.java @@ -4,7 +4,7 @@ import me.pepperbell.continuity.api.client.QuadProcessor; import me.pepperbell.continuity.client.processor.simple.SimpleQuadProcessor; -import me.pepperbell.continuity.client.properties.ConnectingCTMProperties; +import me.pepperbell.continuity.client.properties.StandardConnectingCTMProperties; import net.fabricmc.fabric.api.renderer.v1.mesh.MutableQuadView; import net.minecraft.block.BlockState; import net.minecraft.client.texture.Sprite; @@ -22,8 +22,8 @@ public class VerticalQuadProcessor extends ConnectingQuadProcessor { 3, 2, 0, 1, }; - public VerticalQuadProcessor(Sprite[] sprites, ProcessingPredicate processingPredicate, ConnectionPredicate connectionPredicate) { - super(sprites, processingPredicate, connectionPredicate); + public VerticalQuadProcessor(Sprite[] sprites, ProcessingPredicate processingPredicate, ConnectionPredicate connectionPredicate, boolean innerSeams) { + super(sprites, processingPredicate, connectionPredicate, innerSeams); } @Override @@ -36,26 +36,24 @@ public ProcessingResult processQuadInner(MutableQuadView quad, Sprite sprite, Bl } protected int getConnections(Direction[] directions, BlockPos.Mutable mutablePos, BlockRenderView blockView, BlockState state, BlockPos pos, Direction face, Sprite quadSprite) { - mutablePos.set(pos); int connections = 0; for (int i = 0; i < 2; i++) { - mutablePos.move(directions[i * 2 + 1]); - if (connectionPredicate.shouldConnect(state, quadSprite, pos, mutablePos, face, blockView)) { + mutablePos.set(pos, directions[i * 2 + 1]); + if (connectionPredicate.shouldConnect(blockView, state, pos, mutablePos, face, quadSprite, innerSeams)) { connections |= 1 << i; } - mutablePos.set(pos); } return connections; } - public static class Factory extends AbstractQuadProcessorFactory { + public static class Factory extends AbstractQuadProcessorFactory { @Override - public QuadProcessor createProcessor(ConnectingCTMProperties properties, Sprite[] sprites) { - return new VerticalQuadProcessor(sprites, BaseProcessingPredicate.fromProperties(properties), properties.getConnectionPredicate()); + public QuadProcessor createProcessor(StandardConnectingCTMProperties properties, Sprite[] sprites) { + return new VerticalQuadProcessor(sprites, BaseProcessingPredicate.fromProperties(properties), properties.getConnectionPredicate(), properties.getInnerSeams()); } @Override - public int getTextureAmount(ConnectingCTMProperties properties) { + public int getTextureAmount(StandardConnectingCTMProperties properties) { return 4; } } diff --git a/src/main/java/me/pepperbell/continuity/client/processor/overlay/StandardOverlayQuadProcessor.java b/src/main/java/me/pepperbell/continuity/client/processor/overlay/StandardOverlayQuadProcessor.java index 00618996..291c1d1d 100644 --- a/src/main/java/me/pepperbell/continuity/client/processor/overlay/StandardOverlayQuadProcessor.java +++ b/src/main/java/me/pepperbell/continuity/client/processor/overlay/StandardOverlayQuadProcessor.java @@ -68,7 +68,7 @@ public ProcessingResult processQuadInner(MutableQuadView quad, Sprite sprite, Bl return ProcessingResult.CONTINUE; } - protected boolean appliesOverlay(BlockState other, BlockState state, Direction face, Sprite quadSprite, BlockPos pos, BlockRenderView blockView) { + protected boolean appliesOverlay(BlockState other, BlockRenderView blockView, BlockState state, BlockPos pos, Direction face, Sprite quadSprite) { if (other.getBlock().hasDynamicBounds()) { return false; } @@ -85,10 +85,10 @@ protected boolean appliesOverlay(BlockState other, BlockState state, Direction f return false; } } - return !connectionPredicate.shouldConnect(state, quadSprite, pos, other, face, blockView); + return !connectionPredicate.shouldConnect(blockView, state, pos, other, face, quadSprite); } - protected boolean hasSameOverlay(BlockState other, BlockState state, Direction face, Sprite quadSprite, BlockPos pos, BlockRenderView blockView) { + protected boolean hasSameOverlay(BlockState other, BlockRenderView blockView, BlockState state, BlockPos pos, Direction face, Sprite quadSprite) { if (matchBlocksPredicate != null) { if (!matchBlocksPredicate.test(other)) { return false; @@ -102,50 +102,38 @@ protected boolean hasSameOverlay(BlockState other, BlockState state, Direction f return true; } - protected void appliesOverlayUnobscured(Direction direction0, BlockStateAndBoolean blockStateAndBoolean, BlockRenderView blockView, BlockPos pos, BlockState state, Direction lightFace, Sprite quadSprite, BlockPos.Mutable mutablePos) { - mutablePos.move(direction0); - BlockState state0 = blockView.getBlockState(mutablePos); - boolean bool = appliesOverlay(state0, state, lightFace, quadSprite, pos, blockView); - if (bool) { - mutablePos.move(lightFace); - if (blockView.getBlockState(mutablePos).isOpaqueFullCube(blockView, mutablePos)) { - bool = false; - } + protected boolean appliesOverlayUnobscured(BlockState state0, Direction direction0, BlockRenderView blockView, BlockPos pos, BlockState state, Direction lightFace, Sprite quadSprite, BlockPos.Mutable mutablePos) { + boolean a0 = appliesOverlay(state0, blockView, state, pos, lightFace, quadSprite); + if (a0) { + mutablePos.set(pos, direction0).move(lightFace); + a0 = !blockView.getBlockState(mutablePos).isOpaqueFullCube(blockView, mutablePos); } - mutablePos.set(pos); - blockStateAndBoolean.state = state0; - blockStateAndBoolean.bool = bool; + return a0; } protected boolean hasSameOverlayUnobscured(BlockState state0, Direction direction0, BlockRenderView blockView, BlockPos pos, BlockState state, Direction lightFace, Sprite quadSprite, BlockPos.Mutable mutablePos) { - boolean s0 = hasSameOverlay(state0, state, lightFace, quadSprite, pos, blockView); + boolean s0 = hasSameOverlay(state0, blockView, state, pos, lightFace, quadSprite); if (s0) { - mutablePos.move(direction0).move(lightFace); - if (blockView.getBlockState(mutablePos).isOpaqueFullCube(blockView, mutablePos)) { - s0 = false; - } - mutablePos.set(pos); + mutablePos.set(pos, direction0).move(lightFace); + s0 = !blockView.getBlockState(mutablePos).isOpaqueFullCube(blockView, mutablePos); } return s0; } protected boolean appliesOverlayCorner(Direction direction0, Direction direction1, BlockRenderView blockView, BlockPos pos, BlockState state, Direction lightFace, Sprite quadSprite, BlockPos.Mutable mutablePos) { - mutablePos.move(direction0).move(direction1); - boolean corner0 = appliesOverlay(blockView.getBlockState(mutablePos), state, lightFace, quadSprite, pos, blockView); + mutablePos.set(pos, direction0).move(direction1); + boolean corner0 = appliesOverlay(blockView.getBlockState(mutablePos), blockView, state, pos, lightFace, quadSprite); if (corner0) { mutablePos.move(lightFace); - if (blockView.getBlockState(mutablePos).isOpaqueFullCube(blockView, mutablePos)) { - corner0 = false; - } + corner0 = !blockView.getBlockState(mutablePos).isOpaqueFullCube(blockView, mutablePos); } - mutablePos.set(pos); return corner0; } protected OverlayRenderer fromCorner(Direction direction0, Direction direction1, int sprite0, int sprite1, OverlayRenderer renderer, BlockRenderView blockView, BlockPos pos, BlockState state, Direction lightFace, Sprite quadSprite, BlockPos.Mutable mutablePos) { Sprite[] rendererSprites = prepareRenderer(renderer, lightFace, blockView, pos); - mutablePos.move(direction0).move(direction1); - if (appliesOverlay(blockView.getBlockState(mutablePos), state, lightFace, quadSprite, pos, blockView)) { + mutablePos.set(pos, direction0).move(direction1); + if (appliesOverlay(blockView.getBlockState(mutablePos), blockView, state, pos, lightFace, quadSprite)) { mutablePos.move(lightFace); if (!blockView.getBlockState(mutablePos).isOpaqueFullCube(blockView, mutablePos)) { rendererSprites[1] = sprites[sprite1]; @@ -216,23 +204,22 @@ protected OverlayRenderer prepareRenderer(OverlayRenderer renderer, Direction fa 16: L U (CORNER) */ protected OverlayRenderer getRenderer(BlockRenderView blockView, BlockPos pos, BlockState state, Direction lightFace, Sprite quadSprite, Direction[] directions, ProcessingDataProvider dataProvider) { - BlockPos.Mutable mutablePos = dataProvider.getData(ProcessingDataKeys.MUTABLE_POS_KEY).set(pos); - BlockStateAndBoolean blockStateAndBoolean = dataProvider.getData(ProcessingDataKeys.BLOCK_STATE_AND_BOOLEAN_KEY); + BlockPos.Mutable mutablePos = dataProvider.getData(ProcessingDataKeys.MUTABLE_POS_KEY); // - appliesOverlayUnobscured(directions[0], blockStateAndBoolean, blockView, pos, state, lightFace, quadSprite, mutablePos); - BlockState state0 = blockStateAndBoolean.state; - boolean left = blockStateAndBoolean.bool; - appliesOverlayUnobscured(directions[1], blockStateAndBoolean, blockView, pos, state, lightFace, quadSprite, mutablePos); - BlockState state1 = blockStateAndBoolean.state; - boolean down = blockStateAndBoolean.bool; - appliesOverlayUnobscured(directions[2], blockStateAndBoolean, blockView, pos, state, lightFace, quadSprite, mutablePos); - BlockState state2 = blockStateAndBoolean.state; - boolean right = blockStateAndBoolean.bool; - appliesOverlayUnobscured(directions[3], blockStateAndBoolean, blockView, pos, state, lightFace, quadSprite, mutablePos); - BlockState state3 = blockStateAndBoolean.state; - boolean up = blockStateAndBoolean.bool; + mutablePos.set(pos, directions[0]); + BlockState state0 = blockView.getBlockState(mutablePos); + boolean left = appliesOverlayUnobscured(state0, directions[0], blockView, pos, state, lightFace, quadSprite, mutablePos); + mutablePos.set(pos, directions[1]); + BlockState state1 = blockView.getBlockState(mutablePos); + boolean down = appliesOverlayUnobscured(state1, directions[1], blockView, pos, state, lightFace, quadSprite, mutablePos); + mutablePos.set(pos, directions[2]); + BlockState state2 = blockView.getBlockState(mutablePos); + boolean right = appliesOverlayUnobscured(state2, directions[2], blockView, pos, state, lightFace, quadSprite, mutablePos); + mutablePos.set(pos, directions[3]); + BlockState state3 = blockView.getBlockState(mutablePos); + boolean up = appliesOverlayUnobscured(state3, directions[3], blockView, pos, state, lightFace, quadSprite, mutablePos); // @@ -334,11 +321,6 @@ protected OverlayRenderer getRenderer(BlockRenderView blockView, BlockPos pos, B return null; } - public static class BlockStateAndBoolean { - public BlockState state; - public boolean bool; - } - public static class OverlayRenderer implements Consumer { protected static final Sprite[] EMPTY_SPRITES = new Sprite[4]; diff --git a/src/main/java/me/pepperbell/continuity/client/processor/simple/CTMSpriteProvider.java b/src/main/java/me/pepperbell/continuity/client/processor/simple/CTMSpriteProvider.java index e1195b79..aeb5b023 100644 --- a/src/main/java/me/pepperbell/continuity/client/processor/simple/CTMSpriteProvider.java +++ b/src/main/java/me/pepperbell/continuity/client/processor/simple/CTMSpriteProvider.java @@ -2,6 +2,8 @@ import java.util.function.Supplier; +import org.jetbrains.annotations.Nullable; + import me.pepperbell.continuity.api.client.ProcessingDataProvider; import me.pepperbell.continuity.client.processor.ConnectionPredicate; import me.pepperbell.continuity.client.processor.DirectionMaps; @@ -52,6 +54,7 @@ public CTMSpriteProvider(Sprite[] sprites, ConnectionPredicate connectionPredica } @Override + @Nullable public Sprite getSprite(QuadView quad, Sprite sprite, BlockRenderView blockView, BlockState state, BlockPos pos, Supplier randomSupplier, ProcessingDataProvider dataProvider) { Direction[] directions = useTextureOrientation ? DirectionMaps.getDirections(quad) : DirectionMaps.getMap(quad.lightFace())[0]; BlockPos.Mutable mutablePos = dataProvider.getData(ProcessingDataKeys.MUTABLE_POS_KEY); @@ -60,38 +63,21 @@ public Sprite getSprite(QuadView quad, Sprite sprite, BlockRenderView blockView, } public static int getConnections(ConnectionPredicate connectionPredicate, boolean innerSeams, Direction[] directions, BlockPos.Mutable mutablePos, BlockRenderView blockView, BlockState state, BlockPos pos, Direction face, Sprite quadSprite) { - mutablePos.set(pos); int connections = 0; for (int i = 0; i < 4; i++) { - mutablePos.move(directions[i]); - if (connectionPredicate.shouldConnect(state, quadSprite, pos, mutablePos, face, blockView)) { - if (innerSeams) { - mutablePos.move(face); - if (!connectionPredicate.shouldConnect(state, quadSprite, pos, mutablePos, face, blockView)) { - connections |= 1 << (i * 2); - } - } else { - connections |= 1 << (i * 2); - } + mutablePos.set(pos, directions[i]); + if (connectionPredicate.shouldConnect(blockView, state, pos, mutablePos, face, quadSprite, innerSeams)) { + connections |= 1 << (i * 2); } - mutablePos.set(pos); } for (int i = 0; i < 4; i++) { int index1 = i; int index2 = (i + 1) % 4; if (((connections >> index1 * 2) & 1) == 1 && ((connections >> index2 * 2) & 1) == 1) { - mutablePos.move(directions[index1]).move(directions[index2]); - if (connectionPredicate.shouldConnect(state, quadSprite, pos, mutablePos, face, blockView)) { - if (innerSeams) { - mutablePos.move(face); - if (!connectionPredicate.shouldConnect(state, quadSprite, pos, mutablePos, face, blockView)) { - connections |= 1 << (i * 2 + 1); - } - } else { - connections |= 1 << (i * 2 + 1); - } + mutablePos.set(pos, directions[index1]).move(directions[index2]); + if (connectionPredicate.shouldConnect(blockView, state, pos, mutablePos, face, quadSprite, innerSeams)) { + connections |= 1 << (i * 2 + 1); } - mutablePos.set(pos); } } return connections; diff --git a/src/main/java/me/pepperbell/continuity/client/processor/simple/FixedSpriteProvider.java b/src/main/java/me/pepperbell/continuity/client/processor/simple/FixedSpriteProvider.java index f6288390..1bfb5440 100644 --- a/src/main/java/me/pepperbell/continuity/client/processor/simple/FixedSpriteProvider.java +++ b/src/main/java/me/pepperbell/continuity/client/processor/simple/FixedSpriteProvider.java @@ -2,6 +2,8 @@ import java.util.function.Supplier; +import org.jetbrains.annotations.Nullable; + import me.pepperbell.continuity.api.client.ProcessingDataProvider; import me.pepperbell.continuity.client.properties.BaseCTMProperties; import net.fabricmc.fabric.api.renderer.v1.mesh.QuadView; @@ -19,6 +21,7 @@ public FixedSpriteProvider(Sprite sprite) { } @Override + @Nullable public Sprite getSprite(QuadView quad, Sprite sprite, BlockRenderView blockView, BlockState state, BlockPos pos, Supplier randomSupplier, ProcessingDataProvider dataProvider) { return this.sprite; } diff --git a/src/main/java/me/pepperbell/continuity/client/processor/simple/RandomSpriteProvider.java b/src/main/java/me/pepperbell/continuity/client/processor/simple/RandomSpriteProvider.java index 7894cb49..8c5eb19e 100644 --- a/src/main/java/me/pepperbell/continuity/client/processor/simple/RandomSpriteProvider.java +++ b/src/main/java/me/pepperbell/continuity/client/processor/simple/RandomSpriteProvider.java @@ -2,11 +2,13 @@ import java.util.function.Supplier; -import it.unimi.dsi.fastutil.HashCommon; +import org.jetbrains.annotations.Nullable; + import me.pepperbell.continuity.api.client.ProcessingDataProvider; import me.pepperbell.continuity.client.processor.ProcessingDataKeys; import me.pepperbell.continuity.client.processor.Symmetry; import me.pepperbell.continuity.client.properties.RandomCTMProperties; +import me.pepperbell.continuity.client.util.MathUtil; import me.pepperbell.continuity.client.util.RandomIndexProvider; import net.fabricmc.fabric.api.renderer.v1.mesh.QuadView; import net.minecraft.block.Block; @@ -14,7 +16,6 @@ import net.minecraft.client.texture.Sprite; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; -import net.minecraft.util.math.MathHelper; import net.minecraft.util.math.random.Random; import net.minecraft.world.BlockRenderView; @@ -34,43 +35,33 @@ public RandomSpriteProvider(Sprite[] sprites, RandomIndexProvider indexProvider, } @Override + @Nullable public Sprite getSprite(QuadView quad, Sprite sprite, BlockRenderView blockView, BlockState state, BlockPos pos, Supplier randomSupplier, ProcessingDataProvider dataProvider) { - Sprite newSprite; - if (sprites.length == 1) { - newSprite = sprites[0]; - } else { - Direction face = symmetry.getActualFace(quad.lightFace()); + Direction face = symmetry.getActualFace(quad.lightFace()); - int x = pos.getX(); - int y = pos.getY(); - int z = pos.getZ(); - if (linked) { - Block block = state.getBlock(); - BlockPos.Mutable mutablePos = dataProvider.getData(ProcessingDataKeys.MUTABLE_POS_KEY).set(pos); - do { - mutablePos.move(Direction.DOWN); - } while (block == blockView.getBlockState(mutablePos).getBlock()); - y = mutablePos.getY() + 1; - } + int x = pos.getX(); + int y = pos.getY(); + int z = pos.getZ(); - int hash = hash(x, y, z, face.ordinal(), randomLoops); - newSprite = sprites[indexProvider.getRandomIndex(hash)]; + if (linked) { + Block block = state.getBlock(); + BlockPos.Mutable mutablePos = dataProvider.getData(ProcessingDataKeys.MUTABLE_POS_KEY).set(pos); + do { + mutablePos.setY(mutablePos.getY() - 1); + } while (block == blockView.getBlockState(mutablePos).getBlock()); + y = mutablePos.getY() + 1; } - return newSprite; - } - public static int hash(int x, int y, int z, int face, int loops) { - int hash = Integer.rotateLeft(Long.hashCode(MathHelper.hashCode(x, y, z)), face * 5); - hash = HashCommon.mix(hash); - for (int i = 0; i < loops; i++) { - hash = HashCommon.mix(hash); - } - return hash; + int seed = MathUtil.mix(x, y, z, face.ordinal(), randomLoops); + return sprites[indexProvider.getRandomIndex(seed)]; } public static class Factory implements SpriteProvider.Factory { @Override public SpriteProvider createSpriteProvider(Sprite[] sprites, RandomCTMProperties properties) { + if (sprites.length == 1) { + return new FixedSpriteProvider(sprites[0]); + } return new RandomSpriteProvider(sprites, properties.getIndexProviderFactory().createIndexProvider(sprites.length), properties.getRandomLoops(), properties.getSymmetry(), properties.getLinked()); } diff --git a/src/main/java/me/pepperbell/continuity/client/processor/simple/RepeatSpriteProvider.java b/src/main/java/me/pepperbell/continuity/client/processor/simple/RepeatSpriteProvider.java index a57a1784..a90ff967 100644 --- a/src/main/java/me/pepperbell/continuity/client/processor/simple/RepeatSpriteProvider.java +++ b/src/main/java/me/pepperbell/continuity/client/processor/simple/RepeatSpriteProvider.java @@ -2,6 +2,8 @@ import java.util.function.Supplier; +import org.jetbrains.annotations.Nullable; + import me.pepperbell.continuity.api.client.ProcessingDataProvider; import me.pepperbell.continuity.client.processor.Symmetry; import me.pepperbell.continuity.client.properties.RepeatCTMProperties; @@ -27,6 +29,7 @@ public RepeatSpriteProvider(Sprite[] sprites, int width, int height, Symmetry sy } @Override + @Nullable public Sprite getSprite(QuadView quad, Sprite sprite, BlockRenderView blockView, BlockState state, BlockPos pos, Supplier randomSupplier, ProcessingDataProvider dataProvider) { Direction face = symmetry.getActualFace(quad.lightFace()); diff --git a/src/main/java/me/pepperbell/continuity/client/processor/simple/SpriteProvider.java b/src/main/java/me/pepperbell/continuity/client/processor/simple/SpriteProvider.java index e908df48..87ab7d7f 100644 --- a/src/main/java/me/pepperbell/continuity/client/processor/simple/SpriteProvider.java +++ b/src/main/java/me/pepperbell/continuity/client/processor/simple/SpriteProvider.java @@ -2,6 +2,8 @@ import java.util.function.Supplier; +import org.jetbrains.annotations.Nullable; + import me.pepperbell.continuity.api.client.ProcessingDataProvider; import me.pepperbell.continuity.client.properties.BaseCTMProperties; import net.fabricmc.fabric.api.renderer.v1.mesh.QuadView; @@ -12,6 +14,7 @@ import net.minecraft.world.BlockRenderView; public interface SpriteProvider { + @Nullable Sprite getSprite(QuadView quad, Sprite sprite, BlockRenderView blockView, BlockState state, BlockPos pos, Supplier randomSupplier, ProcessingDataProvider dataProvider); interface Factory { diff --git a/src/main/java/me/pepperbell/continuity/client/properties/ConnectingCTMProperties.java b/src/main/java/me/pepperbell/continuity/client/properties/ConnectingCTMProperties.java index 0f1f7312..cd5a6e44 100644 --- a/src/main/java/me/pepperbell/continuity/client/properties/ConnectingCTMProperties.java +++ b/src/main/java/me/pepperbell/continuity/client/properties/ConnectingCTMProperties.java @@ -63,29 +63,29 @@ public ConnectionPredicate getConnectionPredicate() { public enum ConnectionType implements ConnectionPredicate { BLOCK { @Override - public boolean shouldConnect(BlockState state, Sprite quadSprite, BlockPos pos, BlockState to, Direction face, BlockRenderView blockView) { - return state.getBlock() == to.getBlock(); + public boolean shouldConnect(BlockRenderView blockView, BlockState state, BlockPos pos, BlockState toState, Direction face, Sprite quadSprite) { + return state.getBlock() == toState.getBlock(); } }, TILE { @Override - public boolean shouldConnect(BlockState state, Sprite quadSprite, BlockPos pos, BlockState to, Direction face, BlockRenderView blockView) { - if (state == to) { + public boolean shouldConnect(BlockRenderView blockView, BlockState state, BlockPos pos, BlockState toState, Direction face, Sprite quadSprite) { + if (state == toState) { return true; } - return quadSprite == SpriteCalculator.getSprite(to, face); + return quadSprite == SpriteCalculator.getSprite(toState, face); } }, MATERIAL { @Override - public boolean shouldConnect(BlockState state, Sprite quadSprite, BlockPos pos, BlockState to, Direction face, BlockRenderView blockView) { - return state.getMaterial() == to.getMaterial(); + public boolean shouldConnect(BlockRenderView blockView, BlockState state, BlockPos pos, BlockState toState, Direction face, Sprite quadSprite) { + return state.getMaterial() == toState.getMaterial(); } }, STATE { @Override - public boolean shouldConnect(BlockState state, Sprite quadSprite, BlockPos pos, BlockState to, Direction face, BlockRenderView blockView) { - return state == to; + public boolean shouldConnect(BlockRenderView blockView, BlockState state, BlockPos pos, BlockState toState, Direction face, Sprite quadSprite) { + return state == toState; } }; } diff --git a/src/main/java/me/pepperbell/continuity/client/properties/PropertiesParsingHelper.java b/src/main/java/me/pepperbell/continuity/client/properties/PropertiesParsingHelper.java index ad4e21a2..0b58eef3 100644 --- a/src/main/java/me/pepperbell/continuity/client/properties/PropertiesParsingHelper.java +++ b/src/main/java/me/pepperbell/continuity/client/properties/PropertiesParsingHelper.java @@ -196,8 +196,8 @@ public static Predicate parseBlockStates(Properties properties, Stri ImmutableList> predicateList = predicateListBuilder.build(); if (!predicateList.isEmpty()) { - int amount = predicateList.size(); return state -> { + int amount = predicateList.size(); for (int i = 0; i < amount; i++) { if (predicateList.get(i).test(state)) { return true; diff --git a/src/main/java/me/pepperbell/continuity/client/resource/CTMPropertiesLoader.java b/src/main/java/me/pepperbell/continuity/client/resource/CTMPropertiesLoader.java index e7f92cd1..eb60b356 100644 --- a/src/main/java/me/pepperbell/continuity/client/resource/CTMPropertiesLoader.java +++ b/src/main/java/me/pepperbell/continuity/client/resource/CTMPropertiesLoader.java @@ -21,7 +21,6 @@ import me.pepperbell.continuity.api.client.CTMProperties; import me.pepperbell.continuity.client.ContinuityClient; import me.pepperbell.continuity.client.util.BooleanState; -import me.pepperbell.continuity.client.util.OptionalListCreator; import net.minecraft.block.BlockState; import net.minecraft.client.util.SpriteIdentifier; import net.minecraft.resource.ResourceManager; @@ -211,4 +210,23 @@ public static void clearAll() { IGNORES_BLOCK.clear(); VALID_FOR_MULTIPASS.clear(); } + + private static class OptionalListCreator implements Consumer { + private ObjectArrayList list = null; + + @Override + public void accept(T t) { + if (list == null) { + list = new ObjectArrayList<>(); + } + list.add(t); + } + + @Nullable + public ObjectArrayList get() { + ObjectArrayList list = this.list; + this.list = null; + return list; + } + } } diff --git a/src/main/java/me/pepperbell/continuity/client/resource/ModelWrappingHandler.java b/src/main/java/me/pepperbell/continuity/client/resource/ModelWrappingHandler.java index 02be0785..39c404db 100644 --- a/src/main/java/me/pepperbell/continuity/client/resource/ModelWrappingHandler.java +++ b/src/main/java/me/pepperbell/continuity/client/resource/ModelWrappingHandler.java @@ -12,7 +12,6 @@ import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap; import it.unimi.dsi.fastutil.objects.ObjectArrayList; -import it.unimi.dsi.fastutil.objects.ObjectArraySet; import it.unimi.dsi.fastutil.objects.ObjectOpenHashSet; import me.pepperbell.continuity.client.mixinterface.SpriteAtlasTextureDataExtension; import me.pepperbell.continuity.client.model.CTMUnbakedModel; @@ -77,7 +76,7 @@ public static void wrapCTMModels(Map unbakedModels, Ma Set> dependents = container.getRecursiveMultipassDependents(); if (dependents != null) { if (multipassContainerSet == null) { - multipassContainerSet = new ObjectArraySet<>(); + multipassContainerSet = new ObjectOpenHashSet<>(); } multipassContainerSet.addAll(dependents); } @@ -158,10 +157,8 @@ private static Function createUnbakedModelGetter(Map wrappedModels, Map unbakedModels, Map modelsToBake) { wrappedModels.forEach((id, wrapped) -> { - unbakedModels.put(id, wrapped); - if (modelsToBake.containsKey(id)) { - modelsToBake.put(id, wrapped); - } + unbakedModels.replace(id, wrapped); + modelsToBake.replace(id, wrapped); }); } diff --git a/src/main/java/me/pepperbell/continuity/client/util/MathUtil.java b/src/main/java/me/pepperbell/continuity/client/util/MathUtil.java index 443f0f51..65ec026f 100644 --- a/src/main/java/me/pepperbell/continuity/client/util/MathUtil.java +++ b/src/main/java/me/pepperbell/continuity/client/util/MathUtil.java @@ -1,6 +1,11 @@ package me.pepperbell.continuity.client.util; +import net.minecraft.util.math.MathHelper; + public final class MathUtil { + // Borrowed from SplittableRandom + public static final long GOLDEN_GAMMA = 0x9e3779b97f4a7c15L; + public static int signum(int value) { if (value > 0) { return 1; @@ -26,4 +31,21 @@ public static int lerpLight(float delta, int lightA, int lightB) { return (lerp(delta, lightA >> 20 & 0xF, lightB >> 20 & 0xF) << 20) | (lerp(delta, lightA >> 4 & 0xF, lightB >> 4 & 0xF) << 4); } + + // Borrowed from SplittableRandom + public static long mix64(long z) { + z = (z ^ (z >>> 30)) * 0xbf58476d1ce4e5b9L; + z = (z ^ (z >>> 27)) * 0x94d049bb133111ebL; + return z ^ (z >>> 31); + } + + // Borrowed from SplittableRandom + public static int mix32(long z) { + z = (z ^ (z >>> 33)) * 0x62a9d9ed799705f5L; + return (int) (((z ^ (z >>> 28)) * 0xcb24d0a5c88c35b3L) >>> 32); + } + + public static int mix(int x, int y, int z, int face, int loops) { + return mix32((MathHelper.hashCode(x, y, z) ^ mix64(GOLDEN_GAMMA * (1 + face))) + GOLDEN_GAMMA * (1 + loops)); + } } diff --git a/src/main/java/me/pepperbell/continuity/client/util/OptionalListCreator.java b/src/main/java/me/pepperbell/continuity/client/util/OptionalListCreator.java deleted file mode 100644 index b8088477..00000000 --- a/src/main/java/me/pepperbell/continuity/client/util/OptionalListCreator.java +++ /dev/null @@ -1,28 +0,0 @@ -package me.pepperbell.continuity.client.util; - -import java.util.function.Consumer; -import java.util.function.Supplier; - -import org.jetbrains.annotations.Nullable; - -import it.unimi.dsi.fastutil.objects.ObjectArrayList; - -public class OptionalListCreator implements Consumer, Supplier> { - private ObjectArrayList list = null; - - @Override - public void accept(T t) { - if (list == null) { - list = new ObjectArrayList<>(); - } - list.add(t); - } - - @Override - @Nullable - public ObjectArrayList get() { - ObjectArrayList list = this.list; - this.list = null; - return list; - } -} diff --git a/src/main/java/me/pepperbell/continuity/client/util/QuadUtil.java b/src/main/java/me/pepperbell/continuity/client/util/QuadUtil.java index 50c011c5..82845f49 100644 --- a/src/main/java/me/pepperbell/continuity/client/util/QuadUtil.java +++ b/src/main/java/me/pepperbell/continuity/client/util/QuadUtil.java @@ -26,8 +26,8 @@ public static void interpolate(MutableQuadView quad, Sprite oldSprite, Sprite ne public static void assignLerpedUVs(MutableQuadView quad, Sprite sprite) { float delta = sprite.getAnimationFrameDelta(); - float centerU = (sprite.getMinU() + sprite.getMaxU()) / 2.0f; - float centerV = (sprite.getMinV() + sprite.getMaxV()) / 2.0f; + float centerU = (sprite.getMinU() + sprite.getMaxU()) * 0.5f; + float centerV = (sprite.getMinV() + sprite.getMaxV()) * 0.5f; float lerpedMinU = MathHelper.lerp(delta, sprite.getMinU(), centerU); float lerpedMaxU = MathHelper.lerp(delta, sprite.getMaxU(), centerU); float lerpedMinV = MathHelper.lerp(delta, sprite.getMinV(), centerV); diff --git a/src/main/java/me/pepperbell/continuity/client/util/RandomIndexProvider.java b/src/main/java/me/pepperbell/continuity/client/util/RandomIndexProvider.java index a49dcabd..addb2b7c 100644 --- a/src/main/java/me/pepperbell/continuity/client/util/RandomIndexProvider.java +++ b/src/main/java/me/pepperbell/continuity/client/util/RandomIndexProvider.java @@ -34,10 +34,10 @@ class Weighted implements RandomIndexProvider { protected int weightSum; protected int maxIndex; - public Weighted(int[] weights, int weightSum, int maxIndex) { + public Weighted(int[] weights, int weightSum) { this.weights = weights; this.weightSum = weightSum; - this.maxIndex = maxIndex; + this.maxIndex = weights.length - 1; } @Override @@ -77,7 +77,7 @@ public RandomIndexProvider createIndexProvider(int size) { } } - return new Weighted(newWeights, weightSum, size - 1); + return new Weighted(newWeights, weightSum); } } } diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 0985bcda..d4ac6648 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -32,7 +32,7 @@ "depends": { "fabricloader": ">=0.11.7", - "fabric": ">=0.51.0", + "fabric": ">=0.58.0", "minecraft": "1.19.x", "java": ">=17" },