.18: Auto stash before rebase of "origin/version/1.18"

klikli-dev · Jul 12, 2023 · 5a5ea27 · 5a5ea27
1 parent 8c96b7a
commit 5a5ea27
Show file tree

Hide file tree

Showing 14 changed files with 15 additions and 29 deletions.
diff --git a/src/generated/resources/data/occultism/modonomicon/multiblocks/craft_afrit.json b/src/generated/resources/data/occultism/modonomicon/multiblocks/craft_afrit.json
@@ -43,8 +43,7 @@
     },
     "C": {
       "type": "modonomicon:tag",
-      "tag": "#minecraft:candles",
-      "display": "occultism:candle_white"
+      "tag": "#minecraft:candles"
     },
     "S": {
       "type": "modonomicon:block",

diff --git a/src/generated/resources/data/occultism/modonomicon/multiblocks/craft_djinni.json b/src/generated/resources/data/occultism/modonomicon/multiblocks/craft_djinni.json
@@ -35,8 +35,7 @@
     },
     "C": {
       "type": "modonomicon:tag",
-      "tag": "#minecraft:candles",
-      "display": "occultism:candle_white"
+      "tag": "#minecraft:candles"
     },
     "S": {
       "type": "modonomicon:block",

diff --git a/src/generated/resources/data/occultism/modonomicon/multiblocks/craft_foliot.json b/src/generated/resources/data/occultism/modonomicon/multiblocks/craft_foliot.json
@@ -27,8 +27,7 @@
     },
     "C": {
       "type": "modonomicon:tag",
-      "tag": "#minecraft:candles",
-      "display": "occultism:candle_white"
+      "tag": "#minecraft:candles"
     },
     "S": {
       "type": "modonomicon:block",

diff --git a/src/generated/resources/data/occultism/modonomicon/multiblocks/craft_marid.json b/src/generated/resources/data/occultism/modonomicon/multiblocks/craft_marid.json
@@ -47,8 +47,7 @@
     },
     "C": {
       "type": "modonomicon:tag",
-      "tag": "#minecraft:candles",
-      "display": "occultism:candle_white"
+      "tag": "#minecraft:candles"
     },
     "S": {
       "type": "modonomicon:block",

diff --git a/src/generated/resources/data/occultism/modonomicon/multiblocks/debug.json b/src/generated/resources/data/occultism/modonomicon/multiblocks/debug.json
@@ -31,8 +31,7 @@
     },
     "C": {
       "type": "modonomicon:tag",
-      "tag": "#minecraft:candles",
-      "display": "occultism:candle_white"
+      "tag": "#minecraft:candles"
     },
     "G": {
       "type": "modonomicon:block",

diff --git a/src/generated/resources/data/occultism/modonomicon/multiblocks/possess_afrit.json b/src/generated/resources/data/occultism/modonomicon/multiblocks/possess_afrit.json
@@ -43,8 +43,7 @@
     },
     "C": {
       "type": "modonomicon:tag",
-      "tag": "#minecraft:candles",
-      "display": "occultism:candle_white"
+      "tag": "#minecraft:candles"
     },
     "W": {
       "type": "modonomicon:block",

diff --git a/src/generated/resources/data/occultism/modonomicon/multiblocks/possess_djinni.json b/src/generated/resources/data/occultism/modonomicon/multiblocks/possess_djinni.json
@@ -35,8 +35,7 @@
     },
     "C": {
       "type": "modonomicon:tag",
-      "tag": "#minecraft:candles",
-      "display": "occultism:candle_white"
+      "tag": "#minecraft:candles"
     },
     "W": {
       "type": "modonomicon:block",

diff --git a/src/generated/resources/data/occultism/modonomicon/multiblocks/possess_foliot.json b/src/generated/resources/data/occultism/modonomicon/multiblocks/possess_foliot.json
@@ -31,8 +31,7 @@
     },
     "C": {
       "type": "modonomicon:tag",
-      "tag": "#minecraft:candles",
-      "display": "occultism:candle_white"
+      "tag": "#minecraft:candles"
     },
     "W": {
       "type": "modonomicon:block",

diff --git a/src/generated/resources/data/occultism/modonomicon/multiblocks/summon_afrit.json b/src/generated/resources/data/occultism/modonomicon/multiblocks/summon_afrit.json
@@ -43,8 +43,7 @@
     },
     "C": {
       "type": "modonomicon:tag",
-      "tag": "#minecraft:candles",
-      "display": "occultism:candle_white"
+      "tag": "#minecraft:candles"
     },
     "W": {
       "type": "modonomicon:block",

diff --git a/src/generated/resources/data/occultism/modonomicon/multiblocks/summon_djinni.json b/src/generated/resources/data/occultism/modonomicon/multiblocks/summon_djinni.json
@@ -35,8 +35,7 @@
     },
     "C": {
       "type": "modonomicon:tag",
-      "tag": "#minecraft:candles",
-      "display": "occultism:candle_white"
+      "tag": "#minecraft:candles"
     },
     "W": {
       "type": "modonomicon:block",

diff --git a/src/generated/resources/data/occultism/modonomicon/multiblocks/summon_foliot.json b/src/generated/resources/data/occultism/modonomicon/multiblocks/summon_foliot.json
@@ -31,8 +31,7 @@
     },
     "C": {
       "type": "modonomicon:tag",
-      "tag": "#minecraft:candles",
-      "display": "occultism:candle_white"
+      "tag": "#minecraft:candles"
     },
     "W": {
       "type": "modonomicon:block",

diff --git a/src/generated/resources/data/occultism/modonomicon/multiblocks/summon_marid.json b/src/generated/resources/data/occultism/modonomicon/multiblocks/summon_marid.json
@@ -47,8 +47,7 @@
     },
     "C": {
       "type": "modonomicon:tag",
-      "tag": "#minecraft:candles",
-      "display": "occultism:candle_white"
+      "tag": "#minecraft:candles"
     },
     "W": {
       "type": "modonomicon:block",

diff --git a/src/generated/resources/data/occultism/modonomicon/multiblocks/summon_wild_afrit.json b/src/generated/resources/data/occultism/modonomicon/multiblocks/summon_wild_afrit.json
@@ -39,8 +39,7 @@
     },
     "C": {
       "type": "modonomicon:tag",
-      "tag": "#minecraft:candles",
-      "display": "occultism:candle_white"
+      "tag": "#minecraft:candles"
     },
     "W": {
       "type": "modonomicon:block",

diff --git a/src/main/java/com/github/klikli_dev/occultism/datagen/PentacleProvider.java b/src/main/java/com/github/klikli_dev/occultism/datagen/PentacleProvider.java
@@ -355,11 +355,10 @@ private MappingBuilder display(char c, Supplier<? extends Block> display) {
             return this.element(c, json);
         }
 
-        private MappingBuilder tag(char c, TagKey<Block> tag, Supplier<? extends Block> display) {
+        private MappingBuilder tag(char c, TagKey<Block> tag) {
             JsonObject json = new JsonObject();
             json.addProperty("type", "modonomicon:tag");
             json.addProperty("tag", "#" + tag.location());
-            json.addProperty("display", ForgeRegistries.BLOCKS.getKey(display.get()).toString());
             return this.element(c, json);
         }
 
@@ -368,7 +367,7 @@ private MappingBuilder bowl() {
         }
 
         private MappingBuilder candle() {
-            return this.tag('C', OccultismTags.CANDLES, OccultismBlocks.CANDLE_WHITE);
+            return this.tag('C', OccultismTags.CANDLES);
         }
 
         private MappingBuilder whiteChalk() {