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

New feature system for vanilla and datapack biomes

Browse source
This commit is contained in:
paulevsGitch 2020-10-19 00:11:51 +03:00
parent 6b846b5bb7
commit a06e3287d4
10 changed files with 127 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

2
gradle.properties
View file

@ -8,7 +8,7 @@
loader_version = 0.10.1+build.209 loader_version = 0.10.1+build.209
# Mod Properties # Mod Properties
mod_version = 0.1.1-alpha mod_version = 0.2.0-alpha
maven_group = ru.betterend maven_group = ru.betterend
archives_base_name = better-end archives_base_name = better-end

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

@ -1,11 +1,19 @@
package ru.betterend.mixin.common; package ru.betterend.mixin.common;
import java.util.ArrayList;
import java.util.List;
import java.util.Set;
import java.util.function.Supplier;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.Shadow;
import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import net.minecraft.world.ChunkRegion; import net.minecraft.world.ChunkRegion;
import net.minecraft.world.biome.Biome; import net.minecraft.world.biome.Biome;
@ -13,24 +21,41 @@ import net.minecraft.world.biome.GenerationSettings;
import net.minecraft.world.gen.ChunkRandom; import net.minecraft.world.gen.ChunkRandom;
import net.minecraft.world.gen.StructureAccessor; import net.minecraft.world.gen.StructureAccessor;
import net.minecraft.world.gen.chunk.ChunkGenerator; import net.minecraft.world.gen.chunk.ChunkGenerator;
import net.minecraft.world.gen.feature.ConfiguredFeature;
import net.minecraft.world.gen.feature.ConfiguredStructureFeature;
import ru.betterend.registry.FeatureRegistry; import ru.betterend.registry.FeatureRegistry;
import ru.betterend.registry.StructureRegistry;
@Mixin(Biome.class) @Mixin(Biome.class)
public abstract class BiomeMixin { public abstract class BiomeMixin {
private static final Set<Biome> INJECTED = Sets.newHashSet();
@Shadow @Shadow
private Biome.Category category; private Biome.Category category;
@Shadow @Shadow
private GenerationSettings generationSettings; private GenerationSettings generationSettings;
private boolean injected = false;
@Inject(method = "generateFeatureStep", at = @At("HEAD")) @Inject(method = "generateFeatureStep", at = @At("HEAD"))
public void generateFeatureStep(StructureAccessor structureAccessor, ChunkGenerator chunkGenerator, ChunkRegion region, long populationSeed, ChunkRandom random, BlockPos pos, CallbackInfo cinfo) { public void generateFeatureStep(StructureAccessor structureAccessor, ChunkGenerator chunkGenerator, ChunkRegion region, long populationSeed, ChunkRandom random, BlockPos pos, CallbackInfo cinfo) {
if (!injected) { Biome biome = (Biome) (Object) this;
if (!INJECTED.contains(biome)) {
if (category.equals(Biome.Category.THEEND)) { if (category.equals(Biome.Category.THEEND)) {
FeatureRegistry.registerGlobals(generationSettings.getFeatures()); GenerationSettingsAccessor accessor = (GenerationSettingsAccessor) generationSettings;
List<Supplier<ConfiguredStructureFeature<?, ?>>> structures = Lists.newArrayList(accessor.getStructures());
List<List<Supplier<ConfiguredFeature<?, ?>>>> preFeatures = accessor.getFeatures();
List<List<Supplier<ConfiguredFeature<?, ?>>>> features = new ArrayList<List<Supplier<ConfiguredFeature<?, ?>>>>(preFeatures.size());
preFeatures.forEach((list) -> {
features.add(Lists.newArrayList(list));
});
FeatureRegistry.registerGlobals(features);
StructureRegistry.registerBiomeStructures(biome, structures);
accessor.setFeatures(features);
accessor.setStructures(structures);
} }
this.injected = true; INJECTED.add(biome);
} }
} }
} }

17
src/main/java/ru/betterend/mixin/common/DefaultBiomeCreatorMixin.java
View file

