From 03c39d4a69c10e66f14e0223c5f247805eb7ec05 Mon Sep 17 00:00:00 2001 From: Frank Date: Thu, 2 Jun 2022 08:18:47 +0200 Subject: [PATCH] Removed old Enderscape integration as new Versions are built using BCLib. --- gradle.properties | 2 +- .../integration/EnderscapeIntegration.java | 50 ------------------- .../betterend/integration/Integrations.java | 1 - .../mixin/client/EndEffectsMixin.java | 10 ++-- src/main/resources/fabric.mod.json | 2 +- 5 files changed, 7 insertions(+), 58 deletions(-) delete mode 100644 src/main/java/ru/betterend/integration/EnderscapeIntegration.java diff --git a/gradle.properties b/gradle.properties index fbbeee5d..b6120382 100644 --- a/gradle.properties +++ b/gradle.properties @@ -11,7 +11,7 @@ fabric_version = 0.48.0+1.18.2 loom_version=0.10-SNAPSHOT # Mod Properties -mod_version=1.1.0 +mod_version=1.1.1 maven_group=ru.betterend archives_base_name=better-end diff --git a/src/main/java/ru/betterend/integration/EnderscapeIntegration.java b/src/main/java/ru/betterend/integration/EnderscapeIntegration.java deleted file mode 100644 index 246fd8d2..00000000 --- a/src/main/java/ru/betterend/integration/EnderscapeIntegration.java +++ /dev/null @@ -1,50 +0,0 @@ -package ru.betterend.integration; - -import net.minecraft.core.Holder; -import net.minecraft.core.MappedRegistry; -import net.minecraft.resources.ResourceKey; -import net.minecraft.world.level.biome.Biome; -import net.minecraft.world.level.levelgen.GenerationStep.Decoration; -import ru.bclib.api.biomes.BiomeAPI; -import ru.bclib.api.tag.NamedCommonBlockTags; -import ru.bclib.api.tag.TagAPI; -import ru.bclib.integration.ModIntegration; -import ru.bclib.world.features.BCLFeature; - -public class EnderscapeIntegration extends ModIntegration { - public EnderscapeIntegration() { - super("enderscape"); - } - - @Override - public void init() { - Class enderscape = getClass("net.enderscape.Enderscape"); - Class enderscapeIslandsBiome = getClass("net.enderscape.world.biomes.EnderscapeIslandsBiome"); - MappedRegistry biomes = getStaticFieldValue(enderscape, "ENDERSCAPE_BIOME"); - biomes.entrySet().forEach(entry -> { - ResourceKey key = entry.getKey(); - Holder biome = getBiome(key.location().getPath()); - if (enderscapeIslandsBiome.isInstance(entry.getValue())) { - BiomeAPI.registerEndVoidBiome(biome); - } - else { - BiomeAPI.registerEndLandBiome(biome); - } - }); - - BCLFeature scatteredShadowQuartzOre = getFeature("scattered_shadow_quartz_ore", Decoration.UNDERGROUND_DECORATION); - BCLFeature voidNebuliteOre = getFeature("void_nebulite_ore", Decoration.UNDERGROUND_DECORATION); - BCLFeature nebuliteOre = getFeature("nebulite_ore", Decoration.UNDERGROUND_DECORATION); - - BiomeAPI.registerEndBiomeModification((biomeID, biome) -> { - if (!biomeID.getNamespace().equals("enderscape")) { - BiomeAPI.addBiomeFeature(biome, scatteredShadowQuartzOre); - BiomeAPI.addBiomeFeature(biome, voidNebuliteOre); - BiomeAPI.addBiomeFeature(biome, nebuliteOre); - } - }); - - TagAPI.addBlockTag(NamedCommonBlockTags.GEN_END_STONES, getBlock("nebulite_ore")); - TagAPI.addBlockTag(NamedCommonBlockTags.GEN_END_STONES, getBlock("shadow_quartz_ore")); - } -} diff --git a/src/main/java/ru/betterend/integration/Integrations.java b/src/main/java/ru/betterend/integration/Integrations.java index 21a7a9aa..a92aafcd 100644 --- a/src/main/java/ru/betterend/integration/Integrations.java +++ b/src/main/java/ru/betterend/integration/Integrations.java @@ -18,7 +18,6 @@ public class Integrations { public static final ModIntegration BYG = ModIntegrationAPI.register(new BYGIntegration()); public static final ModIntegration NOURISH = ModIntegrationAPI.register(new NourishIntegration()); public static final ModIntegration FLAMBOYANT_REFABRICATED = ModIntegrationAPI.register(new FlamboyantRefabricatedIntegration()); - public static final ModIntegration ENDERSCAPE = ModIntegrationAPI.register(new EnderscapeIntegration()); private static boolean hasHydrogen; diff --git a/src/main/java/ru/betterend/mixin/client/EndEffectsMixin.java b/src/main/java/ru/betterend/mixin/client/EndEffectsMixin.java index a215b8ec..7ab70de9 100644 --- a/src/main/java/ru/betterend/mixin/client/EndEffectsMixin.java +++ b/src/main/java/ru/betterend/mixin/client/EndEffectsMixin.java @@ -12,15 +12,15 @@ import ru.betterend.integration.Integrations; public class EndEffectsMixin { @Inject(method = "getBrightnessDependentFogColor", at = @At("HEAD"), cancellable = true) private void be_restoreBrightness(Vec3 color, float sunHeight, CallbackInfoReturnable info) { - if (Integrations.ENDERSCAPE.modIsInstalled()) { - info.setReturnValue(color.scale(0.15000000596046448D)); - } +// if (Integrations.ENDERSCAPE.modIsInstalled()) { +// info.setReturnValue(color.scale(0.15000000596046448D)); +// } } @Inject(method = "isFoggyAt", at = @At("HEAD"), cancellable = true) private void be_restoreFog(int camX, int camY, CallbackInfoReturnable info) { - if (Integrations.ENDERSCAPE.modIsInstalled()) { + /*if (Integrations.ENDERSCAPE.modIsInstalled()) { info.setReturnValue(false); - } + }*/ } } diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 995087e5..f73bc714 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -46,7 +46,7 @@ "fabricloader": ">=0.13.3", "fabric": ">=0.44.0", "minecraft": "1.18.2", - "bclib": ">=1.4.3" + "bclib": ">=1.4.7" }, "suggests": { "byg": ">=1.1.3",