Fix ore gen

This commit is contained in:
modmuss50 2020-08-02 14:05:52 +01:00
parent 619fd39df3
commit 46fe49ebe5
2 changed files with 29 additions and 12 deletions

View file

@ -28,9 +28,9 @@ public abstract class AbstractEnergyConsumingMachineCategory<R extends RebornRec
widgets.add(Widgets.createRecipeBase(bounds)); widgets.add(Widgets.createRecipeBase(bounds));
widgets.add(ReiPlugin.createEnergyDisplay(new Rectangle(bounds.x + 8, bounds.y + 8, 14, 50), recipeDisplay.getEnergy(), ReiPlugin.EntryAnimation.downwards(5000), point -> { widgets.add(ReiPlugin.createEnergyDisplay(new Rectangle(bounds.x + 8, bounds.y + 8, 14, 50), recipeDisplay.getEnergy(), ReiPlugin.EntryAnimation.downwards(5000), point -> {
List<Text> list = Lists.newArrayList(); List<Text> list = Lists.newArrayList();
list.add(Text.method_30163("Energy")); list.add(Text.of("Energy"));
list.add(new TranslatableText("techreborn.jei.recipe.running.cost", "E", recipeDisplay.getEnergy()).formatted(Formatting.GRAY)); list.add(new TranslatableText("techreborn.jei.recipe.running.cost", "E", recipeDisplay.getEnergy()).formatted(Formatting.GRAY));
list.add(Text.method_30163("")); list.add(Text.of(""));
list.add(ClientHelper.getInstance().getFormattedModFromIdentifier(new Identifier("techreborn", ""))); list.add(ClientHelper.getInstance().getFormattedModFromIdentifier(new Identifier("techreborn", "")));
return Tooltip.create(point, list); return Tooltip.create(point, list);
})); }));

View file

@ -24,11 +24,15 @@
package techreborn.world; package techreborn.world;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Lists;
import net.fabricmc.fabric.api.event.registry.RegistryEntryAddedCallback;
import net.minecraft.block.Blocks; import net.minecraft.block.Blocks;
import net.minecraft.structure.rule.BlockStateMatchRuleTest; import net.minecraft.structure.rule.BlockStateMatchRuleTest;
import net.minecraft.structure.rule.RuleTest; import net.minecraft.structure.rule.RuleTest;
import net.minecraft.util.Identifier; import net.minecraft.util.Identifier;
import net.minecraft.util.math.Direction; import net.minecraft.util.math.Direction;
import net.minecraft.util.registry.BuiltinRegistries;
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.biome.Biome.Category; import net.minecraft.world.biome.Biome.Category;
@ -50,7 +54,7 @@ import techreborn.init.TRContent;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
import java.util.Random; import java.util.function.Supplier;
/** /**
* @author drcrazy * @author drcrazy
@ -66,13 +70,13 @@ public class WorldGenerator {
public static void initBiomeFeatures() { public static void initBiomeFeatures() {
setupTrees(); setupTrees();
//
// for (Biome biome : Registry.BIOME) { for (Biome biome : BuiltinRegistries.BIOME) {
// addToBiome(biome); addToBiome(biome);
// } }
//
// //Handles modded biomes //Handles modded biomes
// RegistryEntryAddedCallback.event(Registry.BIOME).register((i, identifier, biome) -> addToBiome(biome)); RegistryEntryAddedCallback.event(BuiltinRegistries.BIOME).register((i, identifier, biome) -> addToBiome(biome));
} }
private static void setupTrees() { private static void setupTrees() {
@ -174,11 +178,24 @@ public class WorldGenerator {
GenerationStep.Feature.UNDERGROUND_ORES, GenerationStep.Feature.UNDERGROUND_ORES,
Feature.ORE.configure( Feature.ORE.configure(
new OreFeatureConfig(ruleTest, ore.block.getDefaultState(), ore.veinSize) new OreFeatureConfig(ruleTest, ore.block.getDefaultState(), ore.veinSize)
).method_30377(ore.veinsPerChunk) ).method_30377(ore.maxY).spreadHorizontally().repeat(ore.veinsPerChunk)
); );
} }
private static void addFeature(Biome biome, GenerationStep.Feature feature, ConfiguredFeature<?, ?> configuredFeature) { private static void addFeature(Biome biome, GenerationStep.Feature feature, ConfiguredFeature<?, ?> configuredFeature) {
// Nope List<List<Supplier<ConfiguredFeature<?, ?>>>> features = biome.getGenerationSettings().getFeatures();
int stepIndex = feature.ordinal();
while(features.size() <= stepIndex) {
features.add(Lists.newArrayList());
}
List<Supplier<ConfiguredFeature<?, ?>>> stepList = features.get(feature.ordinal());
if (stepList instanceof ImmutableList) {
features.set(feature.ordinal(), stepList = new ArrayList<>(stepList));
}
stepList.add(() -> configuredFeature);
} }
} }