@ -1,8 +1,10 @@
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.Overwrite;
import org.spongepowered.asm.mixin.Shadow; 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.CallbackInfoReturnable;
import net.minecraft.world.biome.Biome; import net.minecraft.world.biome.Biome;
import net.minecraft.world.biome.DefaultBiomeCreator; import net.minecraft.world.biome.DefaultBiomeCreator;
@ -10,7 +12,6 @@ import net.minecraft.world.biome.GenerationSettings;
import net.minecraft.world.gen.GenerationStep; import net.minecraft.world.gen.GenerationStep;
import net.minecraft.world.gen.feature.ConfiguredFeatures; import net.minecraft.world.gen.feature.ConfiguredFeatures;
import net.minecraft.world.gen.surfacebuilder.ConfiguredSurfaceBuilders; import net.minecraft.world.gen.surfacebuilder.ConfiguredSurfaceBuilders;
import ru.betterend.registry.DefaultBiomeFeatureRegistry;
@Mixin(DefaultBiomeCreator.class) @Mixin(DefaultBiomeCreator.class)
public class DefaultBiomeCreatorMixin { public class DefaultBiomeCreatorMixin {
@ -19,14 +20,12 @@ public class DefaultBiomeCreatorMixin {
return null; return null;
}; };
@Overwrite @Inject(method = "createEndHighlands", at = @At("HEAD"), cancellable = true)
public static Biome createEndHighlands() { private static void createEndHighlands(CallbackInfoReturnable<Biome> info) {
GenerationSettings.Builder builder = (new GenerationSettings.Builder()) GenerationSettings.Builder builder = (new GenerationSettings.Builder())
.surfaceBuilder(ConfiguredSurfaceBuilders.END) .surfaceBuilder(ConfiguredSurfaceBuilders.END)
//.structureFeature(ConfiguredStructureFeatures.END_CITY) .feature(GenerationStep.Feature.SURFACE_STRUCTURES, ConfiguredFeatures.END_GATEWAY);
.feature(GenerationStep.Feature.SURFACE_STRUCTURES, ConfiguredFeatures.END_GATEWAY) info.setReturnValue(composeEndSpawnSettings(builder));
//.feature(GenerationStep.Feature.VEGETAL_DECORATION, ConfiguredFeatures.CHORUS_PLANT) info.cancel();
.structureFeature(DefaultBiomeFeatureRegistry.MOUNTAINS.getFeatureConfigured());
return composeEndSpawnSettings(builder);
} }
} }

26
src/main/java/ru/betterend/mixin/common/GenerationSettingsAccessor.java Normal file
View file

@ -0,0 +1,26 @@
package ru.betterend.mixin.common;
import java.util.List;
import java.util.function.Supplier;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.gen.Accessor;
import net.minecraft.world.biome.GenerationSettings;
import net.minecraft.world.gen.feature.ConfiguredFeature;
import net.minecraft.world.gen.feature.ConfiguredStructureFeature;
@Mixin(GenerationSettings.class)
public interface GenerationSettingsAccessor {
@Accessor("features")
List<List<Supplier<ConfiguredFeature<?, ?>>>> getFeatures();
@Accessor("features")
void setFeatures(List<List<Supplier<ConfiguredFeature<?, ?>>>> features);
@Accessor("structureFeatures")
List<Supplier<ConfiguredStructureFeature<?, ?>>> getStructures();
@Accessor("structureFeatures")
void setStructures(List<Supplier<ConfiguredStructureFeature<?, ?>>> structures);
}

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

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

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

@ -5,5 +5,5 @@ import ru.betterend.world.structures.EndStructureFeature;
import ru.betterend.world.structures.features.StructureMountain; 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);
} }

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

