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

WIP: add ore generation

Browse source
This commit is contained in:
Aleksey 2020-09-30 18:00:47 +03:00
parent ba4bc366c8
commit 6b20a142a1
12 changed files with 93 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -29,9 +29,9 @@ public class BetterEnd implements ModInitializer {
FeatureRegistry.register();
BiomeRegistry.register();
BetterEndBiomeSource.register();
BlockTagRegistry.register();
CraftingRecipes.register();
AlloyingRecipes.register();
BlockTagRegistry.register();
}
public static Identifier getResId(String path) {

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

@ -0,0 +1,42 @@
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.Shadow;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.At.Shift;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import org.spongepowered.asm.mixin.injection.callback.LocalCapture;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.ChunkRegion;
import net.minecraft.world.biome.Biome;
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 ru.betterend.registry.FeatureRegistry;
@Mixin(Biome.class)
public abstract class BiomeMixin {
@Shadow
private Biome.Category category;
@Shadow
private GenerationSettings generationSettings;
@Inject(method = "generateFeatureStep", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/biome/GenerationSettings;getFeatures()Ljava/util/List;", shift = Shift.AFTER), locals = LocalCapture.CAPTURE_FAILHARD)
public void generateFeatureStep(StructureAccessor structureAccessor, ChunkGenerator chunkGenerator, ChunkRegion region, long populationSeed, ChunkRandom random, BlockPos pos, CallbackInfo cinfo, List<List<Supplier<ConfiguredFeature<?, ?>>>> list) {
if (category.equals(Biome.Category.THEEND)) {
int index = FeatureRegistry.ENDER_ORE.getFeatureStep().ordinal();
list.get(index).add(() -> {
return FeatureRegistry.ENDER_ORE.getFeatureConfigured();
});
}
}
}

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

@ -8,6 +8,10 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
import net.minecraft.world.biome.Biome;
import net.minecraft.world.biome.DefaultBiomeCreator;
import net.minecraft.world.biome.GenerationSettings;
import net.minecraft.world.gen.GenerationStep;
import ru.betterend.BetterEnd;
import ru.betterend.registry.FeatureRegistry;
@Mixin(DefaultBiomeCreator.class)
public abstract class DefaultBiomeCreatorMixin {

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

@ -0,0 +1,36 @@
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;
}
}

1
src/main/java/ru/betterend/recipe/AlloyingRecipes.java
View file

@ -2,6 +2,7 @@ package ru.betterend.recipe;
import net.minecraft.block.Blocks;
import net.minecraft.item.Items;
import ru.betterend.registry.ItemRegistry;
public class AlloyingRecipes {

1
src/main/java/ru/betterend/recipe/CraftingRecipes.java
View file

@ -5,6 +5,7 @@ import net.minecraft.block.Blocks;
import net.minecraft.item.Item;
import net.minecraft.item.Items;
import net.minecraft.util.registry.Registry;
import ru.betterend.registry.BlockRegistry;
public class CraftingRecipes {

1
src/main/java/ru/betterend/registry/BiomeRegistry.java
View file

@ -12,6 +12,7 @@ import net.minecraft.util.registry.RegistryKey;
import net.minecraft.world.biome.Biome;
import net.minecraft.world.biome.Biome.Category;
import net.minecraft.world.biome.BiomeKeys;
import ru.betterend.world.biome.BiomeFoggyMushroomland;
import ru.betterend.world.biome.EndBiome;
import ru.betterend.world.generator.BiomePicker;

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

@ -1,9 +1,11 @@
package ru.betterend.registry;
import net.fabricmc.fabric.api.tag.TagRegistry;
import net.minecraft.block.Block;
import net.minecraft.tag.Tag;
import net.minecraft.tag.Tag.Identified;
import ru.betterend.BetterEnd;
import ru.betterend.util.TagHelper;

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

@ -7,7 +7,7 @@ import ru.betterend.world.features.MossyGlowshroomFeature;
public class FeatureRegistry {
public static final EndFeature MOSSY_GLOWSHROOM = new EndFeature("mossy_glowshroom", new MossyGlowshroomFeature(), 1);
public static final EndFeature END_LAKE = EndFeature.makeLakeFeature("end_lake", new EndLakeFeature(), 100);
public static final EndFeature ENDER_ORE = EndFeature.makeOreFeature("ender_ore", BlockRegistry.ENDER_ORE, 2, 3, 0, 4, 128);
public static final EndFeature ENDER_ORE = EndFeature.makeOreFeature("ender_ore", BlockRegistry.ENDER_ORE, 6, 3, 0, 4, 96);
public static void register() {}
}

1
src/main/java/ru/betterend/registry/ItemRegistry.java
View file

@ -9,6 +9,7 @@ import net.minecraft.item.Item;
import net.minecraft.item.ItemGroup;
import net.minecraft.item.Items;
import net.minecraft.util.registry.Registry;
import ru.betterend.BetterEnd;
public class ItemRegistry {

1
src/main/java/ru/betterend/world/surface/DoubleBlockSurfaceBuilder.java
View file

@ -10,6 +10,7 @@ import net.minecraft.world.biome.Biome;
import net.minecraft.world.chunk.Chunk;
import net.minecraft.world.gen.surfacebuilder.SurfaceBuilder;
import net.minecraft.world.gen.surfacebuilder.TernarySurfaceConfig;
import ru.betterend.noise.OpenSimplexNoise;
import ru.betterend.util.MHelper;

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

@ -10,6 +10,8 @@
"TagGroupLoaderMixin",
"CraftingScreenHandlerMixin",
"DefaultBiomeCreatorMixin",
"GenerationSettingsMixin",
"BiomeMixin",
"TagAccessor"
],
"injectors": {