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

Biome features changes

Browse source
This commit is contained in:
paulevsGitch 2020-10-19 00:19:41 +03:00
parent a06e3287d4
commit 465db15e4a
5 changed files with 20 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/ru/betterend/mixin/common/BiomeMixin.java
View file

@ -49,7 +49,7 @@ public abstract class BiomeMixin {
features.add(Lists.newArrayList(list)); features.add(Lists.newArrayList(list));
}); });
FeatureRegistry.registerGlobals(features); FeatureRegistry.registerBiomeFeatures(biome, features);
StructureRegistry.registerBiomeStructures(biome, structures); StructureRegistry.registerBiomeStructures(biome, structures);
accessor.setFeatures(features); accessor.setFeatures(features);

35
src/main/java/ru/betterend/mixin/common/GenerationSettingsMixin.java
View file

@ -1,35 +0,0 @@
package ru.betterend.mixin.common;
import java.util.List;
import java.util.Map;
import java.util.function.Supplier;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import com.google.common.collect.Lists;
import net.minecraft.world.biome.GenerationSettings;
import net.minecraft.world.gen.GenerationStep;
import net.minecraft.world.gen.carver.ConfiguredCarver;
import net.minecraft.world.gen.feature.ConfiguredFeature;
import net.minecraft.world.gen.feature.ConfiguredStructureFeature;
import net.minecraft.world.gen.surfacebuilder.ConfiguredSurfaceBuilder;
@Mixin(GenerationSettings.class)
public abstract class GenerationSettingsMixin {
/*@Shadow
private List<List<Supplier<ConfiguredFeature<?, ?>>>> features;
@Inject(method = "<init>", at = @At("TAIL"))
void init(Supplier<ConfiguredSurfaceBuilder<?>> surfaceBuilder, Map<GenerationStep.Carver, List<Supplier<ConfiguredCarver<?>>>> carvers, List<List<Supplier<ConfiguredFeature<?, ?>>>> features, List<Supplier<ConfiguredStructureFeature<?, ?>>> structureFeatures, CallbackInfo cinfo) {
List<List<Supplier<ConfiguredFeature<?, ?>>>> mutableFeatures = Lists.newArrayList(this.features);
this.features.forEach(supplierList -> {
mutableFeatures.add(Lists.newArrayList(supplierList));
});
this.features = mutableFeatures;
}*/
}

4
src/main/java/ru/betterend/registry/DefaultBiomeFeatureRegistry.java
View file

@ -1,9 +1,5 @@
package ru.betterend.registry; package ru.betterend.registry;
import net.minecraft.world.gen.GenerationStep.Feature;
import ru.betterend.world.structures.EndStructureFeature;
import ru.betterend.world.structures.features.StructureMountain;
public class DefaultBiomeFeatureRegistry { public class DefaultBiomeFeatureRegistry {
//public static final EndStructureFeature MOUNTAINS = new EndStructureFeature("mountains", new StructureMountain(), Feature.RAW_GENERATION, 3, 2); //public static final EndStructureFeature MOUNTAINS = new EndStructureFeature("mountains", new StructureMountain(), Feature.RAW_GENERATION, 3, 2);
} }

17
src/main/java/ru/betterend/registry/FeatureRegistry.java
View file

@ -5,6 +5,7 @@ import java.util.function.Supplier;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import net.minecraft.world.biome.Biome;
import net.minecraft.world.gen.feature.ConfiguredFeature; import net.minecraft.world.gen.feature.ConfiguredFeature;
import ru.betterend.world.features.BlueVineFeature; import ru.betterend.world.features.BlueVineFeature;
import ru.betterend.world.features.DoublePlantFeature; import ru.betterend.world.features.DoublePlantFeature;
@ -19,8 +20,6 @@ import ru.betterend.world.features.UnderwaterPlantFeature;
import ru.betterend.world.features.VineFeature; import ru.betterend.world.features.VineFeature;
public class FeatureRegistry { public class FeatureRegistry {
private final static List<EndFeature> GLOBAL_FEATURES = Lists.newArrayList();
// Trees // // Trees //
public static final EndFeature MOSSY_GLOWSHROOM = new EndFeature("mossy_glowshroom", new MossyGlowshroomFeature(), 3); public static final EndFeature MOSSY_GLOWSHROOM = new EndFeature("mossy_glowshroom", new MossyGlowshroomFeature(), 3);
public static final EndFeature PYTHADENDRON_TREE = new EndFeature("pythadendron_tree", new PythadendronTreeFeature(), 2); public static final EndFeature PYTHADENDRON_TREE = new EndFeature("pythadendron_tree", new PythadendronTreeFeature(), 2);
@ -48,8 +47,12 @@ public class FeatureRegistry {
public static final EndFeature VIOLECITE_LAYER = EndFeature.makeLayerFeature("violecite_layer", BlockRegistry.VIOLECITE, 15, 4, 96, 8); public static final EndFeature VIOLECITE_LAYER = EndFeature.makeLayerFeature("violecite_layer", BlockRegistry.VIOLECITE, 15, 4, 96, 8);
public static final EndFeature FLAVOLITE_LAYER = EndFeature.makeLayerFeature("flavolite_layer", BlockRegistry.FLAVOLITE, 12, 4, 96, 6); public static final EndFeature FLAVOLITE_LAYER = EndFeature.makeLayerFeature("flavolite_layer", BlockRegistry.FLAVOLITE, 12, 4, 96, 6);
public static void registerGlobals(List<List<Supplier<ConfiguredFeature<?, ?>>>> features) { public static void registerBiomeFeatures(Biome biome, List<List<Supplier<ConfiguredFeature<?, ?>>>> features) {
GLOBAL_FEATURES.forEach(feature -> { addFeature(FLAVOLITE_LAYER, features);
addFeature(ENDER_ORE, features);
}
private static void addFeature(EndFeature feature, List<List<Supplier<ConfiguredFeature<?, ?>>>> features) {
int index = feature.getFeatureStep().ordinal(); int index = feature.getFeatureStep().ordinal();
if (features.size() > index) { if (features.size() > index) {
features.get(index).add(() -> { features.get(index).add(() -> {
@ -62,13 +65,7 @@ public class FeatureRegistry {
}); });
features.add(newFeature); features.add(newFeature);
} }
});
} }
public static void register() {} public static void register() {}
static {
GLOBAL_FEATURES.add(FLAVOLITE_LAYER);
GLOBAL_FEATURES.add(ENDER_ORE);
}
} }

4
src/main/java/ru/betterend/registry/StructureRegistry.java
View file

@ -1,16 +1,12 @@
package ru.betterend.registry; package ru.betterend.registry;
import java.util.Collection; import java.util.Collection;
import java.util.List;
import java.util.function.Supplier; import java.util.function.Supplier;
import com.google.common.collect.Lists;
import net.minecraft.structure.StructurePieceType; import net.minecraft.structure.StructurePieceType;
import net.minecraft.util.registry.Registry; import net.minecraft.util.registry.Registry;
import net.minecraft.world.biome.Biome; import net.minecraft.world.biome.Biome;
import net.minecraft.world.gen.GenerationStep.Feature; import net.minecraft.world.gen.GenerationStep.Feature;
import net.minecraft.world.gen.feature.ConfiguredFeature;
import net.minecraft.world.gen.feature.ConfiguredStructureFeature; import net.minecraft.world.gen.feature.ConfiguredStructureFeature;
import ru.betterend.BetterEnd; import ru.betterend.BetterEnd;
import ru.betterend.world.structures.EndStructureFeature; import ru.betterend.world.structures.EndStructureFeature;