MinecraftMods/BetterEnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Updated to latest BCLib API

Browse source
This commit is contained in:
Frank 2022-06-02 08:14:48 +02:00
parent ce0afb4cc7
commit c66e878847
18 changed files with 26 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

8
gradle.properties
View file

@ -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

2
src/main/java/org/betterx/betterend/entity/EndSlimeEntity.java
View file

@ -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;

4
src/main/java/org/betterx/betterend/mixin/common/ServerPlayerMixin.java
View file

@ -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(),

6
src/main/java/org/betterx/betterend/registry/EndBiomes.java
View file

@ -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;
}

2
src/main/java/org/betterx/betterend/registry/EndFeatures.java
View file

@ -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;

2
src/main/java/org/betterx/betterend/util/LootTableUtil.java
View file

@ -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;

4
src/main/java/org/betterx/betterend/world/biome/EndBiome.java
View file

@ -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;

2
src/main/java/org/betterx/betterend/world/biome/cave/EmptyAuroraCaveBiome.java
View file

@ -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;

2
src/main/java/org/betterx/betterend/world/biome/cave/EmptyEndCaveBiome.java
View file

@ -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;

2
src/main/java/org/betterx/betterend/world/biome/cave/EmptySmaragdantCaveBiome.java
View file

@ -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;

2
src/main/java/org/betterx/betterend/world/biome/cave/EndCaveBiome.java
View file

@ -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;

2
src/main/java/org/betterx/betterend/world/biome/cave/JadeCaveBiome.java
View file

@ -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;

2
src/main/java/org/betterx/betterend/world/biome/cave/LushAuroraCaveBiome.java
View file

@ -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;

2
src/main/java/org/betterx/betterend/world/biome/cave/LushSmaragdantCaveBiome.java
View file

@ -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;

2
src/main/java/org/betterx/betterend/world/features/terrain/caves/EndCaveFeature.java
View file

@ -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;

2
src/main/java/org/betterx/betterend/world/features/terrain/caves/TunelCaveFeature.java
View file

@ -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;

2
src/main/java/org/betterx/betterend/world/generator/TerrainGenerator.java
View file

@ -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.*;

1
src/main/java/org/betterx/betterend/world/structures/features/FeatureBaseStructure.java
View file

@ -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);