diff --git a/common/src/generated/resources/assets/nirvana/blockstates/feral_hemp.json b/common/src/generated/resources/assets/nirvana/blockstates/feral_hemp.json deleted file mode 100644 index a02952a..0000000 --- a/common/src/generated/resources/assets/nirvana/blockstates/feral_hemp.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "variants": { - "": [ - { - "model": "nirvana:block/feral_hemp" - }, - { - "model": "nirvana:block/feral_hemp_2" - }, - { - "model": "nirvana:block/feral_hemp_3" - } - ] - } -} \ No newline at end of file diff --git a/common/src/generated/resources/assets/nirvana/blockstates/wild_hemp.json b/common/src/generated/resources/assets/nirvana/blockstates/wild_hemp.json new file mode 100644 index 0000000..9c140a6 --- /dev/null +++ b/common/src/generated/resources/assets/nirvana/blockstates/wild_hemp.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "nirvana:block/wild_hemp" + } + } +} \ No newline at end of file diff --git a/common/src/generated/resources/assets/nirvana/lang/en_ud.json b/common/src/generated/resources/assets/nirvana/lang/en_ud.json index db9a723..9f6fafe 100644 --- 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 index 4ffe72e..067be46 100644 --- 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 new file mode 100644 index 0000000..97113ae --- /dev/null +++ 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" + } +} \ No newline at end of file diff --git a/common/src/generated/resources/assets/nirvana/models/item/feral_hemp.json b/common/src/generated/resources/assets/nirvana/models/item/wild_hemp.json similarity index 61% rename from common/src/generated/resources/assets/nirvana/models/item/feral_hemp.json rename to common/src/generated/resources/assets/nirvana/models/item/wild_hemp.json index 1f6e11b..b1b7e70 100644 --- a/common/src/generated/resources/assets/nirvana/models/item/feral_hemp.json +++ b/common/src/generated/resources/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" } } \ No newline at end of file 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 index 2e69fac..7b5f0ed 100644 --- 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" ] } \ No newline at end of file diff --git a/common/src/generated/resources/data/nirvana/loot_tables/blocks/feral_hemp.json b/common/src/generated/resources/data/nirvana/loot_tables/blocks/wild_hemp.json similarity index 92% rename from common/src/generated/resources/data/nirvana/loot_tables/blocks/feral_hemp.json rename to common/src/generated/resources/data/nirvana/loot_tables/blocks/wild_hemp.json index 11d7971..c79cde0 100644 --- a/common/src/generated/resources/data/nirvana/loot_tables/blocks/feral_hemp.json +++ b/common/src/generated/resources/data/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" } \ No newline at end of file diff --git a/common/src/main/java/galena/nirvana/index/NirvanaBlocks.java b/common/src/main/java/galena/nirvana/index/NirvanaBlocks.java index 9f14e48..ef44a15 100644 --- 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 FERAL_HEMP = REGISTRATE - .block("feral_hemp", BushBlock::new) + public static final BlockEntry 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 index 01f44a7..cd8a859 100644 --- 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 ATTACHED_TO_HEAD = TagKey.create(Registries.ITEM, new ResourceLocation(NirvanaConstants.MOD_ID, "attached_to_head")); - public static final TagKey GENERATES_FERAL_HEMP = TagKey.create(Registries.BIOME, new ResourceLocation(NirvanaConstants.MOD_ID, "has_feature/feral_hemp")); + public static final TagKey GENERATES_WILD_HEMP = TagKey.create(Registries.BIOME, new ResourceLocation(NirvanaConstants.MOD_ID, "has_feature/wild_hemp")); public static final TagKey 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 index 3bcb3b3..e0dd6f1 100644 --- 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 context, RegistrateBlockstateProvider provider); + void wildHemp(DataGenContext 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 deleted file mode 100644 index 9cdb9d9..0000000 --- a/common/src/main/resources/assets/nirvana/models/block/feral_hemp.json +++ /dev/null @@ -1,254 +0,0 @@ -{ - "credit": "Made with Blockbench", - "texture_size": [32, 32], - "textures": { - "0": "nirvana:block/feral_hemp", - "particle": "nirvana:block/feral_hemp" - }, - "ambientocclusion": false, - "elements": [ - { - "from": [0, 0, 8], - "to": [16, 16, 8], - "shade": false, - "rotation": { - "angle": -45, - "axis": "y", - "origin": [8, 0, 8] - }, - "faces": { - "north": { - "uv": [8, 0, 16, 8], - "texture": "#0" - }, - "east": { - "uv": [0, 0, 0, 8], - "texture": "#0" - }, - "south": { - "uv": [8, 0, 16, 8], - "texture": "#0" - }, - "west": { - "uv": [0, 0, 0, 8], - "texture": "#0" - }, - "up": { - "uv": [0, 0, 8, 0], - "texture": "#0" - }, - "down": { - "uv": [0, 0, 8, 0], - "texture": "#0" - } - } - }, { - "from": [0, 0, 8], - "to": [16, 16, 8], - "shade": false, - "rotation": { - "angle": 45, - "axis": "y", - "origin": [8, 0, 8] - }, - "faces": { - "north": { - "uv": [8, 0, 16, 8], - "texture": "#0" - }, - "east": { - "uv": [0, 0, 0, 8], - "texture": "#0" - }, - "south": { - "uv": [8, 0, 16, 8], - "texture": "#0" - }, - "west": { - "uv": [0, 0, 0, 8], - "texture": "#0" - }, - "up": { - "uv": [0, 0, 8, 0], - "texture": "#0" - }, - "down": { - "uv": [0, 0, 8, 0], - "texture": "#0" - } - } - }, { - "from": [7, 2, 5], - "to": [7, 11, 12], - "shade": false, - "rotation": { - "angle": -45, - "axis": "z", - "origin": [7, 11, 8] - }, - "faces": { - "north": { - "uv": [0, 0, 0, 4.5], - "texture": "#0" - }, - "east": { - "uv": [0, 0, 3.5, 4.5], - "texture": "#0" - }, - "south": { - "uv": [0, 0, 0, 4.5], - "texture": "#0" - }, - "west": { - "uv": [0, 0, 3.5, 4.5], - "texture": "#0" - }, - "up": { - "uv": [0, 0, 3.5, 0], - "rotation": 270, - "texture": "#0" - }, - "down": { - "uv": [0, 0, 3.5, 0], - "rotation": 90, - "texture": "#0" - } - } - }, { - "from": [9, 11, 4], - "to": [18, 11, 11], - "shade": false, - "rotation": { - "angle": -45, - "axis": "z", - "origin": [9, 11, 7] - }, - "faces": { - "north": { - "uv": [0, 0, 0, 4.5], - "rotation": 90, - "texture": "#0" - }, - "east": { - "uv": [0, 0, 3.5, 0], - "texture": "#0" - }, - "south": { - "uv": [0, 0, 0, 4.5], - "rotation": 270, - "texture": "#0" - }, - "west": { - "uv": [0, 0, 3.5, 0], - "rotation": 180, - "texture": "#0" - }, - "up": { - "uv": [0, 0, 3.5, 4.5], - "rotation": 270, - "texture": "#0" - }, - "down": { - "uv": [0, 0, 3.5, 4.5], - "rotation": 270, - "texture": "#0" - } - } - }, { - "from": [4, -1, 7], - "to": [11, 8, 7], - "shade": false, - "rotation": { - "angle": 45, - "axis": "x", - "origin": [8, 8, 7] - }, - "faces": { - "north": { - "uv": [0, 0, 3.5, 4.5], - "texture": "#0" - }, - "east": { - "uv": [0, 0, 0, 4.5], - "texture": "#0" - }, - "south": { - "uv": [0, 0, 3.5, 4.5], - "texture": "#0" - }, - "west": { - "uv": [0, 0, 0, 4.5], - "texture": "#0" - }, - "up": { - "uv": [0, 0, 3.5, 0], - "texture": "#0" - }, - "down": { - "uv": [0, 0, 3.5, 0], - "texture": "#0" - } - } - }, { - "from": [5, -1, 9], - "to": [12, 8, 9], - "shade": false, - "rotation": { - "angle": -45, - "axis": "x", - "origin": [9, 8, 9] - }, - "faces": { - "north": { - "uv": [0, 0, 3.5, 4.5], - "texture": "#0" - }, - "east": { - "uv": [0, 0, 0, 4.5], - "texture": "#0" - }, - "south": { - "uv": [0, 0, 3.5, 4.5], - "texture": "#0" - }, - "west": { - "uv": [0, 0, 0, 4.5], - "texture": "#0" - }, - "up": { - "uv": [0, 0, 3.5, 0], - "texture": "#0" - }, - "down": { - "uv": [0, 0, 3.5, 0], - "texture": "#0" - } - } - } - ], - "groups": [ - { - "name": "group", - "origin": [8, 8, 8], - "color": 0, - "children": [ - { - "name": "group", - "origin": [8, 0, 8], - "color": 0, - "children": [0, 1] - }, { - "name": "group", - "origin": [8, 8, 8], - "color": 0, - "children": [2, 3] - }, { - "name": "group", - "origin": [8, 8, 8], - "color": 0, - "children": [4, 5] - } - ] - } - ] -} \ No newline at end of file diff --git a/common/src/main/resources/assets/nirvana/models/block/feral_hemp_2.json b/common/src/main/resources/assets/nirvana/models/block/feral_hemp_2.json deleted file mode 100644 index 031293d..0000000 --- a/common/src/main/resources/assets/nirvana/models/block/feral_hemp_2.json +++ /dev/null @@ -1,254 +0,0 @@ -{ - "credit": "Made with Blockbench", - "texture_size": [32, 32], - "textures": { - "0": "nirvana:block/feral_hemp", - "particle": "nirvana:block/feral_hemp" - }, - "ambientocclusion": false, - "elements": [ - { - "from": [0, 0, 8], - "to": [16, 16, 8], - "shade": false, - "rotation": { - "angle": -45, - "axis": "y", - "origin": [8, 0, 8] - }, - "faces": { - "north": { - "uv": [8, 8, 16, 16], - "texture": "#0" - }, - "east": { - "uv": [0, 0, 0, 8], - "texture": "#0" - }, - "south": { - "uv": [8, 8, 16, 16], - "texture": "#0" - }, - "west": { - "uv": [0, 0, 0, 8], - "texture": "#0" - }, - "up": { - "uv": [0, 0, 8, 0], - "texture": "#0" - }, - "down": { - "uv": [0, 0, 8, 0], - "texture": "#0" - } - } - }, { - "from": [0, 0, 8], - "to": [16, 16, 8], - "shade": false, - "rotation": { - "angle": 45, - "axis": "y", - "origin": [8, 0, 8] - }, - "faces": { - "north": { - "uv": [8, 8, 16, 16], - "texture": "#0" - }, - "east": { - "uv": [0, 0, 0, 8], - "texture": "#0" - }, - "south": { - "uv": [8, 8, 16, 16], - "texture": "#0" - }, - "west": { - "uv": [0, 0, 0, 8], - "texture": "#0" - }, - "up": { - "uv": [0, 0, 8, 0], - "texture": "#0" - }, - "down": { - "uv": [0, 0, 8, 0], - "texture": "#0" - } - } - }, { - "from": [7, 2, 5], - "to": [7, 11, 12], - "shade": false, - "rotation": { - "angle": -45, - "axis": "z", - "origin": [7, 11, 8] - }, - "faces": { - "north": { - "uv": [0, 0, 0, 4.5], - "texture": "#0" - }, - "east": { - "uv": [0, 0, 3.5, 4.5], - "texture": "#0" - }, - "south": { - "uv": [0, 0, 0, 4.5], - "texture": "#0" - }, - "west": { - "uv": [0, 0, 3.5, 4.5], - "texture": "#0" - }, - "up": { - "uv": [0, 0, 3.5, 0], - "rotation": 270, - "texture": "#0" - }, - "down": { - "uv": [0, 0, 3.5, 0], - "rotation": 90, - "texture": "#0" - } - } - }, { - "from": [9, 11, 4], - "to": [18, 11, 11], - "shade": false, - "rotation": { - "angle": -45, - "axis": "z", - "origin": [9, 11, 7] - }, - "faces": { - "north": { - "uv": [0, 0, 0, 4.5], - "rotation": 90, - "texture": "#0" - }, - "east": { - "uv": [0, 0, 3.5, 0], - "texture": "#0" - }, - "south": { - "uv": [0, 0, 0, 4.5], - "rotation": 270, - "texture": "#0" - }, - "west": { - "uv": [0, 0, 3.5, 0], - "rotation": 180, - "texture": "#0" - }, - "up": { - "uv": [0, 0, 3.5, 4.5], - "rotation": 270, - "texture": "#0" - }, - "down": { - "uv": [0, 0, 3.5, 4.5], - "rotation": 270, - "texture": "#0" - } - } - }, { - "from": [4, -1, 7], - "to": [11, 8, 7], - "shade": false, - "rotation": { - "angle": 45, - "axis": "x", - "origin": [8, 8, 7] - }, - "faces": { - "north": { - "uv": [0, 0, 3.5, 4.5], - "texture": "#0" - }, - "east": { - "uv": [0, 0, 0, 4.5], - "texture": "#0" - }, - "south": { - "uv": [0, 0, 3.5, 4.5], - "texture": "#0" - }, - "west": { - "uv": [0, 0, 0, 4.5], - "texture": "#0" - }, - "up": { - "uv": [0, 0, 3.5, 0], - "texture": "#0" - }, - "down": { - "uv": [0, 0, 3.5, 0], - "texture": "#0" - } - } - }, { - "from": [5, -1, 9], - "to": [12, 8, 9], - "shade": false, - "rotation": { - "angle": -45, - "axis": "x", - "origin": [9, 8, 9] - }, - "faces": { - "north": { - "uv": [0, 0, 3.5, 4.5], - "texture": "#0" - }, - "east": { - "uv": [0, 0, 0, 4.5], - "texture": "#0" - }, - "south": { - "uv": [0, 0, 3.5, 4.5], - "texture": "#0" - }, - "west": { - "uv": [0, 0, 0, 4.5], - "texture": "#0" - }, - "up": { - "uv": [0, 0, 3.5, 0], - "texture": "#0" - }, - "down": { - "uv": [0, 0, 3.5, 0], - "texture": "#0" - } - } - } - ], - "groups": [ - { - "name": "group", - "origin": [8, 8, 8], - "color": 0, - "children": [ - { - "name": "group", - "origin": [8, 0, 8], - "color": 0, - "children": [0, 1] - }, { - "name": "group", - "origin": [8, 8, 8], - "color": 0, - "children": [2, 3] - }, { - "name": "group", - "origin": [8, 8, 8], - "color": 0, - "children": [4, 5] - } - ] - } - ] -} \ No newline at end of file diff --git a/common/src/main/resources/assets/nirvana/models/block/feral_hemp_3.json b/common/src/main/resources/assets/nirvana/models/block/feral_hemp_3.json deleted file mode 100644 index f35ae35..0000000 --- a/common/src/main/resources/assets/nirvana/models/block/feral_hemp_3.json +++ /dev/null @@ -1,254 +0,0 @@ -{ - "credit": "Made with Blockbench", - "texture_size": [32, 32], - "textures": { - "0": "nirvana:block/feral_hemp", - "particle": "nirvana:block/feral_hemp" - }, - "ambientocclusion": false, - "elements": [ - { - "from": [0, 0, 8], - "to": [16, 16, 8], - "shade": false, - "rotation": { - "angle": -45, - "axis": "y", - "origin": [8, 0, 8] - }, - "faces": { - "north": { - "uv": [0, 8, 8, 16], - "texture": "#0" - }, - "east": { - "uv": [0, 0, 0, 8], - "texture": "#0" - }, - "south": { - "uv": [0, 8, 8, 16], - "texture": "#0" - }, - "west": { - "uv": [0, 0, 0, 8], - "texture": "#0" - }, - "up": { - "uv": [0, 0, 8, 0], - "texture": "#0" - }, - "down": { - "uv": [0, 0, 8, 0], - "texture": "#0" - } - } - }, { - "from": [0, 0, 8], - "to": [16, 16, 8], - "shade": false, - "rotation": { - "angle": 45, - "axis": "y", - "origin": [8, 0, 8] - }, - "faces": { - "north": { - "uv": [0, 8, 8, 16], - "texture": "#0" - }, - "east": { - "uv": [0, 0, 0, 8], - "texture": "#0" - }, - "south": { - "uv": [0, 8, 8, 16], - "texture": "#0" - }, - "west": { - "uv": [0, 0, 0, 8], - "texture": "#0" - }, - "up": { - "uv": [0, 0, 8, 0], - "texture": "#0" - }, - "down": { - "uv": [0, 0, 8, 0], - "texture": "#0" - } - } - }, { - "from": [7, 2, 5], - "to": [7, 11, 12], - "shade": false, - "rotation": { - "angle": -45, - "axis": "z", - "origin": [7, 11, 8] - }, - "faces": { - "north": { - "uv": [0, 0, 0, 4.5], - "texture": "#0" - }, - "east": { - "uv": [0, 0, 3.5, 4.5], - "texture": "#0" - }, - "south": { - "uv": [0, 0, 0, 4.5], - "texture": "#0" - }, - "west": { - "uv": [0, 0, 3.5, 4.5], - "texture": "#0" - }, - "up": { - "uv": [0, 0, 3.5, 0], - "rotation": 270, - "texture": "#0" - }, - "down": { - "uv": [0, 0, 3.5, 0], - "rotation": 90, - "texture": "#0" - } - } - }, { - "from": [9, 11, 4], - "to": [18, 11, 11], - "shade": false, - "rotation": { - "angle": -45, - "axis": "z", - "origin": [9, 11, 7] - }, - "faces": { - "north": { - "uv": [0, 0, 0, 4.5], - "rotation": 90, - "texture": "#0" - }, - "east": { - "uv": [0, 0, 3.5, 0], - "texture": "#0" - }, - "south": { - "uv": [0, 0, 0, 4.5], - "rotation": 270, - "texture": "#0" - }, - "west": { - "uv": [0, 0, 3.5, 0], - "rotation": 180, - "texture": "#0" - }, - "up": { - "uv": [0, 0, 3.5, 4.5], - "rotation": 270, - "texture": "#0" - }, - "down": { - "uv": [0, 0, 3.5, 4.5], - "rotation": 270, - "texture": "#0" - } - } - }, { - "from": [4, -1, 7], - "to": [11, 8, 7], - "shade": false, - "rotation": { - "angle": 45, - "axis": "x", - "origin": [8, 8, 7] - }, - "faces": { - "north": { - "uv": [0, 0, 3.5, 4.5], - "texture": "#0" - }, - "east": { - "uv": [0, 0, 0, 4.5], - "texture": "#0" - }, - "south": { - "uv": [0, 0, 3.5, 4.5], - "texture": "#0" - }, - "west": { - "uv": [0, 0, 0, 4.5], - "texture": "#0" - }, - "up": { - "uv": [0, 0, 3.5, 0], - "texture": "#0" - }, - "down": { - "uv": [0, 0, 3.5, 0], - "texture": "#0" - } - } - }, { - "from": [5, -1, 9], - "to": [12, 8, 9], - "shade": false, - "rotation": { - "angle": -45, - "axis": "x", - "origin": [9, 8, 9] - }, - "faces": { - "north": { - "uv": [0, 0, 3.5, 4.5], - "texture": "#0" - }, - "east": { - "uv": [0, 0, 0, 4.5], - "texture": "#0" - }, - "south": { - "uv": [0, 0, 3.5, 4.5], - "texture": "#0" - }, - "west": { - "uv": [0, 0, 0, 4.5], - "texture": "#0" - }, - "up": { - "uv": [0, 0, 3.5, 0], - "texture": "#0" - }, - "down": { - "uv": [0, 0, 3.5, 0], - "texture": "#0" - } - } - } - ], - "groups": [ - { - "name": "group", - "origin": [8, 8, 8], - "color": 0, - "children": [ - { - "name": "group", - "origin": [8, 0, 8], - "color": 0, - "children": [0, 1] - }, { - "name": "group", - "origin": [8, 8, 8], - "color": 0, - "children": [2, 3] - }, { - "name": "group", - "origin": [8, 8, 8], - "color": 0, - "children": [4, 5] - } - ] - } - ] -} \ No newline at end of file diff --git a/common/src/main/resources/assets/nirvana/textures/block/feral_hemp.png b/common/src/main/resources/assets/nirvana/textures/block/feral_hemp.png deleted file mode 100644 index 0424852..0000000 Binary files a/common/src/main/resources/assets/nirvana/textures/block/feral_hemp.png and /dev/null differ diff --git a/common/src/main/resources/assets/nirvana/textures/item/feral_hemp.png b/common/src/main/resources/assets/nirvana/textures/item/feral_hemp.png deleted file mode 100644 index 2a5f5b9..0000000 Binary files a/common/src/main/resources/assets/nirvana/textures/item/feral_hemp.png and /dev/null differ diff --git a/common/src/main/resources/data/nirvana/tags/worldgen/biome/has_feature/feral_hemp.json b/common/src/main/resources/data/nirvana/tags/worldgen/biome/has_feature/feral_hemp.json deleted file mode 100644 index b602af3..0000000 --- a/common/src/main/resources/data/nirvana/tags/worldgen/biome/has_feature/feral_hemp.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "values": [ - "minecraft:plains", - "minecraft:meadow" - ] -} \ No newline at end of file diff --git a/common/src/main/resources/data/nirvana/tags/worldgen/biome/has_feature/wild_hemp.json b/common/src/main/resources/data/nirvana/tags/worldgen/biome/has_feature/wild_hemp.json new file mode 100644 index 0000000..f20514e --- /dev/null +++ b/common/src/main/resources/data/nirvana/tags/worldgen/biome/has_feature/wild_hemp.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:sparse_jungle" + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/nirvana/worldgen/configured_feature/patch_feral_hemp.json b/common/src/main/resources/data/nirvana/worldgen/configured_feature/patch_wild_hemp.json similarity index 93% rename from common/src/main/resources/data/nirvana/worldgen/configured_feature/patch_feral_hemp.json rename to common/src/main/resources/data/nirvana/worldgen/configured_feature/patch_wild_hemp.json index 7193b50..6736a21 100644 --- a/common/src/main/resources/data/nirvana/worldgen/configured_feature/patch_feral_hemp.json +++ b/common/src/main/resources/data/nirvana/worldgen/configured_feature/patch_wild_hemp.json @@ -8,7 +8,7 @@ "to_place": { "type": "minecraft:simple_state_provider", "state": { - "Name": "nirvana:feral_hemp" + "Name": "nirvana:wild_hemp" } } } diff --git a/common/src/main/resources/data/nirvana/worldgen/placed_feature/patch_feral_hemp.json b/common/src/main/resources/data/nirvana/worldgen/placed_feature/patch_wild_hemp.json similarity index 87% rename from common/src/main/resources/data/nirvana/worldgen/placed_feature/patch_feral_hemp.json rename to common/src/main/resources/data/nirvana/worldgen/placed_feature/patch_wild_hemp.json index 63ed6cb..a3e8f3d 100644 --- a/common/src/main/resources/data/nirvana/worldgen/placed_feature/patch_feral_hemp.json +++ b/common/src/main/resources/data/nirvana/worldgen/placed_feature/patch_wild_hemp.json @@ -1,5 +1,5 @@ { - "feature": "nirvana:patch_feral_hemp", + "feature": "nirvana:patch_wild_hemp", "placement": [ { "type": "minecraft:rarity_filter", diff --git a/fabric/src/main/java/galena/nirvana/fabric/FabricEntrypoint.java b/fabric/src/main/java/galena/nirvana/fabric/FabricEntrypoint.java index 0128058..80f927f 100644 --- a/fabric/src/main/java/galena/nirvana/fabric/FabricEntrypoint.java +++ b/fabric/src/main/java/galena/nirvana/fabric/FabricEntrypoint.java @@ -20,7 +20,7 @@ public class FabricEntrypoint implements ModInitializer { public static final FabricNirvanaRegistrate REGISTRATE = new FabricNirvanaRegistrate(NirvanaConstants.MOD_ID); - private static final ResourceKey FERAL_HEMP_FEATURE = ResourceKey.create(Registries.PLACED_FEATURE, new ResourceLocation(NirvanaConstants.MOD_ID, "patch_feral_hemp")); + private static final ResourceKey WILD_HEMP_FEATURE = ResourceKey.create(Registries.PLACED_FEATURE, new ResourceLocation(NirvanaConstants.MOD_ID, "patch_wild_hemp")); @Override public void onInitialize() { @@ -35,7 +35,7 @@ public void onInitialize() { } }); - BiomeModifications.addFeature(BiomeSelectors.tag(NirvanaTags.GENERATES_FERAL_HEMP), GenerationStep.Decoration.VEGETAL_DECORATION, FERAL_HEMP_FEATURE); + BiomeModifications.addFeature(BiomeSelectors.tag(NirvanaTags.GENERATES_WILD_HEMP), GenerationStep.Decoration.VEGETAL_DECORATION, WILD_HEMP_FEATURE); } } diff --git a/fabric/src/main/java/galena/nirvana/fabric/services/FabricDataGenHelper.java b/fabric/src/main/java/galena/nirvana/fabric/services/FabricDataGenHelper.java index 32836dd..d98ecab 100644 --- a/fabric/src/main/java/galena/nirvana/fabric/services/FabricDataGenHelper.java +++ b/fabric/src/main/java/galena/nirvana/fabric/services/FabricDataGenHelper.java @@ -33,8 +33,6 @@ import net.minecraft.world.level.storage.loot.predicates.MatchTool; import net.minecraft.world.level.storage.loot.providers.number.UniformGenerator; -import java.util.stream.Stream; - public class FabricDataGenHelper implements IDataGenHelper { private ResourceLocation withSuffix(ResourceLocation base, String suffix) { @@ -157,21 +155,13 @@ public void blissBloom(RegistrateBlockLootTables provider, DoublePlantBlock bloc } @Override - public void feralHemp(DataGenContext context, RegistrateBlockstateProvider provider) { - provider.getVariantBuilder(context.get()).forAllStates($ -> { - var name = context.getName(); - var suffixes = Stream.of("", "_2", "_3"); - - return suffixes.map(suffix -> { - var builder = ConfiguredModel.builder(); - var model = provider.models().getExistingFile(provider.modLoc("block/" + name + suffix)); - return builder.modelFile(model).build()[0]; - }).toArray(ConfiguredModel[]::new); - }); + public void wildHemp(DataGenContext context, RegistrateBlockstateProvider provider) { + var block = context.get(); + provider.simpleBlock(block, provider.models().cross(context.getName(), provider.blockTexture(block))); } @Override - public void feralHemp(RegistrateBlockLootTables provider, Block block) { + public void wildHemp(RegistrateBlockLootTables provider, Block block) { provider.add(block, LootTable.lootTable().withPool(LootPool.lootPool() .when(ExplosionCondition.survivesExplosion()) .add(AlternativesEntry.alternatives( diff --git a/forge/src/main/java/galena/nirvana/forge/services/ForgeDataGenHelper.java b/forge/src/main/java/galena/nirvana/forge/services/ForgeDataGenHelper.java index a49c782..a026cf4 100644 --- a/forge/src/main/java/galena/nirvana/forge/services/ForgeDataGenHelper.java +++ b/forge/src/main/java/galena/nirvana/forge/services/ForgeDataGenHelper.java @@ -47,12 +47,12 @@ public void blissBloom(RegistrateBlockLootTables provider, DoublePlantBlock bloc } @Override - public void feralHemp(DataGenContext context, RegistrateBlockstateProvider provider) { + public void wildHemp(DataGenContext context, RegistrateBlockstateProvider provider) { NOOP(); } @Override - public void feralHemp(RegistrateBlockLootTables provider, Block block) { + public void wildHemp(RegistrateBlockLootTables provider, Block block) { NOOP(); } } diff --git a/forge/src/main/resources/data/nirvana/forge/biome_modifier/feral_hemp.json b/forge/src/main/resources/data/nirvana/forge/biome_modifier/feral_hemp.json deleted file mode 100644 index ace377a..0000000 --- a/forge/src/main/resources/data/nirvana/forge/biome_modifier/feral_hemp.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "type": "forge:add_features", - "biomes": "#nirvana:has_feature/feral_hemp", - "features": "nirvana:patch_feral_hemp", - "step": "vegetal_decoration" -} \ No newline at end of file diff --git a/forge/src/main/resources/data/nirvana/forge/biome_modifier/wild_hemp.json b/forge/src/main/resources/data/nirvana/forge/biome_modifier/wild_hemp.json new file mode 100644 index 0000000..62281fd --- /dev/null +++ b/forge/src/main/resources/data/nirvana/forge/biome_modifier/wild_hemp.json @@ -0,0 +1,6 @@ +{ + "type": "forge:add_features", + "biomes": "#nirvana:has_feature/wild_hemp", + "features": "nirvana:patch_wild_hemp", + "step": "vegetal_decoration" +} \ No newline at end of file