refactor ores

This commit is contained in:
dfsek
2021-07-02 09:58:12 -07:00
parent 7834509390
commit bff7e44984
12 changed files with 17 additions and 18 deletions

View File

@@ -24,7 +24,7 @@ import com.dfsek.terra.api.world.generator.Palette;
import com.dfsek.terra.carving.UserDefinedCarver;
import com.dfsek.terra.world.population.items.TerraStructure;
import com.dfsek.terra.addons.flora.flora.FloraLayer;
import com.dfsek.terra.world.population.items.ores.OreHolder;
import com.dfsek.terra.addons.ore.ores.OreHolder;
import com.dfsek.terra.world.population.items.tree.TreeLayer;
import java.util.ArrayList;

View File

@@ -1,11 +1,10 @@
package com.dfsek.terra.config.factories;
package com.dfsek.terra.addons.ore;
import com.dfsek.terra.api.TerraPlugin;
import com.dfsek.terra.api.block.state.BlockState;
import com.dfsek.terra.api.config.ConfigFactory;
import com.dfsek.terra.config.templates.OreTemplate;
import com.dfsek.terra.world.population.items.ores.Ore;
import com.dfsek.terra.world.population.items.ores.VanillaOre;
import com.dfsek.terra.addons.ore.ores.Ore;
import com.dfsek.terra.addons.ore.ores.VanillaOre;
public class OreFactory implements ConfigFactory<OreTemplate, Ore> {
@Override

View File

@@ -1,4 +1,4 @@
package com.dfsek.terra.world.population;
package com.dfsek.terra.addons.ore;
import com.dfsek.terra.api.TerraPlugin;
import com.dfsek.terra.api.profiler.ProfileFrame;

View File

@@ -1,4 +1,4 @@
package com.dfsek.terra.config.templates;
package com.dfsek.terra.addons.ore;
import com.dfsek.tectonic.annotations.Abstractable;
import com.dfsek.tectonic.annotations.Default;

View File

@@ -1,4 +1,4 @@
package com.dfsek.terra.world.population.items.ores;
package com.dfsek.terra.addons.ore.ores;
import com.dfsek.terra.api.TerraPlugin;
import com.dfsek.terra.api.block.state.BlockState;

View File

@@ -1,4 +1,4 @@
package com.dfsek.terra.world.population.items.ores;
package com.dfsek.terra.addons.ore.ores;
import com.dfsek.terra.api.util.Range;

View File

@@ -1,4 +1,4 @@
package com.dfsek.terra.world.population.items.ores;
package com.dfsek.terra.addons.ore.ores;
import com.dfsek.terra.api.util.GlueList;
import com.dfsek.terra.api.util.generic.pair.ImmutablePair;

View File

@@ -1,4 +1,4 @@
package com.dfsek.terra.world.population.items.ores;
package com.dfsek.terra.addons.ore.ores;
import com.dfsek.terra.api.TerraPlugin;
import com.dfsek.terra.api.block.state.BlockState;

View File

@@ -46,8 +46,8 @@ import com.dfsek.terra.addons.palette.palette.PaletteLayerLoader;
import com.dfsek.terra.addons.palette.palette.slant.SlantHolderLoader;
import com.dfsek.terra.addons.flora.flora.FloraLayer;
import com.dfsek.terra.addons.flora.flora.TerraFlora;
import com.dfsek.terra.world.population.items.ores.OreConfig;
import com.dfsek.terra.world.population.items.ores.OreHolder;
import com.dfsek.terra.addons.ore.ores.OreConfig;
import com.dfsek.terra.addons.ore.ores.OreHolder;
import com.dfsek.terra.world.population.items.tree.TreeLayer;
import java.util.LinkedHashMap;

View File

@@ -4,7 +4,7 @@ import com.dfsek.tectonic.loading.ConfigLoader;
import com.dfsek.tectonic.loading.TypeLoader;
import com.dfsek.terra.api.math.range.ConstantRange;
import com.dfsek.terra.api.util.Range;
import com.dfsek.terra.world.population.items.ores.OreConfig;
import com.dfsek.terra.addons.ore.ores.OreConfig;
import java.lang.reflect.Type;
import java.util.Map;

View File

@@ -3,9 +3,9 @@ package com.dfsek.terra.config.loaders.config;
import com.dfsek.tectonic.exception.LoadException;
import com.dfsek.tectonic.loading.ConfigLoader;
import com.dfsek.tectonic.loading.TypeLoader;
import com.dfsek.terra.world.population.items.ores.Ore;
import com.dfsek.terra.world.population.items.ores.OreConfig;
import com.dfsek.terra.world.population.items.ores.OreHolder;
import com.dfsek.terra.addons.ore.ores.Ore;
import com.dfsek.terra.addons.ore.ores.OreConfig;
import com.dfsek.terra.addons.ore.ores.OreHolder;
import java.lang.reflect.Type;
import java.util.Map;

View File

@@ -30,7 +30,7 @@ import com.dfsek.terra.config.templates.StructureTemplate;
import com.dfsek.terra.config.templates.TreeTemplate;
import com.dfsek.terra.registry.OpenRegistryImpl;
import com.dfsek.terra.world.population.items.TerraStructure;
import com.dfsek.terra.world.population.items.ores.Ore;
import com.dfsek.terra.addons.ore.ores.Ore;
import java.util.LinkedHashMap;
import java.util.function.BiConsumer;