Nice! All 1.18 ore-gen recreated using my data driven system

EwyBoy · Jan 13, 2022 · d7f7885 · d7f7885
1 parent 7ba7ae6
commit d7f7885
Show file tree

Hide file tree

Showing 23 changed files with 200 additions and 94 deletions.
diff --git a/TODO.md b/TODO.md
@@ -1,7 +1,7 @@
 # 3.0.0 Update
     [x] - Create Rarity system
     [ ] - Recreate all vanilla features in 1.18 format
-    [ ] - Dimension Filter
+    [x] - Dimension Filter
     [x] - Reimplement Deepslater
     [x] - Filler Tag system
     [ ] - Clean up Reconstructor

diff --git a/cheat_sheet.md b/cheat_sheet.md
@@ -0,0 +1,8 @@
+Feature :: maxVeinSize  
+Placeable :: spawnRate  
+
+CheckList:  
+
+
+
+
diff --git a/src/main/java/com/ewyboy/oretweaker/config/tweaking/construction/OreReconstruction.java b/src/main/java/com/ewyboy/oretweaker/config/tweaking/construction/OreReconstruction.java
@@ -222,8 +222,8 @@ private static PlacedFeature reconstructPlacedFeature(ConfiguredFeature<?, ?> co
         placementBuilder.add(InSquarePlacement.spread());
 
         switch (distribution) {
-            case TRIANGLE -> placementBuilder.add(HeightRangePlacement.uniform(VerticalAnchor.absolute(minY), VerticalAnchor.absolute(maxY)));
-            case UNIFORM -> placementBuilder.add(HeightRangePlacement.triangle(VerticalAnchor.absolute(minY), VerticalAnchor.absolute(maxY)));
+            case TRIANGLE -> placementBuilder.add(HeightRangePlacement.triangle(VerticalAnchor.absolute(minY), VerticalAnchor.absolute(maxY)));
+            case UNIFORM -> placementBuilder.add(HeightRangePlacement.uniform(VerticalAnchor.absolute(minY), VerticalAnchor.absolute(maxY)));
             case NONE -> {}
         }
 

diff --git a/src/main/java/com/ewyboy/oretweaker/json/template/Templates.java b/src/main/java/com/ewyboy/oretweaker/json/template/Templates.java
@@ -35,9 +35,15 @@
 import java.lang.reflect.Field;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
 
 public class Templates {
 
+    public static final List<String> MOUNTAIN = Collections.singletonList("MOUNTAIN");
+    public static final List<String> BADLANDS = Arrays.asList("minecraft:badlands", "minecraft:eroded_badlands", "minecraft:wooded_badlands");
+
     public static final class GeneratedTemplates {
         public static final DefaultTemplate DEFAULT_TEMPLATE = new DefaultTemplate();
         public static final DefaultNetherTemplate DEFAULT_NETHER_TEMPLATE = new DefaultNetherTemplate();
@@ -68,11 +74,11 @@ public static final class GeneratedTemplates {
         public static final RedstoneOreTweak REDSTONE_ORE_TWEAK = new RedstoneOreTweak();
 
         public static final AndesiteTweak ANDESITE_TWEAK = new AndesiteTweak();
-        public static final DeepslateTweak DEEPSLATE_TWEAK = new DeepslateTweak();
         public static final DioriteTweak DIORITE_TWEAK = new DioriteTweak();
         public static final DirtTweak DIRT_TWEAK = new DirtTweak();
+        public static final ClayTweak CLAY_TWEAK = new ClayTweak();
         public static final GraniteTweak GRANITE_TWEAK = new GraniteTweak();
-        public static final InfestedStoneTweak INFESTED_STONE_TWEAK = new InfestedStoneTweak();
+        public static final InfestedTweak INFESTED_STONE_TWEAK = new InfestedTweak();
         public static final TuffTweak TUFF_TWEAK = new TuffTweak();
 
         public static final AncientDebrisTweak ANCIENT_DEBRIS_TWEAK = new AncientDebrisTweak();
@@ -97,11 +103,11 @@ public static final class DefaultData {
         public static final RedstoneOreTweak REDSTONE_ORE_TWEAK = new RedstoneOreTweak();
 
         public static final AndesiteTweak ANDESITE_TWEAK = new AndesiteTweak();
-        public static final DeepslateTweak DEEPSLATE_TWEAK = new DeepslateTweak();
         public static final DioriteTweak DIORITE_TWEAK = new DioriteTweak();
         public static final DirtTweak DIRT_TWEAK = new DirtTweak();
+        public static final ClayTweak CLAY_TWEAK = new ClayTweak();
         public static final GraniteTweak GRANITE_TWEAK = new GraniteTweak();
-        public static final InfestedStoneTweak INFESTED_STONE_TWEAK = new InfestedStoneTweak();
+        public static final InfestedTweak INFESTED_STONE_TWEAK = new InfestedTweak();
         public static final TuffTweak TUFF_TWEAK = new TuffTweak();
 
         public static final AncientDebrisTweak ANCIENT_DEBRIS_TWEAK = new AncientDebrisTweak();

diff --git a/src/main/java/com/ewyboy/oretweaker/json/template/templates/defaults/common/GravelTweak.java b/src/main/java/com/ewyboy/oretweaker/json/template/templates/defaults/common/GravelTweak.java
@@ -29,23 +29,24 @@ public Path templateDirectory() {
     public void buildTemplateEntries() {
         entries.add(new OreEntry(
                 "minecraft:gravel",
-                Collections.singletonList("minecraft:stone"),
+                Collections.singletonList("base_stone_overworld"),
                 Distribution.UNIFORM,
-                1,
+                -64,
                 256,
-                32,
-                8,
+                33,
+                14,
                 0,
                 new BiomeFilters(emptyList, emptyList),
                 true
         ));
+
         entries.add(new OreEntry(
                 "minecraft:gravel",
                 Collections.singletonList("minecraft:netherrack"),
                 Distribution.UNIFORM,
                 5,
-                37,
-                32,
+                41,
+                33,
                 2,
                 0,
                 new BiomeFilters(emptyList, emptyList),

diff --git a/...com/ewyboy/oretweaker/json/template/templates/defaults/nether/ore/AncientDebrisTweak.java b/...com/ewyboy/oretweaker/json/template/templates/defaults/nether/ore/AncientDebrisTweak.java
@@ -29,25 +29,25 @@ public Path templateDirectory() {
     public void buildTemplateEntries() {
         entries.add(new OreEntry(
                 "minecraft:ancient_debris",
-                Collections.singletonList("minecraft:netherrack"),
-                Distribution.UNIFORM,
+                Collections.singletonList("base_stone_nether"),
+                Distribution.TRIANGLE,
                 8,
-                120,
-                1,
+                24,
+                3,
                 1,
-                0,
+                1.0F,
                 new BiomeFilters(emptyList, emptyList),
                 true
         ));
         entries.add(new OreEntry(
                 "minecraft:ancient_debris",
-                Collections.singletonList("minecraft:netherrack"),
+                Collections.singletonList("base_stone_nether"),
                 Distribution.UNIFORM,
                 8,
-                24,
+                118,
                 2,
                 1,
-                0,
+                1.0F,
                 new BiomeFilters(emptyList, emptyList),
                 true
         ));

diff --git a/...com/ewyboy/oretweaker/json/template/templates/defaults/nether/ore/NetherGoldOreTweak.java b/...com/ewyboy/oretweaker/json/template/templates/defaults/nether/ore/NetherGoldOreTweak.java
@@ -32,7 +32,7 @@ public void buildTemplateEntries() {
                 Collections.singletonList("minecraft:netherrack"),
                 Distribution.UNIFORM,
                 10,
-                118,
+                116,
                 10,
                 10,
                 0,
@@ -44,7 +44,7 @@ public void buildTemplateEntries() {
                 Collections.singletonList("minecraft:netherrack"),
                 Distribution.UNIFORM,
                 10,
-                118,
+                116,
                 10,
                 20,
                 0,

diff --git a/...m/ewyboy/oretweaker/json/template/templates/defaults/nether/ore/NetherQuartzOreTweak.java b/...m/ewyboy/oretweaker/json/template/templates/defaults/nether/ore/NetherQuartzOreTweak.java
@@ -32,9 +32,9 @@ public void buildTemplateEntries() {
                 Collections.singletonList("minecraft:netherrack"),
                 Distribution.UNIFORM,
                 10,
-                246,
+                116,
                 14,
-                10,
+                16,
                 0,
                 new BiomeFilters(emptyList, emptyList),
                 true
@@ -44,7 +44,7 @@ public void buildTemplateEntries() {
                 Collections.singletonList("minecraft:netherrack"),
                 Distribution.UNIFORM,
                 10,
-                246,
+                116,
                 14,
                 32,
                 0,

diff --git a/.../com/ewyboy/oretweaker/json/template/templates/defaults/nether/stone/BlackstoneTweak.java b/.../com/ewyboy/oretweaker/json/template/templates/defaults/nether/stone/BlackstoneTweak.java
@@ -33,7 +33,7 @@ public void buildTemplateEntries() {
                 Distribution.UNIFORM,
                 5,
                 31,
-                10,
+                33,
                 2,
                 0,
                 new BiomeFilters(emptyList, emptyList),

diff --git a/.../com/ewyboy/oretweaker/json/template/templates/defaults/nether/stone/MagmaBlockTweak.java b/.../com/ewyboy/oretweaker/json/template/templates/defaults/nether/stone/MagmaBlockTweak.java
@@ -31,10 +31,10 @@ public void buildTemplateEntries() {
                 "minecraft:magma_block",
                 Collections.singletonList("minecraft:netherrack"),
                 Distribution.UNIFORM,
-                26,
+                27,
                 36,
-                10,
-                15,
+                33,
+                4,
                 0,
                 new BiomeFilters(emptyList, emptyList),
                 true

diff --git a/...va/com/ewyboy/oretweaker/json/template/templates/defaults/nether/stone/SoulSandTweak.java b/...va/com/ewyboy/oretweaker/json/template/templates/defaults/nether/stone/SoulSandTweak.java
@@ -31,8 +31,8 @@ public void buildTemplateEntries() {
                 "minecraft:soul_sand",
                 Collections.singletonList("minecraft:netherrack"),
                 Distribution.UNIFORM,
-                1,
-                32,
+                0,
+                31,
                 12,
                 12,
                 0,

diff --git a/...com/ewyboy/oretweaker/json/template/templates/defaults/overworld/ores/CopperOreTweak.java b/...com/ewyboy/oretweaker/json/template/templates/defaults/overworld/ores/CopperOreTweak.java
@@ -48,7 +48,7 @@ public void buildTemplateEntries() {
                 20,
                 16,
                 0,
-                new BiomeFilters(emptyList, emptyList),
+                new BiomeFilters(emptyList, Collections.singletonList("minecraft:dripstone_caves")),
                 true
         ));
     }

diff --git a/...om/ewyboy/oretweaker/json/template/templates/defaults/overworld/ores/EmeraldOreTweak.java b/...om/ewyboy/oretweaker/json/template/templates/defaults/overworld/ores/EmeraldOreTweak.java
@@ -30,13 +30,13 @@ public void buildTemplateEntries() {
         entries.add(new OreEntry(
                 "minecraft:emerald_ore",
                 Collections.singletonList("stone_ore_replaceables"),
-                Distribution.UNIFORM,
-                4,
-                32,
-                1,
-                5,
+                Distribution.TRIANGLE,
+                -16,
+                480,
+                3,
+                100,
                 0,
-                new BiomeFilters(emptyList, Collections.singletonList("MOUNTAIN")),
+                new BiomeFilters(emptyList, Templates.BADLANDS),
                 true
         ));
     }

diff --git a/...a/com/ewyboy/oretweaker/json/template/templates/defaults/overworld/ores/GoldOreTweak.java b/...a/com/ewyboy/oretweaker/json/template/templates/defaults/overworld/ores/GoldOreTweak.java
@@ -31,11 +31,24 @@ public void buildTemplateEntries() {
                 "minecraft:gold_ore",
                 Collections.singletonList("stone_ore_replaceables"),
                 Distribution.UNIFORM,
-                1,
                 32,
+                256,
                 9,
-                2,
+                50,
                 0,
+                new BiomeFilters(emptyList, Templates.BADLANDS),
+                true
+        ));
+
+        entries.add(new OreEntry(
+                "minecraft:gold_ore",
+                Collections.singletonList("stone_ore_replaceables"),
+                Distribution.TRIANGLE,
+                -64,
+                32,
+                9,
+                4,
+                0.5f,
                 new BiomeFilters(emptyList, emptyList),
                 true
         ));
@@ -44,10 +57,10 @@ public void buildTemplateEntries() {
                 "minecraft:gold_ore",
                 Collections.singletonList("stone_ore_replaceables"),
                 Distribution.UNIFORM,
-                1,
-                32,
+                -64,
+                -48,
                 9,
-                2,
+                0.5f,
                 0.5f,
                 new BiomeFilters(emptyList, emptyList),
                 true

diff --git a/.../com/ewyboy/oretweaker/json/template/templates/defaults/overworld/ores/LapisOreTweak.java b/.../com/ewyboy/oretweaker/json/template/templates/defaults/overworld/ores/LapisOreTweak.java
@@ -30,15 +30,28 @@ public void buildTemplateEntries() {
         entries.add(new OreEntry(
                 "minecraft:lapis_ore",
                 Collections.singletonList("stone_ore_replaceables"),
-                Distribution.UNIFORM,
-                1,
-                30,
-                6,
-                3,
+                Distribution.TRIANGLE,
+                -32,
+                32,
+                7,
+                4,
                 0,
                 new BiomeFilters(emptyList, emptyList),
                 true
         ));
+
+        entries.add(new OreEntry(
+                "minecraft:lapis_ore",
+                Collections.singletonList("stone_ore_replaceables"),
+                Distribution.UNIFORM,
+                -64,
+                64,
+                7,
+                2,
+                1.0f,
+                new BiomeFilters(emptyList, emptyList),
+                true
+        ));
     }
 
     @Override

diff --git a/...m/ewyboy/oretweaker/json/template/templates/defaults/overworld/ores/RedstoneOreTweak.java b/...m/ewyboy/oretweaker/json/template/templates/defaults/overworld/ores/RedstoneOreTweak.java
@@ -31,9 +31,22 @@ public void buildTemplateEntries() {
                 "minecraft:redstone_ore",
                 Collections.singletonList("stone_ore_replaceables"),
                 Distribution.UNIFORM,
-                1,
-                16,
-                7,
+                -64,
+                15,
+                4,
+                8,
+                0,
+                new BiomeFilters(emptyList, emptyList),
+                true
+        ));
+
+        entries.add(new OreEntry(
+                "minecraft:redstone_ore",
+                Collections.singletonList("stone_ore_replaceables"),
+                Distribution.TRIANGLE,
+                -96,
+                -32,
+                8,
                 8,
                 0,
                 new BiomeFilters(emptyList, emptyList),

diff --git a/...om/ewyboy/oretweaker/json/template/templates/defaults/overworld/stones/AndesiteTweak.java b/...om/ewyboy/oretweaker/json/template/templates/defaults/overworld/stones/AndesiteTweak.java
@@ -29,12 +29,25 @@ public Path templateDirectory() {
     public void buildTemplateEntries() {
         entries.add(new OreEntry(
                 "minecraft:andesite",
-                Collections.singletonList("minecraft:stone"),
+                Collections.singletonList("base_stone_overworld"),
                 Distribution.UNIFORM,
-                1,
-                80,
-                32,
-                10,
+                64,
+                128,
+                64,
+                0.1666666666666f,
+                0,
+                new BiomeFilters(emptyList, emptyList),
+                true
+        ));
+
+        entries.add(new OreEntry(
+                "minecraft:andesite",
+                Collections.singletonList("base_stone_overworld"),
+                Distribution.UNIFORM,
+                0,
+                60,
+                64,
+                2,
                 0,
                 new BiomeFilters(emptyList, emptyList),
                 true
-Original file line number
+Diff line change
@@ Expand Up / @@ -32,7 +32,7 @@ public void buildTemplateEntries() { @@
                     Collections.singletonList("minecraft:netherrack"),
                     Distribution.UNIFORM,
 ,
-,
+,
 ,
 ,
 ,
@@ Expand All / @@ -44,7 +44,7 @@ public void buildTemplateEntries() { @@
                     Collections.singletonList("minecraft:netherrack"),
                     Distribution.UNIFORM,
 ,
-,
+,
 ,
 ,
 ,
@@ Expand Down @@