rework feral hemp into wild hemp

TeamGalena · Nov 12, 2024 · c22a371 · c22a371
1 parent 0646650
commit c22a371
Show file tree

Hide file tree

Showing 25 changed files with 48 additions and 823 deletions.
diff --git a/common/src/generated/resources/assets/nirvana/blockstates/feral_hemp.json b/common/src/generated/resources/assets/nirvana/blockstates/feral_hemp.json
diff --git a/common/src/generated/resources/assets/nirvana/blockstates/wild_hemp.json b/common/src/generated/resources/assets/nirvana/blockstates/wild_hemp.json
@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "nirvana:block/wild_hemp"
+    }
+  }
+}
diff --git a/common/src/generated/resources/assets/nirvana/lang/en_ud.json b/common/src/generated/resources/assets/nirvana/lang/en_ud.json
@@ -1,9 +1,9 @@
 {
   "block.nirvana.bliss_bloom": "ɯooןᗺ ssıןᗺ",
-  "block.nirvana.feral_hemp": "dɯǝH ןɐɹǝℲ",
   "block.nirvana.hemp": "dɯǝH",
   "block.nirvana.hemp_crate": "ǝʇɐɹƆ dɯǝH",
   "block.nirvana.weed_crate": "ǝʇɐɹƆ pǝǝM",
+  "block.nirvana.wild_hemp": "dɯǝH pןıM",
   "effect.nirvana.peace": "ǝɔɐǝԀ",
   "effect.nirvana.peace.description": "uıɐɹq ɹnoʎ sboɟǝq ɐɹnɐ ןnɟssıןq Ɐ",
   "item.nirvana.bong": "buoᗺ",

diff --git a/common/src/generated/resources/assets/nirvana/lang/en_us.json b/common/src/generated/resources/assets/nirvana/lang/en_us.json
@@ -1,9 +1,9 @@
 {
   "block.nirvana.bliss_bloom": "Bliss Bloom",
-  "block.nirvana.feral_hemp": "Feral Hemp",
   "block.nirvana.hemp": "Hemp",
   "block.nirvana.hemp_crate": "Hemp Crate",
   "block.nirvana.weed_crate": "Weed Crate",
+  "block.nirvana.wild_hemp": "Wild Hemp",
   "effect.nirvana.peace": "Peace",
   "effect.nirvana.peace.description": "A blissful aura befogs your brain",
   "item.nirvana.bong": "Bong",

diff --git a/common/src/generated/resources/assets/nirvana/models/block/wild_hemp.json b/common/src/generated/resources/assets/nirvana/models/block/wild_hemp.json
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:block/cross",
+  "textures": {
+    "cross": "nirvana:block/wild_hemp"
+  }
+}
diff --git a/...ssets/nirvana/models/item/feral_hemp.json → ...assets/nirvana/models/item/wild_hemp.json b/...ssets/nirvana/models/item/feral_hemp.json → ...assets/nirvana/models/item/wild_hemp.json
@@ -1,6 +1,6 @@
 {
   "parent": "minecraft:item/generated",
   "textures": {
-    "layer0": "nirvana:item/feral_hemp"
+    "layer0": "nirvana:block/wild_hemp"
   }
 }
diff --git a/common/src/generated/resources/data/minecraft/tags/blocks/small_flowers.json b/common/src/generated/resources/data/minecraft/tags/blocks/small_flowers.json
@@ -1,6 +1,6 @@
 {
   "replace": false,
   "values": [
-    "nirvana:feral_hemp"
+    "nirvana:wild_hemp"
   ]
 }
diff --git a/...irvana/loot_tables/blocks/feral_hemp.json → ...nirvana/loot_tables/blocks/wild_hemp.json b/...irvana/loot_tables/blocks/feral_hemp.json → ...nirvana/loot_tables/blocks/wild_hemp.json
@@ -22,7 +22,7 @@
                   }
                 }
               ],
-              "name": "nirvana:feral_hemp"
+              "name": "nirvana:wild_hemp"
             },
             {
               "type": "minecraft:item",
@@ -45,5 +45,5 @@
       "rolls": 1.0
     }
   ],
-  "random_sequence": "nirvana:blocks/feral_hemp"
+  "random_sequence": "nirvana:blocks/wild_hemp"
 }
diff --git a/common/src/main/java/galena/nirvana/index/NirvanaBlocks.java b/common/src/main/java/galena/nirvana/index/NirvanaBlocks.java
@@ -62,16 +62,16 @@ public class NirvanaBlocks {
             .build()
             .register();
 
-    public static final BlockEntry<BushBlock> FERAL_HEMP = REGISTRATE
-            .block("feral_hemp", BushBlock::new)
+    public static final BlockEntry<BushBlock> WILD_HEMP = REGISTRATE
+            .block("wild_hemp", BushBlock::new)
             .initialProperties(() -> Blocks.FERN)
             .addLayer(() -> RenderType::cutout)
-            .blockstate(Services.DATAGEN::feralHemp)
-            .loot(Services.DATAGEN::feralHemp)
+            .blockstate(Services.DATAGEN::wildHemp)
+            .loot(Services.DATAGEN::wildHemp)
             .tag(BlockTags.SMALL_FLOWERS)
             .item()
             .tab(CreativeModeTabs.NATURAL_BLOCKS)
-            .model((c, p) -> p.generated(c, p.modLoc("item/" + c.getName())))
+            .model((c, p) -> p.blockSprite(c))
             .build()
             .register();
 

diff --git a/common/src/main/java/galena/nirvana/index/NirvanaTags.java b/common/src/main/java/galena/nirvana/index/NirvanaTags.java
@@ -16,7 +16,7 @@ public class NirvanaTags {
 
     public static final TagKey<Item> ATTACHED_TO_HEAD = TagKey.create(Registries.ITEM, new ResourceLocation(NirvanaConstants.MOD_ID, "attached_to_head"));
 
-    public static final TagKey<Biome> GENERATES_FERAL_HEMP = TagKey.create(Registries.BIOME, new ResourceLocation(NirvanaConstants.MOD_ID, "has_feature/feral_hemp"));
+    public static final TagKey<Biome> GENERATES_WILD_HEMP = TagKey.create(Registries.BIOME, new ResourceLocation(NirvanaConstants.MOD_ID, "has_feature/wild_hemp"));
 
     public static final TagKey<Item> SHEARS = TagKey.create(Registries.ITEM, new ResourceLocation(NirvanaConstants.MOD_ID, "shears"));
 

diff --git a/common/src/main/java/galena/nirvana/platform/services/IDataGenHelper.java b/common/src/main/java/galena/nirvana/platform/services/IDataGenHelper.java
@@ -23,7 +23,7 @@ public interface IDataGenHelper {
 
     void blissBloom(RegistrateBlockLootTables provider, DoublePlantBlock block);
 
-    void feralHemp(DataGenContext<Block, ? extends Block> context, RegistrateBlockstateProvider provider);
+    void wildHemp(DataGenContext<Block, ? extends Block> context, RegistrateBlockstateProvider provider);
 
-    void feralHemp(RegistrateBlockLootTables provider, Block block);
+    void wildHemp(RegistrateBlockLootTables provider, Block block);
 }
diff --git a/common/src/main/resources/assets/nirvana/models/block/feral_hemp.json b/common/src/main/resources/assets/nirvana/models/block/feral_hemp.json