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

Small fixes

Browse source
This commit is contained in:
paulevsGitch 2021-06-07 10:16:04 +03:00
parent 19b175f788
commit f89a4f5e2c
6 changed files with 9 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

2
gradle.properties
View file

@ -17,5 +17,5 @@ archives_base_name = better-end
patchouli_version = 50-FABRIC patchouli_version = 50-FABRIC
fabric_version = 0.32.9+1.16 fabric_version = 0.32.9+1.16
canvas_version = 1.0.+ canvas_version = 1.0.+
bclib_version = 0.1.17 bclib_version = 0.1.18
rei_version = 5.8.10 rei_version = 5.8.10

1
src/main/java/ru/betterend/integration/byg/BYGIntegration.java
View file

@ -16,7 +16,6 @@ import ru.betterend.integration.ModIntegration;
import ru.betterend.integration.byg.biomes.BYGBiomes; import ru.betterend.integration.byg.biomes.BYGBiomes;
import ru.betterend.integration.byg.features.BYGFeatures; import ru.betterend.integration.byg.features.BYGFeatures;
import ru.betterend.registry.EndBiomes; import ru.betterend.registry.EndBiomes;
import ru.betterend.world.biome.EndBiome;
public class BYGIntegration extends ModIntegration { public class BYGIntegration extends ModIntegration {
public BYGIntegration() { public BYGIntegration() {

20
src/main/java/ru/betterend/mixin/common/ChorusPlantBlockMixin.java
View file

@ -1,29 +1,9 @@
package ru.betterend.mixin.common; package ru.betterend.mixin.common;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
import net.minecraft.core.BlockPos;
import net.minecraft.core.Direction;
import net.minecraft.world.item.context.BlockPlaceContext;
import net.minecraft.world.level.BlockGetter;
import net.minecraft.world.level.Level;
import net.minecraft.world.level.LevelAccessor;
import net.minecraft.world.level.LevelReader;
import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.Blocks;
import net.minecraft.world.level.block.ChorusPlantBlock; import net.minecraft.world.level.block.ChorusPlantBlock;
import net.minecraft.world.level.block.state.BlockBehaviour;
import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.level.block.state.StateDefinition;
import net.minecraft.world.level.block.state.properties.BlockStateProperties;
import ru.bclib.api.TagAPI;
import ru.betterend.blocks.BlockProperties;
import ru.betterend.registry.EndBlocks;
import ru.betterend.world.generator.GeneratorOptions;
@Mixin(value = ChorusPlantBlock.class, priority = 100) @Mixin(value = ChorusPlantBlock.class, priority = 100)
public abstract class ChorusPlantBlockMixin extends Block { public abstract class ChorusPlantBlockMixin extends Block {

23
src/main/java/ru/betterend/mixin/common/MinecraftServerMixin.java
View file

@ -1,8 +1,6 @@
package ru.betterend.mixin.common; package ru.betterend.mixin.common;
import java.util.Collection;
import java.util.Map; import java.util.Map;
import java.util.concurrent.CompletableFuture;
import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Final;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
@ -12,7 +10,6 @@ import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
import net.fabricmc.loader.api.FabricLoader;
import net.minecraft.resources.ResourceKey; import net.minecraft.resources.ResourceKey;
import net.minecraft.server.MinecraftServer; import net.minecraft.server.MinecraftServer;
import net.minecraft.server.ServerResources; import net.minecraft.server.ServerResources;
@ -22,8 +19,6 @@ import net.minecraft.server.players.PlayerList;
import net.minecraft.world.level.Level; import net.minecraft.world.level.Level;
import net.minecraft.world.level.storage.ServerLevelData; import net.minecraft.world.level.storage.ServerLevelData;
import net.minecraft.world.level.storage.WorldData; import net.minecraft.world.level.storage.WorldData;
import ru.betterend.recipe.EndRecipeManager;
import ru.betterend.registry.EndBiomes;
import ru.betterend.world.generator.GeneratorOptions; import ru.betterend.world.generator.GeneratorOptions;
@Mixin(MinecraftServer.class) @Mixin(MinecraftServer.class)
@ -39,17 +34,6 @@ public class MinecraftServerMixin {
@Shadow @Shadow
protected WorldData worldData; protected WorldData worldData;
@Inject(method = "reloadResources", at = @At(value = "RETURN"), cancellable = true)
private void be_reloadResources(Collection<String> collection, CallbackInfoReturnable<CompletableFuture<Void>> info) {
be_injectRecipes();
}
@Inject(method = "loadLevel", at = @At(value = "RETURN"), cancellable = true)
private void be_loadLevel(CallbackInfo info) {
be_injectRecipes();
EndBiomes.initRegistry(MinecraftServer.class.cast(this));
}
@Inject(method = "overworld", at = @At(value = "HEAD"), cancellable = true) @Inject(method = "overworld", at = @At(value = "HEAD"), cancellable = true)
private final void be_overworld(CallbackInfoReturnable<ServerLevel> info) { private final void be_overworld(CallbackInfoReturnable<ServerLevel> info) {
if (GeneratorOptions.swapOverworldToEnd()) { if (GeneratorOptions.swapOverworldToEnd()) {
@ -91,11 +75,4 @@ public class MinecraftServerMixin {
public PlayerList getPlayerList() { public PlayerList getPlayerList() {
return null; return null;
} }
private void be_injectRecipes() {
if (FabricLoader.getInstance().isModLoaded("kubejs")) {
RecipeManagerAccessor accessor = (RecipeManagerAccessor) resources.getRecipeManager();
accessor.be_setRecipes(EndRecipeManager.getMap(accessor.be_getRecipes()));
}
}
} }

15
src/main/java/ru/betterend/registry/EndBiomes.java
View file

@ -19,7 +19,6 @@ import net.minecraft.core.Registry;
import net.minecraft.data.BuiltinRegistries; import net.minecraft.data.BuiltinRegistries;
import net.minecraft.resources.ResourceKey; import net.minecraft.resources.ResourceKey;
import net.minecraft.resources.ResourceLocation; import net.minecraft.resources.ResourceLocation;
import net.minecraft.server.MinecraftServer;
import net.minecraft.world.level.biome.Biome; import net.minecraft.world.level.biome.Biome;
import net.minecraft.world.level.biome.Biome.BiomeCategory; import net.minecraft.world.level.biome.Biome.BiomeCategory;
import net.minecraft.world.level.biome.Biomes; import net.minecraft.world.level.biome.Biomes;
@ -72,8 +71,6 @@ public class EndBiomes {
public static final BiomePicker CAVE_BIOMES = new BiomePicker(); public static final BiomePicker CAVE_BIOMES = new BiomePicker();
public static final List<BCLBiome> SUBBIOMES = Lists.newArrayList(); public static final List<BCLBiome> SUBBIOMES = Lists.newArrayList();
private static final JsonObject EMPTY_JSON = new JsonObject(); private static final JsonObject EMPTY_JSON = new JsonObject();
private static Registry<Biome> biomeRegistry;
private static BiomeMap caveBiomeMap; private static BiomeMap caveBiomeMap;
// Vanilla Land // Vanilla Land
@ -126,8 +123,6 @@ public class EndBiomes {
} }
public static void mutateRegistry(Registry<Biome> biomeRegistry) { public static void mutateRegistry(Registry<Biome> biomeRegistry) {
EndBiomes.biomeRegistry = biomeRegistry;
LAND_BIOMES.clearMutables(); LAND_BIOMES.clearMutables();
VOID_BIOMES.clearMutables(); VOID_BIOMES.clearMutables();
CAVE_BIOMES.clearMutables(); CAVE_BIOMES.clearMutables();
@ -224,16 +219,6 @@ public class EndBiomes {
} }
} }
/**
* Initialize registry if it was not initialized in world generation (when using mods/datapacks, that overrides the End generation)
* @param server - {@link MinecraftServer}
*/
public static void initRegistry(MinecraftServer server) {
if (biomeRegistry == null || biomeRegistry == BuiltinRegistries.BIOME) {
biomeRegistry = server.registryAccess().registryOrThrow(Registry.BIOME_REGISTRY);
}
}
/** /**
* Registers new {@link EndBiome} and adds it to picker, can be used to add existing mod biomes into the End. * Registers new {@link EndBiome} and adds it to picker, can be used to add existing mod biomes into the End.
* @param biome - {@link Biome} instance * @param biome - {@link Biome} instance

8
src/main/java/ru/betterend/registry/EndFeatures.java
View file

@ -17,6 +17,7 @@ import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfigur
import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration; import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration;
import net.minecraft.world.level.levelgen.placement.FeatureDecorator; import net.minecraft.world.level.levelgen.placement.FeatureDecorator;
import ru.bclib.api.BiomeAPI; import ru.bclib.api.BiomeAPI;
import ru.bclib.world.biomes.BCLBiome;
import ru.bclib.world.features.BCLFeature; import ru.bclib.world.features.BCLFeature;
import ru.bclib.world.features.DefaultFeature; import ru.bclib.world.features.DefaultFeature;
import ru.betterend.BetterEnd; import ru.betterend.BetterEnd;
@ -296,11 +297,14 @@ public class EndFeatures {
addFeature(ENDER_ORE, features); addFeature(ENDER_ORE, features);
addFeature(CRASHED_SHIP, features); addFeature(CRASHED_SHIP, features);
EndBiome endBiome = (EndBiome) BiomeAPI.getBiome(id); BCLBiome bclbiome = BiomeAPI.getBiome(id);
if (endBiome != null && endBiome.hasCaves() && !EndBiomes.VOID_BIOMES.containsImmutable(id)) { if (bclbiome instanceof EndBiome) {
EndBiome endBiome = (EndBiome) bclbiome;
if (endBiome.hasCaves() && !EndBiomes.VOID_BIOMES.containsImmutable(id)) {
addFeature(ROUND_CAVE, features); addFeature(ROUND_CAVE, features);
addFeature(TUNEL_CAVE, features); addFeature(TUNEL_CAVE, features);
} }
}
BCLFeature feature = BiomeAPI.getBiome(id).getStructuresFeature(); BCLFeature feature = BiomeAPI.getBiome(id).getStructuresFeature();
if (feature != null) { if (feature != null) {