From c66e878847660912c1dfd600478c96f299d616ac Mon Sep 17 00:00:00 2001 From: Frank Date: Thu, 2 Jun 2022 08:14:48 +0200 Subject: [PATCH] Updated to latest BCLib API --- gradle.properties | 8 ++++---- .../java/org/betterx/betterend/entity/EndSlimeEntity.java | 2 +- .../betterx/betterend/mixin/common/ServerPlayerMixin.java | 4 +++- .../java/org/betterx/betterend/registry/EndBiomes.java | 6 +++--- .../java/org/betterx/betterend/registry/EndFeatures.java | 2 +- .../java/org/betterx/betterend/util/LootTableUtil.java | 2 +- .../java/org/betterx/betterend/world/biome/EndBiome.java | 4 ++-- .../betterend/world/biome/cave/EmptyAuroraCaveBiome.java | 2 +- .../betterend/world/biome/cave/EmptyEndCaveBiome.java | 2 +- .../world/biome/cave/EmptySmaragdantCaveBiome.java | 2 +- .../betterx/betterend/world/biome/cave/EndCaveBiome.java | 2 +- .../betterx/betterend/world/biome/cave/JadeCaveBiome.java | 2 +- .../betterend/world/biome/cave/LushAuroraCaveBiome.java | 2 +- .../world/biome/cave/LushSmaragdantCaveBiome.java | 2 +- .../world/features/terrain/caves/EndCaveFeature.java | 2 +- .../world/features/terrain/caves/TunelCaveFeature.java | 2 +- .../betterend/world/generator/TerrainGenerator.java | 2 +- .../world/structures/features/FeatureBaseStructure.java | 1 + 18 files changed, 26 insertions(+), 23 deletions(-) diff --git a/gradle.properties b/gradle.properties index 191b45d6..d3a250ba 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,12 +3,12 @@ org.gradle.jvmargs=-Xmx2G # Fabric Properties # check these on https://fabricmc.net/versions.html -minecraft_version= 1.19-pre1 -loader_version= 0.14.5 -fabric_version = 0.52.4+1.19 +minecraft_version=1.19-pre3 +loader_version=0.14.6 +fabric_version=0.53.4+1.19 #Loom -loom_version=0.11-SNAPSHOT +loom_version=0.12-SNAPSHOT # Mod Properties mod_version=2.0.0 diff --git a/src/main/java/org/betterx/betterend/entity/EndSlimeEntity.java b/src/main/java/org/betterx/betterend/entity/EndSlimeEntity.java index 9e187143..326f43b9 100644 --- a/src/main/java/org/betterx/betterend/entity/EndSlimeEntity.java +++ b/src/main/java/org/betterx/betterend/entity/EndSlimeEntity.java @@ -35,11 +35,11 @@ import net.minecraft.world.level.LevelAccessor; import net.minecraft.world.level.ServerLevelAccessor; import net.minecraft.world.level.block.Blocks; +import org.betterx.bclib.api.biomes.BCLBiome; import org.betterx.bclib.api.biomes.BiomeAPI; import org.betterx.bclib.api.tag.CommonBlockTags; import org.betterx.bclib.util.BlocksHelper; import org.betterx.bclib.util.MHelper; -import org.betterx.bclib.world.biomes.BCLBiome; import org.betterx.betterend.interfaces.ISlime; import org.betterx.betterend.registry.EndBiomes; import org.betterx.betterend.util.GlobalState; diff --git a/src/main/java/org/betterx/betterend/mixin/common/ServerPlayerMixin.java b/src/main/java/org/betterx/betterend/mixin/common/ServerPlayerMixin.java index 2ec23ca6..e7ed6ca6 100644 --- a/src/main/java/org/betterx/betterend/mixin/common/ServerPlayerMixin.java +++ b/src/main/java/org/betterx/betterend/mixin/common/ServerPlayerMixin.java @@ -30,6 +30,7 @@ import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; +import java.util.Optional; import org.jetbrains.annotations.Nullable; @Mixin(ServerPlayer.class) @@ -101,7 +102,8 @@ public abstract class ServerPlayerMixin extends Player implements TeleportingEnt gameMode.getPreviousGameModeForPlayer(), destination.isDebug(), destination.isFlat(), - true + true, + Optional.empty() )); connection.send(new ClientboundChangeDifficultyPacket( worldProperties.getDifficulty(), diff --git a/src/main/java/org/betterx/betterend/registry/EndBiomes.java b/src/main/java/org/betterx/betterend/registry/EndBiomes.java index 7d82ce39..753d2a13 100644 --- a/src/main/java/org/betterx/betterend/registry/EndBiomes.java +++ b/src/main/java/org/betterx/betterend/registry/EndBiomes.java @@ -6,8 +6,8 @@ import net.minecraft.server.level.ServerLevel; import net.minecraft.world.level.biome.Biome; import org.betterx.bclib.api.LifeCycleAPI; +import org.betterx.bclib.api.biomes.BCLBiome; import org.betterx.bclib.api.biomes.BiomeAPI; -import org.betterx.bclib.world.biomes.BCLBiome; import org.betterx.bclib.world.generator.BiomePicker; import org.betterx.bclib.world.generator.map.hex.HexBiomeMap; import org.betterx.betterend.config.Configs; @@ -19,7 +19,7 @@ import org.betterx.betterend.world.generator.BiomeType; import org.betterx.betterend.world.generator.GeneratorOptions; public class EndBiomes { - public static final BiomeAPI.Dimension END_CAVE = new BiomeAPI.Dimension(BiomeAPI.Dimension.END); + public static final BiomeAPI.BiomeType END_CAVE = new BiomeAPI.BiomeType("END_CAVE", BiomeAPI.BiomeType.END); public static BiomePicker CAVE_BIOMES = null; private static HexBiomeMap caveBiomeMap; @@ -126,7 +126,7 @@ public class EndBiomes { public static EndBiome registerSubBiomeIntegration(EndBiome.Config biomeConfig) { EndBiome biome = EndBiome.create(biomeConfig); if (Configs.BIOME_CONFIG.getBoolean(biome.getID(), "enabled", true)) { - BiomeAPI.registerBiome(biome, BiomeAPI.Dimension.END); + BiomeAPI.registerBiome(biome, BiomeAPI.BiomeType.END); } return biome; } diff --git a/src/main/java/org/betterx/betterend/registry/EndFeatures.java b/src/main/java/org/betterx/betterend/registry/EndFeatures.java index dff0246a..4bd4d34e 100644 --- a/src/main/java/org/betterx/betterend/registry/EndFeatures.java +++ b/src/main/java/org/betterx/betterend/registry/EndFeatures.java @@ -19,12 +19,12 @@ import net.minecraft.world.level.levelgen.placement.PlacedFeature; import com.google.common.collect.Lists; import com.google.gson.JsonArray; import com.google.gson.JsonObject; +import org.betterx.bclib.api.biomes.BCLBiome; import org.betterx.bclib.api.biomes.BCLBiomeBuilder; import org.betterx.bclib.api.biomes.BiomeAPI; import org.betterx.bclib.api.features.BCLCommonFeatures; import org.betterx.bclib.api.features.BCLFeatureBuilder; import org.betterx.bclib.util.JsonFactory; -import org.betterx.bclib.world.biomes.BCLBiome; import org.betterx.bclib.world.features.BCLFeature; import org.betterx.bclib.world.features.DefaultFeature; import org.betterx.bclib.world.features.ListFeature.StructureInfo; diff --git a/src/main/java/org/betterx/betterend/util/LootTableUtil.java b/src/main/java/org/betterx/betterend/util/LootTableUtil.java index 63a7f3bd..dcd87561 100644 --- a/src/main/java/org/betterx/betterend/util/LootTableUtil.java +++ b/src/main/java/org/betterx/betterend/util/LootTableUtil.java @@ -14,9 +14,9 @@ import net.fabricmc.fabric.api.loot.v1.FabricLootPoolBuilder; import net.fabricmc.fabric.api.loot.v1.FabricLootSupplierBuilder; import net.fabricmc.fabric.api.loot.v1.event.LootTableLoadingCallback; +import org.betterx.bclib.api.biomes.BCLBiome; import org.betterx.bclib.api.biomes.BiomeAPI; import org.betterx.bclib.complexmaterials.WoodenComplexMaterial; -import org.betterx.bclib.world.biomes.BCLBiome; import org.betterx.betterend.BetterEnd; import org.betterx.betterend.registry.EndBiomes; import org.betterx.betterend.registry.EndBlocks; diff --git a/src/main/java/org/betterx/betterend/world/biome/EndBiome.java b/src/main/java/org/betterx/betterend/world/biome/EndBiome.java index fcd0dd14..6b5250c6 100644 --- a/src/main/java/org/betterx/betterend/world/biome/EndBiome.java +++ b/src/main/java/org/betterx/betterend/world/biome/EndBiome.java @@ -9,13 +9,13 @@ import net.minecraft.world.level.block.Blocks; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.levelgen.SurfaceRules; +import org.betterx.bclib.api.biomes.BCLBiome; import org.betterx.bclib.api.biomes.BCLBiomeBuilder; import org.betterx.bclib.api.biomes.BCLBiomeBuilder.BiomeSupplier; +import org.betterx.bclib.api.biomes.BCLBiomeSettings; import org.betterx.bclib.api.biomes.BiomeAPI; import org.betterx.bclib.api.surface.SurfaceRuleBuilder; import org.betterx.bclib.interfaces.SurfaceMaterialProvider; -import org.betterx.bclib.world.biomes.BCLBiome; -import org.betterx.bclib.world.biomes.BCLBiomeSettings; import org.betterx.betterend.BetterEnd; import org.betterx.betterend.registry.EndBlocks; import org.betterx.betterend.registry.EndFeatures; diff --git a/src/main/java/org/betterx/betterend/world/biome/cave/EmptyAuroraCaveBiome.java b/src/main/java/org/betterx/betterend/world/biome/cave/EmptyAuroraCaveBiome.java index bcb13196..acafc13c 100644 --- a/src/main/java/org/betterx/betterend/world/biome/cave/EmptyAuroraCaveBiome.java +++ b/src/main/java/org/betterx/betterend/world/biome/cave/EmptyAuroraCaveBiome.java @@ -4,7 +4,7 @@ import net.minecraft.resources.ResourceLocation; import org.betterx.bclib.api.biomes.BCLBiomeBuilder; import org.betterx.bclib.api.biomes.BCLBiomeBuilder.BiomeSupplier; -import org.betterx.bclib.world.biomes.BCLBiomeSettings; +import org.betterx.bclib.api.biomes.BCLBiomeSettings; import org.betterx.betterend.registry.EndFeatures; import org.betterx.betterend.registry.EndParticles; import org.betterx.betterend.world.biome.EndBiome; diff --git a/src/main/java/org/betterx/betterend/world/biome/cave/EmptyEndCaveBiome.java b/src/main/java/org/betterx/betterend/world/biome/cave/EmptyEndCaveBiome.java index bdaee224..5068e534 100644 --- a/src/main/java/org/betterx/betterend/world/biome/cave/EmptyEndCaveBiome.java +++ b/src/main/java/org/betterx/betterend/world/biome/cave/EmptyEndCaveBiome.java @@ -4,7 +4,7 @@ import net.minecraft.resources.ResourceLocation; import org.betterx.bclib.api.biomes.BCLBiomeBuilder; import org.betterx.bclib.api.biomes.BCLBiomeBuilder.BiomeSupplier; -import org.betterx.bclib.world.biomes.BCLBiomeSettings; +import org.betterx.bclib.api.biomes.BCLBiomeSettings; import org.betterx.betterend.registry.EndFeatures; import org.betterx.betterend.world.biome.EndBiome; diff --git a/src/main/java/org/betterx/betterend/world/biome/cave/EmptySmaragdantCaveBiome.java b/src/main/java/org/betterx/betterend/world/biome/cave/EmptySmaragdantCaveBiome.java index 48754cb2..69951219 100644 --- a/src/main/java/org/betterx/betterend/world/biome/cave/EmptySmaragdantCaveBiome.java +++ b/src/main/java/org/betterx/betterend/world/biome/cave/EmptySmaragdantCaveBiome.java @@ -4,7 +4,7 @@ import net.minecraft.resources.ResourceLocation; import org.betterx.bclib.api.biomes.BCLBiomeBuilder; import org.betterx.bclib.api.biomes.BCLBiomeBuilder.BiomeSupplier; -import org.betterx.bclib.world.biomes.BCLBiomeSettings; +import org.betterx.bclib.api.biomes.BCLBiomeSettings; import org.betterx.betterend.registry.EndFeatures; import org.betterx.betterend.registry.EndParticles; import org.betterx.betterend.world.biome.EndBiome; diff --git a/src/main/java/org/betterx/betterend/world/biome/cave/EndCaveBiome.java b/src/main/java/org/betterx/betterend/world/biome/cave/EndCaveBiome.java index 1d9d6bed..c812900d 100644 --- a/src/main/java/org/betterx/betterend/world/biome/cave/EndCaveBiome.java +++ b/src/main/java/org/betterx/betterend/world/biome/cave/EndCaveBiome.java @@ -10,10 +10,10 @@ import net.minecraft.world.level.levelgen.feature.Feature; import org.betterx.bclib.api.biomes.BCLBiomeBuilder; import org.betterx.bclib.api.biomes.BCLBiomeBuilder.BiomeSupplier; +import org.betterx.bclib.api.biomes.BCLBiomeSettings; import org.betterx.bclib.api.biomes.BiomeAPI; import org.betterx.bclib.api.features.BCLCommonFeatures; import org.betterx.bclib.util.WeightedList; -import org.betterx.bclib.world.biomes.BCLBiomeSettings; import org.betterx.bclib.world.features.BCLFeature; import org.betterx.betterend.BetterEnd; import org.betterx.betterend.registry.EndSounds; diff --git a/src/main/java/org/betterx/betterend/world/biome/cave/JadeCaveBiome.java b/src/main/java/org/betterx/betterend/world/biome/cave/JadeCaveBiome.java index 8d99f6fd..cebacddd 100644 --- a/src/main/java/org/betterx/betterend/world/biome/cave/JadeCaveBiome.java +++ b/src/main/java/org/betterx/betterend/world/biome/cave/JadeCaveBiome.java @@ -7,7 +7,7 @@ import net.minecraft.world.level.block.state.BlockState; import org.betterx.bclib.api.biomes.BCLBiomeBuilder; import org.betterx.bclib.api.biomes.BCLBiomeBuilder.BiomeSupplier; -import org.betterx.bclib.world.biomes.BCLBiomeSettings; +import org.betterx.bclib.api.biomes.BCLBiomeSettings; import org.betterx.betterend.noise.OpenSimplexNoise; import org.betterx.betterend.registry.EndBlocks; import org.betterx.betterend.world.biome.EndBiome; diff --git a/src/main/java/org/betterx/betterend/world/biome/cave/LushAuroraCaveBiome.java b/src/main/java/org/betterx/betterend/world/biome/cave/LushAuroraCaveBiome.java index e8caa985..8fce5376 100644 --- a/src/main/java/org/betterx/betterend/world/biome/cave/LushAuroraCaveBiome.java +++ b/src/main/java/org/betterx/betterend/world/biome/cave/LushAuroraCaveBiome.java @@ -6,9 +6,9 @@ import net.minecraft.world.level.block.state.BlockState; import org.betterx.bclib.api.biomes.BCLBiomeBuilder; import org.betterx.bclib.api.biomes.BCLBiomeBuilder.BiomeSupplier; +import org.betterx.bclib.api.biomes.BCLBiomeSettings; import org.betterx.bclib.blocks.BlockProperties; import org.betterx.bclib.interfaces.SurfaceMaterialProvider; -import org.betterx.bclib.world.biomes.BCLBiomeSettings; import org.betterx.betterend.registry.EndBlocks; import org.betterx.betterend.registry.EndFeatures; import org.betterx.betterend.registry.EndParticles; diff --git a/src/main/java/org/betterx/betterend/world/biome/cave/LushSmaragdantCaveBiome.java b/src/main/java/org/betterx/betterend/world/biome/cave/LushSmaragdantCaveBiome.java index 1eb1c016..db38c4fd 100644 --- a/src/main/java/org/betterx/betterend/world/biome/cave/LushSmaragdantCaveBiome.java +++ b/src/main/java/org/betterx/betterend/world/biome/cave/LushSmaragdantCaveBiome.java @@ -5,8 +5,8 @@ import net.minecraft.world.level.block.state.BlockState; import org.betterx.bclib.api.biomes.BCLBiomeBuilder; import org.betterx.bclib.api.biomes.BCLBiomeBuilder.BiomeSupplier; +import org.betterx.bclib.api.biomes.BCLBiomeSettings; import org.betterx.bclib.interfaces.SurfaceMaterialProvider; -import org.betterx.bclib.world.biomes.BCLBiomeSettings; import org.betterx.betterend.registry.EndBlocks; import org.betterx.betterend.registry.EndFeatures; import org.betterx.betterend.registry.EndParticles; diff --git a/src/main/java/org/betterx/betterend/world/features/terrain/caves/EndCaveFeature.java b/src/main/java/org/betterx/betterend/world/features/terrain/caves/EndCaveFeature.java index 1699e287..b1a332ac 100644 --- a/src/main/java/org/betterx/betterend/world/features/terrain/caves/EndCaveFeature.java +++ b/src/main/java/org/betterx/betterend/world/features/terrain/caves/EndCaveFeature.java @@ -17,11 +17,11 @@ import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConf import com.google.common.collect.Lists; import com.google.common.collect.Sets; +import org.betterx.bclib.api.biomes.BCLBiome; import org.betterx.bclib.api.biomes.BiomeAPI; import org.betterx.bclib.api.tag.CommonBlockTags; import org.betterx.bclib.util.BlocksHelper; import org.betterx.bclib.util.MHelper; -import org.betterx.bclib.world.biomes.BCLBiome; import org.betterx.bclib.world.features.DefaultFeature; import org.betterx.bclib.world.generator.BiomePicker; import org.betterx.betterend.registry.EndBiomes; diff --git a/src/main/java/org/betterx/betterend/world/features/terrain/caves/TunelCaveFeature.java b/src/main/java/org/betterx/betterend/world/features/terrain/caves/TunelCaveFeature.java index af3db9a8..b7d2fe23 100644 --- a/src/main/java/org/betterx/betterend/world/features/terrain/caves/TunelCaveFeature.java +++ b/src/main/java/org/betterx/betterend/world/features/terrain/caves/TunelCaveFeature.java @@ -19,10 +19,10 @@ import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConf import com.google.common.collect.Maps; import com.google.common.collect.Sets; +import org.betterx.bclib.api.biomes.BCLBiome; import org.betterx.bclib.api.biomes.BiomeAPI; import org.betterx.bclib.api.tag.CommonBlockTags; import org.betterx.bclib.util.BlocksHelper; -import org.betterx.bclib.world.biomes.BCLBiome; import org.betterx.bclib.world.generator.BiomePicker; import org.betterx.betterend.noise.OpenSimplexNoise; import org.betterx.betterend.registry.EndBiomes; diff --git a/src/main/java/org/betterx/betterend/world/generator/TerrainGenerator.java b/src/main/java/org/betterx/betterend/world/generator/TerrainGenerator.java index 4b20bb8e..91b6377b 100644 --- a/src/main/java/org/betterx/betterend/world/generator/TerrainGenerator.java +++ b/src/main/java/org/betterx/betterend/world/generator/TerrainGenerator.java @@ -8,9 +8,9 @@ import net.minecraft.world.level.levelgen.LegacyRandomSource; import com.google.common.collect.Lists; import com.google.common.collect.Maps; +import org.betterx.bclib.api.biomes.BCLBiome; import org.betterx.bclib.api.biomes.BiomeAPI; import org.betterx.bclib.util.MHelper; -import org.betterx.bclib.world.biomes.BCLBiome; import org.betterx.betterend.noise.OpenSimplexNoise; import java.awt.*; diff --git a/src/main/java/org/betterx/betterend/world/structures/features/FeatureBaseStructure.java b/src/main/java/org/betterx/betterend/world/structures/features/FeatureBaseStructure.java index 243ece65..c6d914ae 100644 --- a/src/main/java/org/betterx/betterend/world/structures/features/FeatureBaseStructure.java +++ b/src/main/java/org/betterx/betterend/world/structures/features/FeatureBaseStructure.java @@ -32,6 +32,7 @@ public abstract class FeatureBaseStructure extends Structure { context.chunkGenerator(), context.heightAccessor(), context.randomState()); + //TODO: 1.19 Do we need isValidBiome? This should now be handled by the BiomeTags... if (pos.getZ() >= 20 && BCLStructure.isValidBiome(context)) { return Optional.of(new Structure.GenerationStub(pos, (structurePiecesBuilder) -> { generatePieces(structurePiecesBuilder, context);