diff --git a/gradle.properties b/gradle.properties index b0f697a..ad1bd6c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,8 +3,8 @@ org.gradle.jvmargs = -Xmx1G # Fabric Properties # check these on https://fabricmc.net/use - minecraft_version = 20w30a - yarn_build = 8 + minecraft_version = 1.16.2-pre1 + yarn_build = 1 fabric_loader_version = 0.9.0+build.204 # Mod Properties @@ -13,9 +13,9 @@ org.gradle.jvmargs = -Xmx1G # Dependencies # currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api - fabric_api_version = 0.16.0+build.386-1.16 + fabric_api_version = 0.16.1+build.387-1.16 modmenu_version = 1.14.5+build.30 - cloth_config_version = 4.6.0 + cloth_config_version = 4.7.0-unstable autoconfig_version = 3.2.0-unstable libstructure_version = 1.4.1 - roughlyenoughitems_version = 4.10.3 + roughlyenoughitems_version = 5.0.0-unstable diff --git a/src/main/java/com/thebrokenrail/energonrelics/block/structure/StructureGeneratorBlock.java b/src/main/java/com/thebrokenrail/energonrelics/block/structure/StructureGeneratorBlock.java index 162aa11..b96b5f4 100644 --- a/src/main/java/com/thebrokenrail/energonrelics/block/structure/StructureGeneratorBlock.java +++ b/src/main/java/com/thebrokenrail/energonrelics/block/structure/StructureGeneratorBlock.java @@ -24,7 +24,7 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; import net.minecraft.util.registry.Registry; import net.minecraft.world.World; -import net.minecraft.world.biome.Biome; +import net.minecraft.world.biome.GenerationSettings; import net.minecraft.world.gen.GenerationStep; import net.minecraft.world.gen.chunk.StructureConfig; import net.minecraft.world.gen.feature.DefaultFeatureConfig; @@ -120,9 +120,9 @@ public class StructureGeneratorBlock extends SimpleBlockWithEntity { } } - public static void addToBiome(Biome biome) { + public static void addToBiome(GenerationSettings.class_5495 arg) { for (Map.Entry entry : blocks.entrySet()) { - biome.addStructureFeature(entry.getValue().feature.configure(DefaultFeatureConfig.INSTANCE)); + arg.method_30995(entry.getValue().feature.configure(DefaultFeatureConfig.INSTANCE)); } } diff --git a/src/main/java/com/thebrokenrail/energonrelics/block/structure/StructureGeneratorPiece.java b/src/main/java/com/thebrokenrail/energonrelics/block/structure/StructureGeneratorPiece.java index f4faf0c..a4eb18d 100644 --- a/src/main/java/com/thebrokenrail/energonrelics/block/structure/StructureGeneratorPiece.java +++ b/src/main/java/com/thebrokenrail/energonrelics/block/structure/StructureGeneratorPiece.java @@ -10,6 +10,7 @@ import net.minecraft.util.math.BlockBox; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.ChunkPos; import net.minecraft.world.ServerWorldAccess; +import net.minecraft.world.StructureWorldAccess; import net.minecraft.world.gen.StructureAccessor; import net.minecraft.world.gen.chunk.ChunkGenerator; @@ -41,7 +42,7 @@ class StructureGeneratorPiece extends StructurePiece { } @Override - public boolean generate(ServerWorldAccess world, StructureAccessor structureAccessor, ChunkGenerator chunkGenerator, Random random, BlockBox boundingBox, ChunkPos chunkPos, BlockPos blockPos) { + public boolean generate(StructureWorldAccess world, StructureAccessor structureAccessor, ChunkGenerator chunkGenerator, Random random, BlockBox boundingBox, ChunkPos chunkPos, BlockPos blockPos) { BlockState state = block.getDefaultState().rotate(rotation); world.setBlockState(pos, state, 3); @@ -50,7 +51,7 @@ class StructureGeneratorPiece extends StructurePiece { ((StructureGeneratorBlockEntity) entity).setSeed(random.nextLong()); } - block.schedule(world.getWorld(), pos); + block.schedule(world.toServerWorld(), pos); return true; } } diff --git a/src/main/java/com/thebrokenrail/energonrelics/client/block/entity/render/DefensiveLaserBlockEntityRenderer.java b/src/main/java/com/thebrokenrail/energonrelics/client/block/entity/render/DefensiveLaserBlockEntityRenderer.java index 8d1b742..2c12551 100644 --- a/src/main/java/com/thebrokenrail/energonrelics/client/block/entity/render/DefensiveLaserBlockEntityRenderer.java +++ b/src/main/java/com/thebrokenrail/energonrelics/client/block/entity/render/DefensiveLaserBlockEntityRenderer.java @@ -48,7 +48,7 @@ public class DefensiveLaserBlockEntityRenderer extends HighlightBlockEntityRende matrices.pop(); - if (client.getEntityRenderManager().shouldRenderHitboxes()) { + if (client.getEntityRenderDispatcher().shouldRenderHitboxes()) { matrices.push(); Matrix4f matrix4f = matrices.peek().getModel(); diff --git a/src/main/java/com/thebrokenrail/energonrelics/mixin/MixinDefaultBiomeFeatures.java b/src/main/java/com/thebrokenrail/energonrelics/mixin/MixinDefaultBiomeFeatures.java index 641ec8c..fd267c6 100644 --- a/src/main/java/com/thebrokenrail/energonrelics/mixin/MixinDefaultBiomeFeatures.java +++ b/src/main/java/com/thebrokenrail/energonrelics/mixin/MixinDefaultBiomeFeatures.java @@ -3,6 +3,7 @@ package com.thebrokenrail.energonrelics.mixin; import com.thebrokenrail.energonrelics.EnergonRelics; import com.thebrokenrail.energonrelics.block.structure.StructureGeneratorBlock; import net.minecraft.world.biome.Biome; +import net.minecraft.world.biome.GenerationSettings; import net.minecraft.world.gen.GenerationStep; import net.minecraft.world.gen.feature.DefaultBiomeFeatures; import org.spongepowered.asm.mixin.Mixin; @@ -13,12 +14,12 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; @Mixin(DefaultBiomeFeatures.class) public class MixinDefaultBiomeFeatures { @Inject(at = @At("RETURN"), method = "addDefaultOres") - private static void addDefaultOres(Biome biome, CallbackInfo info) { - biome.addFeature(GenerationStep.Feature.UNDERGROUND_ORES, EnergonRelics.VERIDIUM_ORE_FEATURE); + private static void addDefaultOres(GenerationSettings.class_5495 arg, CallbackInfo info) { + arg.method_30992(GenerationStep.Feature.UNDERGROUND_ORES, EnergonRelics.VERIDIUM_ORE_FEATURE); } @Inject(at = @At("RETURN"), method = "addDefaultUndergroundStructures") - private static void addDefaultUndergroundStructures(Biome biome, CallbackInfo info) { - StructureGeneratorBlock.addToBiome(biome); + private static void addDefaultUndergroundStructures(GenerationSettings.class_5495 arg, CallbackInfo info) { + StructureGeneratorBlock.addToBiome(arg); } }