From 72e7be7acec4a80d801eb9f0ef9105a92ad1c3bd Mon Sep 17 00:00:00 2001 From: Aleksey Date: Sun, 27 Jun 2021 16:00:09 +0300 Subject: [PATCH 1/4] Double slab model fix --- build.gradle | 2 +- gradle.properties | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- src/main/java/ru/bclib/blocks/BaseSlabBlock.java | 7 ++++++- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index 843c4bb2..047c6c0c 100644 --- a/build.gradle +++ b/build.gradle @@ -20,7 +20,7 @@ group = project.maven_group repositories { maven { url "https://maven.dblsaiko.net/" } - maven { url "http://server.bbkr.space:8081/artifactory/libs-release/" } + maven { url "https://server.bbkr.space:8081/artifactory/libs-release/" } maven { url "https://maven.fabricmc.net/" } maven { url 'https://maven.blamejared.com' } maven { url "https://maven.shedaniel.me/" } diff --git a/gradle.properties b/gradle.properties index a316ad08..0c0d9645 100644 --- a/gradle.properties +++ b/gradle.properties @@ -8,7 +8,7 @@ yarn_mappings=6 loader_version=0.11.3 # Mod Properties -mod_version = 0.1.43 +mod_version = 0.1.44 maven_group = ru.bclib archives_base_name = bclib diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 442d9132..f371643e 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-6.8.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/src/main/java/ru/bclib/blocks/BaseSlabBlock.java b/src/main/java/ru/bclib/blocks/BaseSlabBlock.java index 43edec66..368237d5 100644 --- a/src/main/java/ru/bclib/blocks/BaseSlabBlock.java +++ b/src/main/java/ru/bclib/blocks/BaseSlabBlock.java @@ -49,7 +49,12 @@ public class BaseSlabBlock extends SlabBlock implements BlockModelProvider { @Environment(EnvType.CLIENT) public @Nullable BlockModel getBlockModel(ResourceLocation blockId, BlockState blockState) { ResourceLocation parentId = Registry.BLOCK.getKey(parent); - Optional pattern = PatternsHelper.createJson(BasePatterns.BLOCK_SLAB, parentId); + Optional pattern; + if (blockState.getValue(TYPE) == SlabType.DOUBLE) { + pattern = PatternsHelper.createBlockSimple(parentId); + } else { + pattern = PatternsHelper.createJson(BasePatterns.BLOCK_SLAB, parentId); + } return ModelsHelper.fromPattern(pattern); } From bdab3097269329fc09e7561a28fa244004ad1171 Mon Sep 17 00:00:00 2001 From: Aleksey Date: Sun, 27 Jun 2021 16:03:29 +0300 Subject: [PATCH 2/4] Update build.gradle --- build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/build.gradle b/build.gradle index 047c6c0c..8e2dc088 100644 --- a/build.gradle +++ b/build.gradle @@ -65,6 +65,7 @@ def useApi(String dep) { processResources { inputs.property "version", project.version + duplicatesStrategy = 'WARN' from(sourceSets.main.resources.srcDirs) { include "fabric.mod.json" From 64c27a10b7005b06e2c0f38c471f4de10094d0ec Mon Sep 17 00:00:00 2001 From: Aleksey Date: Sun, 27 Jun 2021 16:06:33 +0300 Subject: [PATCH 3/4] Update build.gradle --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 8e2dc088..3b9ff8a6 100644 --- a/build.gradle +++ b/build.gradle @@ -65,7 +65,7 @@ def useApi(String dep) { processResources { inputs.property "version", project.version - duplicatesStrategy = 'WARN' + duplicatesStrategy = 'EXCLUDE' from(sourceSets.main.resources.srcDirs) { include "fabric.mod.json" From befdd2c10a856e7c03292a293a86f86974333b3c Mon Sep 17 00:00:00 2001 From: paulevsGitch Date: Sun, 4 Jul 2021 02:02:34 +0300 Subject: [PATCH 4/4] Missing biome registry crash fix --- gradle.properties | 2 +- src/main/java/ru/bclib/api/BiomeAPI.java | 3 +++ src/main/java/ru/bclib/mixin/common/ServerLevelMixin.java | 3 +++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 0c0d9645..d0cceeac 100644 --- a/gradle.properties +++ b/gradle.properties @@ -8,7 +8,7 @@ yarn_mappings=6 loader_version=0.11.3 # Mod Properties -mod_version = 0.1.44 +mod_version = 0.1.45 maven_group = ru.bclib archives_base_name = bclib diff --git a/src/main/java/ru/bclib/api/BiomeAPI.java b/src/main/java/ru/bclib/api/BiomeAPI.java index ef927ef8..0a1cb7b5 100644 --- a/src/main/java/ru/bclib/api/BiomeAPI.java +++ b/src/main/java/ru/bclib/api/BiomeAPI.java @@ -91,6 +91,9 @@ public class BiomeAPI { * @return {@link BCLBiome} or {@code BiomeAPI.EMPTY_BIOME}. */ public static BCLBiome getFromBiome(Biome biome) { + if (biomeRegistry == null) { + return EMPTY_BIOME; + } return ID_MAP.getOrDefault(biomeRegistry.getKey(biome), EMPTY_BIOME); } diff --git a/src/main/java/ru/bclib/mixin/common/ServerLevelMixin.java b/src/main/java/ru/bclib/mixin/common/ServerLevelMixin.java index bf0fa156..ef881e4d 100644 --- a/src/main/java/ru/bclib/mixin/common/ServerLevelMixin.java +++ b/src/main/java/ru/bclib/mixin/common/ServerLevelMixin.java @@ -22,6 +22,7 @@ import net.minecraft.world.level.dimension.DimensionType; import net.minecraft.world.level.storage.LevelStorageSource; import net.minecraft.world.level.storage.ServerLevelData; import net.minecraft.world.level.storage.WritableLevelData; +import ru.bclib.api.BiomeAPI; import ru.bclib.api.DataFixerAPI; import ru.bclib.api.WorldDataAPI; @@ -35,6 +36,8 @@ public abstract class ServerLevelMixin extends Level { @Inject(method = "*", at = @At("TAIL")) private void bcl_onServerWorldInit(MinecraftServer server, Executor workerExecutor, LevelStorageSource.LevelStorageAccess session, ServerLevelData properties, ResourceKey registryKey, DimensionType dimensionType, ChunkProgressListener worldGenerationProgressListener, ChunkGenerator chunkGenerator, boolean debugWorld, long l, List list, boolean bl, CallbackInfo info) { + BiomeAPI.initRegistry(server); + if (bcl_lastWorld != null && bcl_lastWorld.equals(session.getLevelId())) { return; }