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

Datapack & other mod biome features injector fix

Browse source
This commit is contained in:
paulevsGitch 2021-08-20 15:25:38 +03:00
parent 19aee44357
commit 64038e94fa
6 changed files with 11 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
gradle.properties
View file

@ -13,6 +13,6 @@ archives_base_name=better-end
# currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api # currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api
patchouli_version = 55-FABRIC-SNAPSHOT patchouli_version = 55-FABRIC-SNAPSHOT
fabric_version = 0.36.1+1.17 fabric_version = 0.36.1+1.17
bclib_version = 0.4.0 bclib_version = 0.4.1
rei_version = 6.0.264-alpha rei_version = 6.0.264-alpha
canvas_version = 1.0.+ canvas_version = 1.0.+

1
src/main/java/ru/betterend/BetterEnd.java
View file

@ -3,7 +3,6 @@ package ru.betterend;
import net.fabricmc.api.ModInitializer; import net.fabricmc.api.ModInitializer;
import net.fabricmc.loader.api.FabricLoader; import net.fabricmc.loader.api.FabricLoader;
import net.minecraft.resources.ResourceLocation; import net.minecraft.resources.ResourceLocation;
import ru.bclib.api.BiomeAPI;
import ru.bclib.api.WorldDataAPI; import ru.bclib.api.WorldDataAPI;
import ru.bclib.util.Logger; import ru.bclib.util.Logger;
import ru.betterend.api.BetterEndPlugin; import ru.betterend.api.BetterEndPlugin;

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

@ -8,6 +8,7 @@ import ru.bclib.world.biomes.BCLBiome;
import ru.bclib.world.generator.BiomeMap; import ru.bclib.world.generator.BiomeMap;
import ru.bclib.world.generator.BiomePicker; import ru.bclib.world.generator.BiomePicker;
import ru.betterend.config.Configs; import ru.betterend.config.Configs;
import ru.betterend.util.FeaturesHelper;
import ru.betterend.world.biome.EndBiome; import ru.betterend.world.biome.EndBiome;
import ru.betterend.world.biome.air.BiomeIceStarfield; import ru.betterend.world.biome.air.BiomeIceStarfield;
import ru.betterend.world.biome.cave.EmptyAuroraCaveBiome; import ru.betterend.world.biome.cave.EmptyAuroraCaveBiome;
@ -81,6 +82,7 @@ public class EndBiomes {
if (caveBiomeMap == null || caveBiomeMap.getSeed() != seed) { if (caveBiomeMap == null || caveBiomeMap.getSeed() != seed) {
caveBiomeMap = new BiomeMap(seed, GeneratorOptions.getBiomeSizeCaves(), CAVE_BIOMES); caveBiomeMap = new BiomeMap(seed, GeneratorOptions.getBiomeSizeCaves(), CAVE_BIOMES);
} }
FeaturesHelper.addFeatures(registry);
} }
/** /**

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

@ -392,6 +392,5 @@ public class EndFeatures {
} }
} }
public static void register() { public static void register() {}
}
} }

14
src/main/java/ru/betterend/util/FeaturesHelper.java
View file

@ -1,26 +1,25 @@
package ru.betterend.util; package ru.betterend.util;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
import net.minecraft.core.Registry; import net.minecraft.core.Registry;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.level.biome.Biome; import net.minecraft.world.level.biome.Biome;
import net.minecraft.world.level.levelgen.feature.ConfiguredFeature; import net.minecraft.world.level.levelgen.feature.ConfiguredFeature;
import net.minecraft.world.level.levelgen.feature.ConfiguredStructureFeature; import net.minecraft.world.level.levelgen.feature.ConfiguredStructureFeature;
import ru.bclib.api.BiomeAPI;
import ru.betterend.mixin.common.BiomeGenerationSettingsAccessor; import ru.betterend.mixin.common.BiomeGenerationSettingsAccessor;
import ru.betterend.registry.EndFeatures; import ru.betterend.registry.EndFeatures;
import ru.betterend.registry.EndStructures; import ru.betterend.registry.EndStructures;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Set;
import java.util.function.Supplier; import java.util.function.Supplier;
public class FeaturesHelper { public class FeaturesHelper {
private static final Set<Biome> INJECTED = Sets.newHashSet();
public static void addFeatures(Registry<Biome> biomeRegistry) { public static void addFeatures(Registry<Biome> biomeRegistry) {
biomeRegistry.forEach((biome) -> { biomeRegistry.forEach((biome) -> {
if (biome.getBiomeCategory() == Biome.BiomeCategory.THEEND && !INJECTED.contains(biome)) { ResourceLocation key = biomeRegistry.getKey(biome);
if (BiomeAPI.isEndBiome(key)) {
BiomeGenerationSettingsAccessor accessor = (BiomeGenerationSettingsAccessor) biome.getGenerationSettings(); BiomeGenerationSettingsAccessor accessor = (BiomeGenerationSettingsAccessor) biome.getGenerationSettings();
List<Supplier<ConfiguredStructureFeature<?, ?>>> structures = Lists.newArrayList(accessor.be_getStructures()); List<Supplier<ConfiguredStructureFeature<?, ?>>> structures = Lists.newArrayList(accessor.be_getStructures());
List<List<Supplier<ConfiguredFeature<?, ?>>>> preFeatures = accessor.be_getFeatures(); List<List<Supplier<ConfiguredFeature<?, ?>>>> preFeatures = accessor.be_getFeatures();
@ -30,12 +29,11 @@ public class FeaturesHelper {
features.add(Lists.newArrayList(list)); features.add(Lists.newArrayList(list));
}); });
EndFeatures.registerBiomeFeatures(biomeRegistry.getKey(biome), biome, features); EndFeatures.registerBiomeFeatures(key, biome, features);
EndStructures.registerBiomeStructures(biomeRegistry.getKey(biome), biome, structures); EndStructures.registerBiomeStructures(key, biome, structures);
accessor.be_setFeatures(features); accessor.be_setFeatures(features);
accessor.be_setStructures(structures); accessor.be_setStructures(structures);
INJECTED.add(biome);
} }
}); });
} }

2
src/main/resources/fabric.mod.json
View file

@ -45,7 +45,7 @@
"fabricloader": ">=0.11.6", "fabricloader": ">=0.11.6",
"fabric": ">=0.36.0", "fabric": ">=0.36.0",
"minecraft": ">=1.17", "minecraft": ">=1.17",
"bclib": ">=0.4.0" "bclib": ">=0.4.1"
}, },
"suggests": { "suggests": {
"byg": ">=1.1.3", "byg": ">=1.1.3",