@ -5,7 +5,6 @@ import java.util.function.Supplier;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import net.minecraft.world.gen.GenerationStep.Feature;
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;
@ -18,8 +17,6 @@ import ru.betterend.world.features.PythadendronTreeFeature;
import ru.betterend.world.features.SinglePlantFeature; import ru.betterend.world.features.SinglePlantFeature;
import ru.betterend.world.features.UnderwaterPlantFeature; import ru.betterend.world.features.UnderwaterPlantFeature;
import ru.betterend.world.features.VineFeature; import ru.betterend.world.features.VineFeature;
import ru.betterend.world.structures.EndStructureFeature;
import ru.betterend.world.structures.features.StructureMegaLake;
public class FeatureRegistry { public class FeatureRegistry {
private final static List<EndFeature> GLOBAL_FEATURES = Lists.newArrayList(); private final static List<EndFeature> GLOBAL_FEATURES = Lists.newArrayList();
@ -51,9 +48,6 @@ 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);
// Structures //
public static final EndStructureFeature MEGALAKE = new EndStructureFeature("megalake", new StructureMegaLake(), Feature.RAW_GENERATION, 4, 1);
public static void registerGlobals(List<List<Supplier<ConfiguredFeature<?, ?>>>> features) { public static void registerGlobals(List<List<Supplier<ConfiguredFeature<?, ?>>>> features) {
GLOBAL_FEATURES.forEach(feature -> { GLOBAL_FEATURES.forEach(feature -> {
int index = feature.getFeatureStep().ordinal(); int index = feature.getFeatureStep().ordinal();

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

@ -1,11 +1,22 @@
package ru.betterend.registry; package ru.betterend.registry;
import java.util.Collection;
import java.util.List;
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.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 ru.betterend.BetterEnd; import ru.betterend.BetterEnd;
import ru.betterend.world.structures.EndStructureFeature; import ru.betterend.world.structures.EndStructureFeature;
import ru.betterend.world.structures.features.StructureGiantMossyGlowshroom; import ru.betterend.world.structures.features.StructureGiantMossyGlowshroom;
import ru.betterend.world.structures.features.StructureMegaLake;
import ru.betterend.world.structures.features.StructureMountain;
import ru.betterend.world.structures.piece.CavePiece; import ru.betterend.world.structures.piece.CavePiece;
import ru.betterend.world.structures.piece.LakePiece; import ru.betterend.world.structures.piece.LakePiece;
import ru.betterend.world.structures.piece.MountainPiece; import ru.betterend.world.structures.piece.MountainPiece;
@ -18,10 +29,22 @@ public class StructureRegistry {
public static final StructurePieceType LAKE_PIECE = register("lake_piece", LakePiece::new); public static final StructurePieceType LAKE_PIECE = register("lake_piece", LakePiece::new);
public static final EndStructureFeature GIANT_MOSSY_GLOWSHROOM = new EndStructureFeature("giant_mossy_glowshroom", new StructureGiantMossyGlowshroom(), Feature.SURFACE_STRUCTURES, 16, 8); public static final EndStructureFeature GIANT_MOSSY_GLOWSHROOM = new EndStructureFeature("giant_mossy_glowshroom", new StructureGiantMossyGlowshroom(), Feature.SURFACE_STRUCTURES, 16, 8);
public static final EndStructureFeature MEGALAKE = new EndStructureFeature("megalake", new StructureMegaLake(), Feature.RAW_GENERATION, 4, 1);
public static final EndStructureFeature MOUNTAINS = new EndStructureFeature("mountains", new StructureMountain(), Feature.RAW_GENERATION, 3, 2);
public static void register() {} public static void register() {}
private static StructurePieceType register(String id, StructurePieceType pieceType) { private static StructurePieceType register(String id, StructurePieceType pieceType) {
return Registry.register(Registry.STRUCTURE_PIECE, BetterEnd.makeID(id), pieceType); return Registry.register(Registry.STRUCTURE_PIECE, BetterEnd.makeID(id), pieceType);
} }
public static void registerBiomeStructures(Biome biome, Collection<Supplier<ConfiguredStructureFeature<?, ?>>> collection) {
if (BiomeRegistry.getFromBiome(biome) == BiomeRegistry.END_HIGHLANDS) {
addFeature(MOUNTAINS, collection);
}
}
private static void addFeature(EndStructureFeature feature, Collection<Supplier<ConfiguredStructureFeature<?, ?>>> collection) {
collection.add(() -> { return feature.getFeatureConfigured(); });
}
} }

4
src/main/java/ru/betterend/world/biome/BiomeMegalake.java
View file

@ -4,6 +4,7 @@ import net.minecraft.entity.EntityType;
import net.minecraft.world.gen.feature.ConfiguredStructureFeatures; import net.minecraft.world.gen.feature.ConfiguredStructureFeatures;
import ru.betterend.registry.BlockRegistry; import ru.betterend.registry.BlockRegistry;
import ru.betterend.registry.FeatureRegistry; import ru.betterend.registry.FeatureRegistry;
import ru.betterend.registry.StructureRegistry;
public class BiomeMegalake extends EndBiome { public class BiomeMegalake extends EndBiome {
public BiomeMegalake() { public BiomeMegalake() {
@ -11,8 +12,9 @@ public class BiomeMegalake extends EndBiome {
.setFogColor(178, 209, 248) .setFogColor(178, 209, 248)
.setWaterColor(96, 163, 255) .setWaterColor(96, 163, 255)
.setWaterFogColor(96, 163, 255) .setWaterFogColor(96, 163, 255)
.setFogDensity(1.75F)
.setSurface(BlockRegistry.ENDSTONE_DUST) .setSurface(BlockRegistry.ENDSTONE_DUST)
.addStructureFeature(FeatureRegistry.MEGALAKE) .addStructureFeature(StructureRegistry.MEGALAKE)
.addStructureFeature(ConfiguredStructureFeatures.END_CITY) .addStructureFeature(ConfiguredStructureFeatures.END_CITY)
.addFeature(FeatureRegistry.BUBBLE_CORAL) .addFeature(FeatureRegistry.BUBBLE_CORAL)
.addFeature(FeatureRegistry.END_LILY) .addFeature(FeatureRegistry.END_LILY)

2
src/main/resources/betterend.mixins.common.json
View file

@ -6,8 +6,8 @@
"mixins": [ "mixins": [
"ServerPlayNetworkHandlerMixin", "ServerPlayNetworkHandlerMixin",
"CraftingScreenHandlerMixin", "CraftingScreenHandlerMixin",
"GenerationSettingsAccessor",
"DefaultBiomeCreatorMixin", "DefaultBiomeCreatorMixin",
"GenerationSettingsMixin",
"AnvilScreenHandlerMixin", "AnvilScreenHandlerMixin",
"ChorusPlantFeatureMixin", "ChorusPlantFeatureMixin",
"ChorusFlowerBlockMixin", "ChorusFlowerBlockMixin",