Add a simple tool to visualise ore distribution.

This commit is contained in:
modmuss50 2021-11-26 20:01:08 +00:00
parent b5004d3c85
commit 3752154bcd
6 changed files with 211 additions and 36 deletions

View file

@ -82,7 +82,7 @@ import techreborn.items.UpgradeItem;
import techreborn.items.armor.QuantumSuitItem;
import techreborn.items.tool.MiningLevel;
import techreborn.utils.InitUtils;
import techreborn.world.TargetDimension;
import techreborn.world.OreDistribution;
import java.util.*;
import java.util.function.Function;
@ -376,21 +376,21 @@ public class TRContent {
private final static Map<Ores, Ores> deepslateMap = new HashMap<>();
public enum Ores implements ItemConvertible {
BAUXITE(6, 12, 10, 80, MiningLevel.IRON, TargetDimension.OVERWORLD),
CINNABAR(6, 5, 0, 128, MiningLevel.IRON, TargetDimension.NETHER),
GALENA(8, 12, 10, 80, MiningLevel.IRON, TargetDimension.OVERWORLD),
IRIDIUM(3, 4, 5, 80, MiningLevel.DIAMOND, TargetDimension.OVERWORLD),
LEAD(6, 16, 20, 80, MiningLevel.IRON, TargetDimension.OVERWORLD),
PERIDOT(6, 6, 0, 360, MiningLevel.DIAMOND, TargetDimension.END),
PYRITE(6, 6, 0, 128, MiningLevel.DIAMOND, TargetDimension.NETHER),
RUBY(6, 8, 10, 80, MiningLevel.IRON, TargetDimension.OVERWORLD),
SAPPHIRE(6, 7, 10, 80, MiningLevel.IRON, TargetDimension.OVERWORLD),
SHELDONITE(6, 4, 0, 360, MiningLevel.DIAMOND, TargetDimension.END),
SILVER(6, 16, 20, 80, MiningLevel.IRON, TargetDimension.OVERWORLD),
SODALITE(6, 4, 0, 360, MiningLevel.DIAMOND, TargetDimension.END),
SPHALERITE(6, 4, 0, 128, MiningLevel.IRON, TargetDimension.NETHER),
TIN(8, 16, 18, 80, MiningLevel.STONE, TargetDimension.OVERWORLD),
TUNGSTEN(6, 3, 0, 360, MiningLevel.DIAMOND, TargetDimension.END),
BAUXITE(MiningLevel.IRON, OreDistribution.BAUXITE),
CINNABAR(MiningLevel.IRON, OreDistribution.CINNABAR),
GALENA(MiningLevel.IRON, OreDistribution.GALENA),
IRIDIUM(MiningLevel.DIAMOND, OreDistribution.IRIDIUM),
LEAD(MiningLevel.IRON, OreDistribution.LEAD),
PERIDOT(MiningLevel.DIAMOND, OreDistribution.PERIDOT),
PYRITE(MiningLevel.DIAMOND, OreDistribution.PYRITE),
RUBY(MiningLevel.IRON, OreDistribution.RUBY),
SAPPHIRE(MiningLevel.IRON, OreDistribution.SAPPHIRE),
SHELDONITE(MiningLevel.DIAMOND, OreDistribution.SHELDONITE),
SILVER(MiningLevel.IRON, OreDistribution.SILVER),
SODALITE(MiningLevel.DIAMOND, OreDistribution.SODALITE),
SPHALERITE(MiningLevel.IRON, OreDistribution.SPHALERITE),
TIN(MiningLevel.STONE, OreDistribution.TIN),
TUNGSTEN(MiningLevel.DIAMOND, OreDistribution.TUNGSTEN),
DEEPSLATE_BAUXITE(BAUXITE, MiningLevel.IRON),
DEEPSLATE_GALENA(GALENA, MiningLevel.IRON),
@ -407,14 +407,9 @@ public class TRContent {
public final String name;
public final Block block;
public final int veinSize;
public final int veinsPerChunk;
public final int offsetBottom; // Min height of ore in number of blocks from the bottom of the world
public final int maxY; // Max height of ore in numbers of blocks from the bottom of the world
public final TargetDimension dimension;
public final OreDistribution distribution;
Ores(int veinSize, int veinsPerChunk, int offsetBottom, int maxY, MiningLevel miningLevel, TargetDimension dimension) {
this.dimension = dimension;
Ores(MiningLevel miningLevel, OreDistribution distribution) {
name = this.toString().toLowerCase(Locale.ROOT);
block = new OreBlock(FabricBlockSettings.of(Material.STONE)
.breakByTool(FabricToolTags.PICKAXES, miningLevel.intLevel)
@ -422,15 +417,13 @@ public class TRContent {
.sounds(BlockSoundGroup.STONE)
.strength(2f, 2f)
);
this.veinSize = veinSize;
this.veinsPerChunk = veinsPerChunk;
this.offsetBottom = offsetBottom;
this.maxY = maxY;
InitUtils.setup(block, name + "_ore");
this.distribution = distribution;
}
Ores(TRContent.Ores stoneOre, MiningLevel miningLevel) {
this(0, 0, 0, 0, miningLevel, null);
this(miningLevel, null);
deepslateMap.put(stoneOre, this);
}

View file

@ -0,0 +1,59 @@
/*
* This file is part of TechReborn, licensed under the MIT License (MIT).
*
* Copyright (c) 2020 TechReborn
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in all
* copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
package techreborn.world;
import net.minecraft.world.gen.YOffset;
public enum OreDistribution {
BAUXITE(6, 12, YOffset.aboveBottom(0), 20, TargetDimension.OVERWORLD),
CINNABAR(6, 5, YOffset.aboveBottom(0), 128, TargetDimension.NETHER),
GALENA(8, 12, YOffset.aboveBottom(25), 40, TargetDimension.OVERWORLD),
IRIDIUM(3, 4, YOffset.aboveBottom(0), 0, TargetDimension.OVERWORLD),
LEAD(6, 16, YOffset.aboveBottom(40), 40, TargetDimension.OVERWORLD),
PERIDOT(6, 6, YOffset.aboveBottom(0), 360, TargetDimension.END),
PYRITE(6, 6, YOffset.aboveBottom(0), 128, TargetDimension.NETHER),
RUBY(6, 8, YOffset.fixed(20), 120, TargetDimension.OVERWORLD),
SAPPHIRE(6, 7, YOffset.fixed(20), 120, TargetDimension.OVERWORLD),
SHELDONITE(6, 4, YOffset.aboveBottom(0), 360, TargetDimension.END),
SILVER(6, 16, YOffset.aboveBottom(40), 60,TargetDimension.OVERWORLD),
SODALITE(6, 4, YOffset.aboveBottom(0), 360, TargetDimension.END),
SPHALERITE(6, 4, YOffset.aboveBottom(0), 128, TargetDimension.NETHER),
TIN(8, 16, YOffset.fixed(25), 80, TargetDimension.OVERWORLD),
TUNGSTEN(6, 3, YOffset.aboveBottom(0), 360, TargetDimension.END);
public final int veinSize;
public final int veinsPerChunk;
public final YOffset minOffset;
public final int maxY; // Max height of ore in numbers of blocks from the bottom of the world
public final TargetDimension dimension;
OreDistribution(int veinSize, int veinsPerChunk, YOffset minOffset, int maxY, TargetDimension dimension) {
this.veinSize = veinSize;
this.veinsPerChunk = veinsPerChunk;
this.minOffset = minOffset;
this.maxY = maxY;
this.dimension = dimension;
}
}

View file

@ -53,7 +53,7 @@ public class OreFeature {
}
private ConfiguredFeature<?, ?> configureAndRegisterFeature() {
final OreFeatureConfig oreFeatureConfig = switch (ore.dimension) {
final OreFeatureConfig oreFeatureConfig = switch (ore.distribution.dimension) {
case OVERWORLD -> createOverworldFeatureConfig();
case NETHER -> createSimpleFeatureConfig(OreConfiguredFeatures.BASE_STONE_NETHER);
case END -> createSimpleFeatureConfig(new BlockStateMatchRuleTest(Blocks.END_STONE.getDefaultState()));
@ -69,14 +69,14 @@ public class OreFeature {
return new OreFeatureConfig(List.of(
OreFeatureConfig.createTarget(OreConfiguredFeatures.STONE_ORE_REPLACEABLES, this.ore.block.getDefaultState()),
OreFeatureConfig.createTarget(OreConfiguredFeatures.DEEPSLATE_ORE_REPLACEABLES, this.ore.getDeeplate().block.getDefaultState())
), ore.veinSize);
), ore.distribution.veinSize);
}
return createSimpleFeatureConfig(OreConfiguredFeatures.STONE_ORE_REPLACEABLES);
}
private OreFeatureConfig createSimpleFeatureConfig(RuleTest test) {
return new OreFeatureConfig(test, this.ore.block.getDefaultState(), ore.veinSize);
return new OreFeatureConfig(test, this.ore.block.getDefaultState(), ore.distribution.veinSize);
}
private PlacedFeature configureAndRegisterPlacedFeature() {
@ -87,10 +87,10 @@ public class OreFeature {
private List<PlacementModifier> getPlacementModifiers() {
return modifiers(
CountPlacementModifier.of(ore.veinsPerChunk),
CountPlacementModifier.of(ore.distribution.veinsPerChunk),
HeightRangePlacementModifier.uniform(
YOffset.aboveBottom(ore.offsetBottom),
YOffset.fixed(ore.maxY)
ore.distribution.minOffset,
YOffset.fixed(ore.distribution.maxY)
)
);
}
@ -104,7 +104,7 @@ public class OreFeature {
}
public Predicate<BiomeSelectionContext> getBiomeSelector() {
return ore.dimension.biomeSelector;
return ore.distribution.dimension.biomeSelector;
}
public RegistryKey<PlacedFeature> getPlacedFeatureRegistryKey() {

View file

@ -81,7 +81,7 @@ public class WorldGenerator {
private static List<OreFeature> getOreFeatures() {
return Arrays.stream(TRContent.Ores.values())
.filter(ores -> ores.dimension != null)
.filter(ores -> ores.distribution != null)
.map(OreFeature::new)
.toList();
}