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

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

@ -1,11 +1,19 @@
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.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 com.google.common.collect.Sets;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.ChunkRegion;
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.StructureAccessor;
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.StructureRegistry;
@Mixin(Biome.class)
public abstract class BiomeMixin {
private static final Set<Biome> INJECTED = Sets.newHashSet();
@Shadow
private Biome.Category category;
@Shadow
private GenerationSettings generationSettings;
private boolean injected = false;
@Inject(method = "generateFeatureStep", at = @At("HEAD"))
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)) {
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;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Overwrite;
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.DefaultBiomeCreator;
@ -10,7 +12,6 @@ import net.minecraft.world.biome.GenerationSettings;
import net.minecraft.world.gen.GenerationStep;
import net.minecraft.world.gen.feature.ConfiguredFeatures;
import net.minecraft.world.gen.surfacebuilder.ConfiguredSurfaceBuilders;
import ru.betterend.registry.DefaultBiomeFeatureRegistry;
@Mixin(DefaultBiomeCreator.class)
public class DefaultBiomeCreatorMixin {
@ -19,14 +20,12 @@ public class DefaultBiomeCreatorMixin {
return null;
};
@Overwrite
public static Biome createEndHighlands() {
@Inject(method = "createEndHighlands", at = @At("HEAD"), cancellable = true)
private static void createEndHighlands(CallbackInfoReturnable<Biome> info) {
GenerationSettings.Builder builder = (new GenerationSettings.Builder())
.surfaceBuilder(ConfiguredSurfaceBuilders.END)
//.structureFeature(ConfiguredStructureFeatures.END_CITY)
.feature(GenerationStep.Feature.SURFACE_STRUCTURES, ConfiguredFeatures.END_GATEWAY)
//.feature(GenerationStep.Feature.VEGETAL_DECORATION, ConfiguredFeatures.CHORUS_PLANT)
.structureFeature(DefaultBiomeFeatureRegistry.MOUNTAINS.getFeatureConfigured());
return composeEndSpawnSettings(builder);
.feature(GenerationStep.Feature.SURFACE_STRUCTURES, ConfiguredFeatures.END_GATEWAY);
info.setReturnValue(composeEndSpawnSettings(builder));
info.cancel();
}
}

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;
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.forEach(supplierList -> {
mutableFeatures.add(Lists.newArrayList(supplierList));
});
this.features = mutableFeatures;
}
}
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;
}*/
}