diff --git a/build.gradle.kts b/build.gradle.kts index 546ae08..de5bcb3 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,5 +1,5 @@ plugins { - id("com.possible-triangle.gradle") version ("0.1.0") + id("com.possible-triangle.gradle") version ("0.1.4") } subprojects { diff --git a/common/src/generated/resources/assets/blissful/blockstates/bliss_bloom.json b/common/src/generated/resources/assets/blissful/blockstates/bliss_bloom.json deleted file mode 100644 index 4585e48..0000000 --- a/common/src/generated/resources/assets/blissful/blockstates/bliss_bloom.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "variants": { - "half=lower": { - "model": "blissful:block/bliss_bloom_lower" - }, - "half=upper": { - "model": "blissful:block/bliss_bloom_upper" - } - } -} \ No newline at end of file diff --git a/common/src/generated/resources/assets/blissful/blockstates/feral_hemp.json b/common/src/generated/resources/assets/blissful/blockstates/feral_hemp.json deleted file mode 100644 index a2d09cd..0000000 --- a/common/src/generated/resources/assets/blissful/blockstates/feral_hemp.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "variants": { - "": [ - { - "model": "blissful:block/feral_hemp" - }, - { - "model": "blissful:block/feral_hemp_2" - }, - { - "model": "blissful:block/feral_hemp_3" - } - ] - } -} \ No newline at end of file diff --git a/common/src/generated/resources/assets/blissful/blockstates/hemp.json b/common/src/generated/resources/assets/blissful/blockstates/hemp.json deleted file mode 100644 index 08ce17c..0000000 --- a/common/src/generated/resources/assets/blissful/blockstates/hemp.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "variants": { - "age=0": { - "model": "blissful:block/hemp_0" - }, - "age=1": { - "model": "blissful:block/hemp_1" - }, - "age=2": { - "model": "blissful:block/hemp_2" - }, - "age=3": { - "model": "blissful:block/hemp_3" - }, - "age=4": { - "model": "blissful:block/hemp_4" - }, - "age=5": { - "model": "blissful:block/hemp_5" - } - } -} \ No newline at end of file diff --git a/common/src/generated/resources/assets/blissful/lang/en_ud.json b/common/src/generated/resources/assets/blissful/lang/en_ud.json deleted file mode 100644 index f420851..0000000 --- a/common/src/generated/resources/assets/blissful/lang/en_ud.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "block.blissful.bliss_bloom": "ɯooןᗺ ssıןᗺ", - "block.blissful.feral_hemp": "dɯǝH ןɐɹǝℲ", - "block.blissful.hemp": "dɯǝH", - "block.blissful.hemp_crate": "ǝʇɐɹƆ dɯǝH", - "block.blissful.weed_crate": "ǝʇɐɹƆ pǝǝM", - "effect.blissful.peace": "ǝɔɐǝԀ", - "effect.blissful.peace.description": "uıɐɹq ɹnoʎ sboɟǝq ɐɹnɐ ןnɟssıןq Ɐ", - "item.blissful.bong": "buoᗺ", - "item.blissful.hemp": "dɯǝH", - "item.blissful.hemp_seeds": "spǝǝS dɯǝH", - "item.blissful.herbal_salve": "ǝʌןɐS ןɐqɹǝH", - "item.blissful.joint": "ʇuıoſ", - "item.blissful.potion_bong": "buoᗺ uoıʇoԀ", - "item.blissful.potion_bong.effect.awkward": "buoᗺ pɹɐʍʞʍⱯ", - "item.blissful.potion_bong.effect.empty": "buoᗺ ʎʇdɯƎ", - "item.blissful.potion_bong.effect.fire_resistance": "ǝɔuɐʇsısǝᴚ ǝɹıℲ ɟo buoᗺ", - "item.blissful.potion_bong.effect.harming": "buıɯɹɐH ɟo buoᗺ", - "item.blissful.potion_bong.effect.healing": "buıןɐǝH ɟo buoᗺ", - "item.blissful.potion_bong.effect.invisibility": "ʎʇıןıqısıʌuI ɟo buoᗺ", - "item.blissful.potion_bong.effect.leaping": "buıdɐǝꞀ ɟo buoᗺ", - "item.blissful.potion_bong.effect.luck": "ʞɔnꞀ ɟo buoᗺ", - "item.blissful.potion_bong.effect.mundane": "buoᗺ ǝuɐpunW", - "item.blissful.potion_bong.effect.night_vision": "uoısıΛ ʇɥbıN ɟo buoᗺ", - "item.blissful.potion_bong.effect.poison": "uosıoԀ ɟo buoᗺ", - "item.blissful.potion_bong.effect.regeneration": "uoıʇɐɹǝuǝbǝᴚ ɟo buoᗺ", - "item.blissful.potion_bong.effect.slow_falling": "buıןןɐℲ ʍoןS ɟo buoᗺ", - "item.blissful.potion_bong.effect.slowness": "ssǝuʍoןS ɟo buoᗺ", - "item.blissful.potion_bong.effect.strength": "ɥʇbuǝɹʇS ɟo buoᗺ", - "item.blissful.potion_bong.effect.swiftness": "ssǝuʇɟıʍS ɟo buoᗺ", - "item.blissful.potion_bong.effect.thick": "buoᗺ ʞɔıɥ⟘", - "item.blissful.potion_bong.effect.turtle_master": "ɹǝʇsɐW ǝןʇɹn⟘ ɟo buoᗺ", - "item.blissful.potion_bong.effect.water": "buoᗺ ɹǝʇɐM", - "item.blissful.potion_bong.effect.water_breathing": "buıɥʇɐǝɹᗺ ɹǝʇɐM ɟo buoᗺ", - "item.blissful.potion_bong.effect.weakness": "ssǝuʞɐǝM ɟo buoᗺ", - "item.blissful.weed": "pǝǝM", - "item.blissful.weed_brownies": "sǝıuʍoɹᗺ pǝǝM" -} \ No newline at end of file diff --git a/common/src/generated/resources/assets/blissful/lang/en_us.json b/common/src/generated/resources/assets/blissful/lang/en_us.json deleted file mode 100644 index 9118240..0000000 --- a/common/src/generated/resources/assets/blissful/lang/en_us.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "block.blissful.bliss_bloom": "Bliss Bloom", - "block.blissful.feral_hemp": "Feral Hemp", - "block.blissful.hemp": "Hemp", - "block.blissful.hemp_crate": "Hemp Crate", - "block.blissful.weed_crate": "Weed Crate", - "effect.blissful.peace": "Peace", - "effect.blissful.peace.description": "A blissful aura befogs your brain", - "item.blissful.bong": "Bong", - "item.blissful.hemp": "Hemp", - "item.blissful.hemp_seeds": "Hemp Seeds", - "item.blissful.herbal_salve": "Herbal Salve", - "item.blissful.joint": "Joint", - "item.blissful.potion_bong": "Potion Bong", - "item.blissful.potion_bong.effect.awkward": "Awkward Bong", - "item.blissful.potion_bong.effect.empty": "Empty Bong", - "item.blissful.potion_bong.effect.fire_resistance": "Bong of Fire Resistance", - "item.blissful.potion_bong.effect.harming": "Bong of Harming", - "item.blissful.potion_bong.effect.healing": "Bong of Healing", - "item.blissful.potion_bong.effect.invisibility": "Bong of Invisibility", - "item.blissful.potion_bong.effect.leaping": "Bong of Leaping", - "item.blissful.potion_bong.effect.luck": "Bong of Luck", - "item.blissful.potion_bong.effect.mundane": "Mundane Bong", - "item.blissful.potion_bong.effect.night_vision": "Bong of Night Vision", - "item.blissful.potion_bong.effect.poison": "Bong of Poison", - "item.blissful.potion_bong.effect.regeneration": "Bong of Regeneration", - "item.blissful.potion_bong.effect.slow_falling": "Bong of Slow Falling", - "item.blissful.potion_bong.effect.slowness": "Bong of Slowness", - "item.blissful.potion_bong.effect.strength": "Bong of Strength", - "item.blissful.potion_bong.effect.swiftness": "Bong of Swiftness", - "item.blissful.potion_bong.effect.thick": "Thick Bong", - "item.blissful.potion_bong.effect.turtle_master": "Bong of Turtle Master", - "item.blissful.potion_bong.effect.water": "Water Bong", - "item.blissful.potion_bong.effect.water_breathing": "Bong of Water Breathing", - "item.blissful.potion_bong.effect.weakness": "Bong of Weakness", - "item.blissful.weed": "Weed", - "item.blissful.weed_brownies": "Weed Brownies" -} \ No newline at end of file diff --git a/common/src/generated/resources/assets/blissful/models/block/hemp_0.json b/common/src/generated/resources/assets/blissful/models/block/hemp_0.json deleted file mode 100644 index 77b2791..0000000 --- a/common/src/generated/resources/assets/blissful/models/block/hemp_0.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "blissful:block/crop_cross", - "textures": { - "cross": "blissful:block/hemp_0" - } -} \ No newline at end of file diff --git a/common/src/generated/resources/assets/blissful/models/block/hemp_1.json b/common/src/generated/resources/assets/blissful/models/block/hemp_1.json deleted file mode 100644 index 04e041f..0000000 --- a/common/src/generated/resources/assets/blissful/models/block/hemp_1.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "blissful:block/crop_cross", - "textures": { - "cross": "blissful:block/hemp_1" - } -} \ No newline at end of file diff --git a/common/src/generated/resources/assets/blissful/models/block/hemp_2.json b/common/src/generated/resources/assets/blissful/models/block/hemp_2.json deleted file mode 100644 index 0ff5b13..0000000 --- a/common/src/generated/resources/assets/blissful/models/block/hemp_2.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "blissful:block/crop_cross", - "textures": { - "cross": "blissful:block/hemp_2" - } -} \ No newline at end of file diff --git a/common/src/generated/resources/assets/blissful/models/block/hemp_crate.json b/common/src/generated/resources/assets/blissful/models/block/hemp_crate.json deleted file mode 100644 index f2c0b87..0000000 --- a/common/src/generated/resources/assets/blissful/models/block/hemp_crate.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "parent": "minecraft:block/cube", - "textures": { - "down": "blissful:block/hemp_crate_bottom", - "east": "blissful:block/hemp_crate_side", - "north": "blissful:block/hemp_crate_front", - "particle": "blissful:block/hemp_crate_top", - "south": "blissful:block/hemp_crate_back", - "up": "blissful:block/hemp_crate_top", - "west": "blissful:block/hemp_crate_side" - } -} \ No newline at end of file diff --git a/common/src/generated/resources/assets/blissful/models/block/weed_crate.json b/common/src/generated/resources/assets/blissful/models/block/weed_crate.json deleted file mode 100644 index ee9036f..0000000 --- a/common/src/generated/resources/assets/blissful/models/block/weed_crate.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "parent": "minecraft:block/cube", - "textures": { - "down": "blissful:block/weed_crate_bottom", - "east": "blissful:block/weed_crate_side", - "north": "blissful:block/weed_crate_front", - "particle": "blissful:block/weed_crate_top", - "south": "blissful:block/weed_crate_back", - "up": "blissful:block/weed_crate_top", - "west": "blissful:block/weed_crate_side" - } -} \ No newline at end of file diff --git a/common/src/generated/resources/assets/blissful/models/item/bliss_bloom.json b/common/src/generated/resources/assets/blissful/models/item/bliss_bloom.json deleted file mode 100644 index cccdeeb..0000000 --- a/common/src/generated/resources/assets/blissful/models/item/bliss_bloom.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "blissful:block/bliss_bloom_upper" - } -} \ No newline at end of file diff --git a/common/src/generated/resources/assets/blissful/models/item/hemp_crate.json b/common/src/generated/resources/assets/blissful/models/item/hemp_crate.json deleted file mode 100644 index e4e14ea..0000000 --- a/common/src/generated/resources/assets/blissful/models/item/hemp_crate.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "blissful:block/hemp_crate" -} \ No newline at end of file diff --git a/common/src/generated/resources/assets/blissful/models/item/herbal_salve.json b/common/src/generated/resources/assets/blissful/models/item/herbal_salve.json deleted file mode 100644 index 8fd879f..0000000 --- a/common/src/generated/resources/assets/blissful/models/item/herbal_salve.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "blissful:item/herbal_salve" - } -} \ No newline at end of file diff --git a/common/src/generated/resources/assets/blissful/models/item/potion_bong.json b/common/src/generated/resources/assets/blissful/models/item/potion_bong.json deleted file mode 100644 index 370437a..0000000 --- a/common/src/generated/resources/assets/blissful/models/item/potion_bong.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "blissful:item/bong_potion", - "layer1": "blissful:item/bong_potion_overlay" - } -} \ No newline at end of file diff --git a/common/src/generated/resources/assets/blissful/models/item/weed_brownies.json b/common/src/generated/resources/assets/blissful/models/item/weed_brownies.json deleted file mode 100644 index 7b1fc1e..0000000 --- a/common/src/generated/resources/assets/blissful/models/item/weed_brownies.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "blissful:item/weed_brownies" - } -} \ No newline at end of file diff --git a/common/src/generated/resources/assets/blissful/models/item/weed_crate.json b/common/src/generated/resources/assets/blissful/models/item/weed_crate.json deleted file mode 100644 index 9fc8d1d..0000000 --- a/common/src/generated/resources/assets/blissful/models/item/weed_crate.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "blissful:block/weed_crate" -} \ No newline at end of file diff --git a/common/src/generated/resources/assets/nirvana/blockstates/bliss_bloom.json b/common/src/generated/resources/assets/nirvana/blockstates/bliss_bloom.json new file mode 100644 index 0000000..7aa3b3d --- /dev/null +++ b/common/src/generated/resources/assets/nirvana/blockstates/bliss_bloom.json @@ -0,0 +1,10 @@ +{ + "variants": { + "half=lower": { + "model": "nirvana:block/bliss_bloom_lower" + }, + "half=upper": { + "model": "nirvana:block/bliss_bloom_upper" + } + } +} \ No newline at end of file diff --git a/common/src/generated/resources/assets/nirvana/blockstates/feral_hemp.json b/common/src/generated/resources/assets/nirvana/blockstates/feral_hemp.json new file mode 100644 index 0000000..a02952a --- /dev/null +++ b/common/src/generated/resources/assets/nirvana/blockstates/feral_hemp.json @@ -0,0 +1,15 @@ +{ + "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/hemp.json b/common/src/generated/resources/assets/nirvana/blockstates/hemp.json new file mode 100644 index 0000000..f917833 --- /dev/null +++ b/common/src/generated/resources/assets/nirvana/blockstates/hemp.json @@ -0,0 +1,22 @@ +{ + "variants": { + "age=0": { + "model": "nirvana:block/hemp_0" + }, + "age=1": { + "model": "nirvana:block/hemp_1" + }, + "age=2": { + "model": "nirvana:block/hemp_2" + }, + "age=3": { + "model": "nirvana:block/hemp_3" + }, + "age=4": { + "model": "nirvana:block/hemp_4" + }, + "age=5": { + "model": "nirvana:block/hemp_5" + } + } +} \ No newline at end of file diff --git a/common/src/generated/resources/assets/blissful/blockstates/hemp_crate.json b/common/src/generated/resources/assets/nirvana/blockstates/hemp_crate.json similarity index 50% rename from common/src/generated/resources/assets/blissful/blockstates/hemp_crate.json rename to common/src/generated/resources/assets/nirvana/blockstates/hemp_crate.json index a56cc85..7a3a2be 100644 --- a/common/src/generated/resources/assets/blissful/blockstates/hemp_crate.json +++ b/common/src/generated/resources/assets/nirvana/blockstates/hemp_crate.json @@ -1,18 +1,18 @@ { "variants": { "facing=east": { - "model": "blissful:block/hemp_crate", + "model": "nirvana:block/hemp_crate", "y": 270 }, "facing=north": { - "model": "blissful:block/hemp_crate", + "model": "nirvana:block/hemp_crate", "y": 180 }, "facing=south": { - "model": "blissful:block/hemp_crate" + "model": "nirvana:block/hemp_crate" }, "facing=west": { - "model": "blissful:block/hemp_crate", + "model": "nirvana:block/hemp_crate", "y": 90 } } diff --git a/common/src/generated/resources/assets/blissful/blockstates/weed_crate.json b/common/src/generated/resources/assets/nirvana/blockstates/weed_crate.json similarity index 50% rename from common/src/generated/resources/assets/blissful/blockstates/weed_crate.json rename to common/src/generated/resources/assets/nirvana/blockstates/weed_crate.json index 270d033..055e1fa 100644 --- a/common/src/generated/resources/assets/blissful/blockstates/weed_crate.json +++ b/common/src/generated/resources/assets/nirvana/blockstates/weed_crate.json @@ -1,18 +1,18 @@ { "variants": { "facing=east": { - "model": "blissful:block/weed_crate", + "model": "nirvana:block/weed_crate", "y": 270 }, "facing=north": { - "model": "blissful:block/weed_crate", + "model": "nirvana:block/weed_crate", "y": 180 }, "facing=south": { - "model": "blissful:block/weed_crate" + "model": "nirvana:block/weed_crate" }, "facing=west": { - "model": "blissful:block/weed_crate", + "model": "nirvana:block/weed_crate", "y": 90 } } diff --git a/common/src/generated/resources/assets/nirvana/lang/en_ud.json b/common/src/generated/resources/assets/nirvana/lang/en_ud.json new file mode 100644 index 0000000..350355c --- /dev/null +++ b/common/src/generated/resources/assets/nirvana/lang/en_ud.json @@ -0,0 +1,38 @@ +{ + "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", + "effect.nirvana.peace": "ǝɔɐǝԀ", + "effect.nirvana.peace.description": "uıɐɹq ɹnoʎ sboɟǝq ɐɹnɐ ןnɟssıןq Ɐ", + "item.nirvana.bong": "buoᗺ", + "item.nirvana.hemp": "dɯǝH", + "item.nirvana.hemp_seeds": "spǝǝS dɯǝH", + "item.nirvana.herbal_salve": "ǝʌןɐS ןɐqɹǝH", + "item.nirvana.joint": "ʇuıoſ", + "item.nirvana.potion_bong": "buoᗺ uoıʇoԀ", + "item.nirvana.potion_bong.effect.awkward": "buoᗺ pɹɐʍʞʍⱯ", + "item.nirvana.potion_bong.effect.empty": "buoᗺ ʎʇdɯƎ", + "item.nirvana.potion_bong.effect.fire_resistance": "ǝɔuɐʇsısǝᴚ ǝɹıℲ ɟo buoᗺ", + "item.nirvana.potion_bong.effect.harming": "buıɯɹɐH ɟo buoᗺ", + "item.nirvana.potion_bong.effect.healing": "buıןɐǝH ɟo buoᗺ", + "item.nirvana.potion_bong.effect.invisibility": "ʎʇıןıqısıʌuI ɟo buoᗺ", + "item.nirvana.potion_bong.effect.leaping": "buıdɐǝꞀ ɟo buoᗺ", + "item.nirvana.potion_bong.effect.luck": "ʞɔnꞀ ɟo buoᗺ", + "item.nirvana.potion_bong.effect.mundane": "buoᗺ ǝuɐpunW", + "item.nirvana.potion_bong.effect.night_vision": "uoısıΛ ʇɥbıN ɟo buoᗺ", + "item.nirvana.potion_bong.effect.poison": "uosıoԀ ɟo buoᗺ", + "item.nirvana.potion_bong.effect.regeneration": "uoıʇɐɹǝuǝbǝᴚ ɟo buoᗺ", + "item.nirvana.potion_bong.effect.slow_falling": "buıןןɐℲ ʍoןS ɟo buoᗺ", + "item.nirvana.potion_bong.effect.slowness": "ssǝuʍoןS ɟo buoᗺ", + "item.nirvana.potion_bong.effect.strength": "ɥʇbuǝɹʇS ɟo buoᗺ", + "item.nirvana.potion_bong.effect.swiftness": "ssǝuʇɟıʍS ɟo buoᗺ", + "item.nirvana.potion_bong.effect.thick": "buoᗺ ʞɔıɥ⟘", + "item.nirvana.potion_bong.effect.turtle_master": "ɹǝʇsɐW ǝןʇɹn⟘ ɟo buoᗺ", + "item.nirvana.potion_bong.effect.water": "buoᗺ ɹǝʇɐM", + "item.nirvana.potion_bong.effect.water_breathing": "buıɥʇɐǝɹᗺ ɹǝʇɐM ɟo buoᗺ", + "item.nirvana.potion_bong.effect.weakness": "ssǝuʞɐǝM ɟo buoᗺ", + "item.nirvana.weed": "pǝǝM", + "item.nirvana.weed_brownies": "sǝıuʍoɹᗺ pǝǝM" +} \ No newline at end of file diff --git a/common/src/generated/resources/assets/nirvana/lang/en_us.json b/common/src/generated/resources/assets/nirvana/lang/en_us.json new file mode 100644 index 0000000..4b869f5 --- /dev/null +++ b/common/src/generated/resources/assets/nirvana/lang/en_us.json @@ -0,0 +1,38 @@ +{ + "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", + "effect.nirvana.peace": "Peace", + "effect.nirvana.peace.description": "A blissful aura befogs your brain", + "item.nirvana.bong": "Bong", + "item.nirvana.hemp": "Hemp", + "item.nirvana.hemp_seeds": "Hemp Seeds", + "item.nirvana.herbal_salve": "Herbal Salve", + "item.nirvana.joint": "Joint", + "item.nirvana.potion_bong": "Potion Bong", + "item.nirvana.potion_bong.effect.awkward": "Awkward Bong", + "item.nirvana.potion_bong.effect.empty": "Empty Bong", + "item.nirvana.potion_bong.effect.fire_resistance": "Bong of Fire Resistance", + "item.nirvana.potion_bong.effect.harming": "Bong of Harming", + "item.nirvana.potion_bong.effect.healing": "Bong of Healing", + "item.nirvana.potion_bong.effect.invisibility": "Bong of Invisibility", + "item.nirvana.potion_bong.effect.leaping": "Bong of Leaping", + "item.nirvana.potion_bong.effect.luck": "Bong of Luck", + "item.nirvana.potion_bong.effect.mundane": "Mundane Bong", + "item.nirvana.potion_bong.effect.night_vision": "Bong of Night Vision", + "item.nirvana.potion_bong.effect.poison": "Bong of Poison", + "item.nirvana.potion_bong.effect.regeneration": "Bong of Regeneration", + "item.nirvana.potion_bong.effect.slow_falling": "Bong of Slow Falling", + "item.nirvana.potion_bong.effect.slowness": "Bong of Slowness", + "item.nirvana.potion_bong.effect.strength": "Bong of Strength", + "item.nirvana.potion_bong.effect.swiftness": "Bong of Swiftness", + "item.nirvana.potion_bong.effect.thick": "Thick Bong", + "item.nirvana.potion_bong.effect.turtle_master": "Bong of Turtle Master", + "item.nirvana.potion_bong.effect.water": "Water Bong", + "item.nirvana.potion_bong.effect.water_breathing": "Bong of Water Breathing", + "item.nirvana.potion_bong.effect.weakness": "Bong of Weakness", + "item.nirvana.weed": "Weed", + "item.nirvana.weed_brownies": "Weed Brownies" +} \ No newline at end of file diff --git a/common/src/generated/resources/assets/blissful/models/block/bliss_bloom_lower.json b/common/src/generated/resources/assets/nirvana/models/block/bliss_bloom_lower.json similarity index 55% rename from common/src/generated/resources/assets/blissful/models/block/bliss_bloom_lower.json rename to common/src/generated/resources/assets/nirvana/models/block/bliss_bloom_lower.json index c843d58..c756c6d 100644 --- a/common/src/generated/resources/assets/blissful/models/block/bliss_bloom_lower.json +++ b/common/src/generated/resources/assets/nirvana/models/block/bliss_bloom_lower.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cross", "textures": { - "cross": "blissful:block/bliss_bloom_lower" + "cross": "nirvana:block/bliss_bloom_lower" } } \ No newline at end of file diff --git a/common/src/generated/resources/assets/blissful/models/block/bliss_bloom_upper.json b/common/src/generated/resources/assets/nirvana/models/block/bliss_bloom_upper.json similarity index 55% rename from common/src/generated/resources/assets/blissful/models/block/bliss_bloom_upper.json rename to common/src/generated/resources/assets/nirvana/models/block/bliss_bloom_upper.json index 2bad6f6..f6a3ae2 100644 --- a/common/src/generated/resources/assets/blissful/models/block/bliss_bloom_upper.json +++ b/common/src/generated/resources/assets/nirvana/models/block/bliss_bloom_upper.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cross", "textures": { - "cross": "blissful:block/bliss_bloom_upper" + "cross": "nirvana:block/bliss_bloom_upper" } } \ No newline at end of file diff --git a/common/src/generated/resources/assets/nirvana/models/block/hemp_0.json b/common/src/generated/resources/assets/nirvana/models/block/hemp_0.json new file mode 100644 index 0000000..4e7051f --- /dev/null +++ b/common/src/generated/resources/assets/nirvana/models/block/hemp_0.json @@ -0,0 +1,6 @@ +{ + "parent": "nirvana:block/crop_cross", + "textures": { + "cross": "nirvana:block/hemp_0" + } +} \ No newline at end of file diff --git a/common/src/generated/resources/assets/nirvana/models/block/hemp_1.json b/common/src/generated/resources/assets/nirvana/models/block/hemp_1.json new file mode 100644 index 0000000..039593c --- /dev/null +++ b/common/src/generated/resources/assets/nirvana/models/block/hemp_1.json @@ -0,0 +1,6 @@ +{ + "parent": "nirvana:block/crop_cross", + "textures": { + "cross": "nirvana:block/hemp_1" + } +} \ No newline at end of file diff --git a/common/src/generated/resources/assets/nirvana/models/block/hemp_2.json b/common/src/generated/resources/assets/nirvana/models/block/hemp_2.json new file mode 100644 index 0000000..6b10166 --- /dev/null +++ b/common/src/generated/resources/assets/nirvana/models/block/hemp_2.json @@ -0,0 +1,6 @@ +{ + "parent": "nirvana:block/crop_cross", + "textures": { + "cross": "nirvana:block/hemp_2" + } +} \ No newline at end of file diff --git a/common/src/generated/resources/assets/nirvana/models/block/hemp_crate.json b/common/src/generated/resources/assets/nirvana/models/block/hemp_crate.json new file mode 100644 index 0000000..5e8bcf7 --- /dev/null +++ b/common/src/generated/resources/assets/nirvana/models/block/hemp_crate.json @@ -0,0 +1,12 @@ +{ + "parent": "minecraft:block/cube", + "textures": { + "down": "nirvana:block/hemp_crate_bottom", + "east": "nirvana:block/hemp_crate_side", + "north": "nirvana:block/hemp_crate_front", + "particle": "nirvana:block/hemp_crate_top", + "south": "nirvana:block/hemp_crate_back", + "up": "nirvana:block/hemp_crate_top", + "west": "nirvana:block/hemp_crate_side" + } +} \ No newline at end of file diff --git a/common/src/generated/resources/assets/nirvana/models/block/weed_crate.json b/common/src/generated/resources/assets/nirvana/models/block/weed_crate.json new file mode 100644 index 0000000..e21370e --- /dev/null +++ b/common/src/generated/resources/assets/nirvana/models/block/weed_crate.json @@ -0,0 +1,12 @@ +{ + "parent": "minecraft:block/cube", + "textures": { + "down": "nirvana:block/weed_crate_bottom", + "east": "nirvana:block/weed_crate_side", + "north": "nirvana:block/weed_crate_front", + "particle": "nirvana:block/weed_crate_top", + "south": "nirvana:block/weed_crate_back", + "up": "nirvana:block/weed_crate_top", + "west": "nirvana:block/weed_crate_side" + } +} \ No newline at end of file diff --git a/common/src/generated/resources/assets/nirvana/models/item/bliss_bloom.json b/common/src/generated/resources/assets/nirvana/models/item/bliss_bloom.json new file mode 100644 index 0000000..c8f31e4 --- /dev/null +++ b/common/src/generated/resources/assets/nirvana/models/item/bliss_bloom.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "nirvana:block/bliss_bloom_upper" + } +} \ No newline at end of file diff --git a/common/src/generated/resources/assets/blissful/models/item/bong.json b/common/src/generated/resources/assets/nirvana/models/item/bong.json similarity index 64% rename from common/src/generated/resources/assets/blissful/models/item/bong.json rename to common/src/generated/resources/assets/nirvana/models/item/bong.json index 8b7d62c..902d0b4 100644 --- a/common/src/generated/resources/assets/blissful/models/item/bong.json +++ b/common/src/generated/resources/assets/nirvana/models/item/bong.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "blissful:item/bong" + "layer0": "nirvana:item/bong" } } \ 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/feral_hemp.json new file mode 100644 index 0000000..1f6e11b --- /dev/null +++ b/common/src/generated/resources/assets/nirvana/models/item/feral_hemp.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "nirvana:item/feral_hemp" + } +} \ No newline at end of file diff --git a/common/src/generated/resources/assets/blissful/models/item/hemp.json b/common/src/generated/resources/assets/nirvana/models/item/hemp.json similarity index 64% rename from common/src/generated/resources/assets/blissful/models/item/hemp.json rename to common/src/generated/resources/assets/nirvana/models/item/hemp.json index 0c10f3c..5e0946d 100644 --- a/common/src/generated/resources/assets/blissful/models/item/hemp.json +++ b/common/src/generated/resources/assets/nirvana/models/item/hemp.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "blissful:item/hemp" + "layer0": "nirvana:item/hemp" } } \ No newline at end of file diff --git a/common/src/generated/resources/assets/nirvana/models/item/hemp_crate.json b/common/src/generated/resources/assets/nirvana/models/item/hemp_crate.json new file mode 100644 index 0000000..5c05ef3 --- /dev/null +++ b/common/src/generated/resources/assets/nirvana/models/item/hemp_crate.json @@ -0,0 +1,3 @@ +{ + "parent": "nirvana:block/hemp_crate" +} \ No newline at end of file diff --git a/common/src/generated/resources/assets/nirvana/models/item/hemp_seeds.json b/common/src/generated/resources/assets/nirvana/models/item/hemp_seeds.json new file mode 100644 index 0000000..eb9bdb6 --- /dev/null +++ b/common/src/generated/resources/assets/nirvana/models/item/hemp_seeds.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "nirvana:item/hemp_seeds" + } +} \ No newline at end of file diff --git a/common/src/generated/resources/assets/blissful/models/item/feral_hemp.json b/common/src/generated/resources/assets/nirvana/models/item/herbal_salve.json similarity index 60% rename from common/src/generated/resources/assets/blissful/models/item/feral_hemp.json rename to common/src/generated/resources/assets/nirvana/models/item/herbal_salve.json index 2c9b515..830389f 100644 --- a/common/src/generated/resources/assets/blissful/models/item/feral_hemp.json +++ b/common/src/generated/resources/assets/nirvana/models/item/herbal_salve.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "blissful:item/feral_hemp" + "layer0": "nirvana:item/herbal_salve" } } \ No newline at end of file diff --git a/common/src/generated/resources/assets/blissful/models/item/joint.json b/common/src/generated/resources/assets/nirvana/models/item/joint.json similarity index 100% rename from common/src/generated/resources/assets/blissful/models/item/joint.json rename to common/src/generated/resources/assets/nirvana/models/item/joint.json diff --git a/common/src/generated/resources/assets/blissful/models/item/joint_flat.json b/common/src/generated/resources/assets/nirvana/models/item/joint_flat.json similarity index 63% rename from common/src/generated/resources/assets/blissful/models/item/joint_flat.json rename to common/src/generated/resources/assets/nirvana/models/item/joint_flat.json index e261d32..ab48c12 100644 --- a/common/src/generated/resources/assets/blissful/models/item/joint_flat.json +++ b/common/src/generated/resources/assets/nirvana/models/item/joint_flat.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "blissful:item/joint" + "layer0": "nirvana:item/joint" } } \ No newline at end of file diff --git a/common/src/generated/resources/assets/nirvana/models/item/potion_bong.json b/common/src/generated/resources/assets/nirvana/models/item/potion_bong.json new file mode 100644 index 0000000..71a981c --- /dev/null +++ b/common/src/generated/resources/assets/nirvana/models/item/potion_bong.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "nirvana:item/bong_potion", + "layer1": "nirvana:item/bong_potion_overlay" + } +} \ No newline at end of file diff --git a/common/src/generated/resources/assets/blissful/models/item/weed.json b/common/src/generated/resources/assets/nirvana/models/item/weed.json similarity index 64% rename from common/src/generated/resources/assets/blissful/models/item/weed.json rename to common/src/generated/resources/assets/nirvana/models/item/weed.json index 24cf5b3..98ca76f 100644 --- a/common/src/generated/resources/assets/blissful/models/item/weed.json +++ b/common/src/generated/resources/assets/nirvana/models/item/weed.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "blissful:item/weed" + "layer0": "nirvana:item/weed" } } \ No newline at end of file diff --git a/common/src/generated/resources/assets/blissful/models/item/hemp_seeds.json b/common/src/generated/resources/assets/nirvana/models/item/weed_brownies.json similarity index 59% rename from common/src/generated/resources/assets/blissful/models/item/hemp_seeds.json rename to common/src/generated/resources/assets/nirvana/models/item/weed_brownies.json index 80e452f..8d1144a 100644 --- a/common/src/generated/resources/assets/blissful/models/item/hemp_seeds.json +++ b/common/src/generated/resources/assets/nirvana/models/item/weed_brownies.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "blissful:item/hemp_seeds" + "layer0": "nirvana:item/weed_brownies" } } \ No newline at end of file diff --git a/common/src/generated/resources/assets/nirvana/models/item/weed_crate.json b/common/src/generated/resources/assets/nirvana/models/item/weed_crate.json new file mode 100644 index 0000000..fcb0ae6 --- /dev/null +++ b/common/src/generated/resources/assets/nirvana/models/item/weed_crate.json @@ -0,0 +1,3 @@ +{ + "parent": "nirvana:block/weed_crate" +} \ No newline at end of file diff --git a/common/src/generated/resources/data/blissful/advancements/recipes/misc/weed_from_hemp_campfire.json b/common/src/generated/resources/data/blissful/advancements/recipes/misc/weed_from_hemp_campfire.json deleted file mode 100644 index 2fbf804..0000000 --- a/common/src/generated/resources/data/blissful/advancements/recipes/misc/weed_from_hemp_campfire.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_hemp": { - "conditions": { - "items": [ - { - "items": [ - "blissful:hemp" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "blissful:weed_from_hemp_campfire" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_hemp", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "blissful:weed_from_hemp_campfire" - ] - }, - "sends_telemetry_event": false -} \ No newline at end of file diff --git a/common/src/generated/resources/data/blissful/advancements/recipes/misc/weed_from_hemp_smelting.json b/common/src/generated/resources/data/blissful/advancements/recipes/misc/weed_from_hemp_smelting.json deleted file mode 100644 index d9dcada..0000000 --- a/common/src/generated/resources/data/blissful/advancements/recipes/misc/weed_from_hemp_smelting.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_hemp": { - "conditions": { - "items": [ - { - "items": [ - "blissful:hemp" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "blissful:weed_from_hemp_smelting" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_hemp", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "blissful:weed_from_hemp_smelting" - ] - }, - "sends_telemetry_event": false -} \ No newline at end of file diff --git a/common/src/generated/resources/data/blissful/advancements/recipes/misc/weed_from_hemp_smoking.json b/common/src/generated/resources/data/blissful/advancements/recipes/misc/weed_from_hemp_smoking.json deleted file mode 100644 index 5d4e318..0000000 --- a/common/src/generated/resources/data/blissful/advancements/recipes/misc/weed_from_hemp_smoking.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_hemp": { - "conditions": { - "items": [ - { - "items": [ - "blissful:hemp" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "blissful:weed_from_hemp_smoking" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_hemp", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "blissful:weed_from_hemp_smoking" - ] - }, - "sends_telemetry_event": false -} \ No newline at end of file diff --git a/common/src/generated/resources/data/minecraft/tags/blocks/crops.json b/common/src/generated/resources/data/minecraft/tags/blocks/crops.json index 141c66e..383a390 100644 --- a/common/src/generated/resources/data/minecraft/tags/blocks/crops.json +++ b/common/src/generated/resources/data/minecraft/tags/blocks/crops.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "blissful:hemp" + "nirvana:hemp" ] } \ No newline at end of file diff --git a/common/src/generated/resources/data/minecraft/tags/blocks/mineable/axe.json b/common/src/generated/resources/data/minecraft/tags/blocks/mineable/axe.json index d854718..36966d3 100644 --- a/common/src/generated/resources/data/minecraft/tags/blocks/mineable/axe.json +++ b/common/src/generated/resources/data/minecraft/tags/blocks/mineable/axe.json @@ -1,7 +1,7 @@ { "replace": false, "values": [ - "blissful:hemp_crate", - "blissful:weed_crate" + "nirvana:hemp_crate", + "nirvana:weed_crate" ] } \ 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 69d5976..2e69fac 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": [ - "blissful:feral_hemp" + "nirvana:feral_hemp" ] } \ No newline at end of file diff --git a/common/src/generated/resources/data/minecraft/tags/blocks/tall_flowers.json b/common/src/generated/resources/data/minecraft/tags/blocks/tall_flowers.json index bba2cbe..3fd392c 100644 --- a/common/src/generated/resources/data/minecraft/tags/blocks/tall_flowers.json +++ b/common/src/generated/resources/data/minecraft/tags/blocks/tall_flowers.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "blissful:bliss_bloom" + "nirvana:bliss_bloom" ] } \ No newline at end of file diff --git a/common/src/generated/resources/data/blissful/advancements/recipes/decorations/hemp_crate.json b/common/src/generated/resources/data/nirvana/advancements/recipes/decorations/hemp_crate.json similarity index 84% rename from common/src/generated/resources/data/blissful/advancements/recipes/decorations/hemp_crate.json rename to common/src/generated/resources/data/nirvana/advancements/recipes/decorations/hemp_crate.json index 168e79b..f417053 100644 --- a/common/src/generated/resources/data/blissful/advancements/recipes/decorations/hemp_crate.json +++ b/common/src/generated/resources/data/nirvana/advancements/recipes/decorations/hemp_crate.json @@ -6,7 +6,7 @@ "items": [ { "items": [ - "blissful:hemp" + "nirvana:hemp" ] } ] @@ -15,7 +15,7 @@ }, "has_the_recipe": { "conditions": { - "recipe": "blissful:hemp_crate" + "recipe": "nirvana:hemp_crate" }, "trigger": "minecraft:recipe_unlocked" } @@ -28,7 +28,7 @@ ], "rewards": { "recipes": [ - "blissful:hemp_crate" + "nirvana:hemp_crate" ] }, "sends_telemetry_event": false diff --git a/common/src/generated/resources/data/blissful/advancements/recipes/decorations/hemp_from_hemp_crate.json b/common/src/generated/resources/data/nirvana/advancements/recipes/decorations/hemp_from_hemp_crate.json similarity index 80% rename from common/src/generated/resources/data/blissful/advancements/recipes/decorations/hemp_from_hemp_crate.json rename to common/src/generated/resources/data/nirvana/advancements/recipes/decorations/hemp_from_hemp_crate.json index 478d7da..28e79b3 100644 --- a/common/src/generated/resources/data/blissful/advancements/recipes/decorations/hemp_from_hemp_crate.json +++ b/common/src/generated/resources/data/nirvana/advancements/recipes/decorations/hemp_from_hemp_crate.json @@ -6,7 +6,7 @@ "items": [ { "items": [ - "blissful:hemp_crate" + "nirvana:hemp_crate" ] } ] @@ -15,7 +15,7 @@ }, "has_the_recipe": { "conditions": { - "recipe": "blissful:hemp_from_hemp_crate" + "recipe": "nirvana:hemp_from_hemp_crate" }, "trigger": "minecraft:recipe_unlocked" } @@ -28,7 +28,7 @@ ], "rewards": { "recipes": [ - "blissful:hemp_from_hemp_crate" + "nirvana:hemp_from_hemp_crate" ] }, "sends_telemetry_event": false diff --git a/common/src/generated/resources/data/blissful/advancements/recipes/decorations/weed_crate.json b/common/src/generated/resources/data/nirvana/advancements/recipes/decorations/weed_crate.json similarity index 84% rename from common/src/generated/resources/data/blissful/advancements/recipes/decorations/weed_crate.json rename to common/src/generated/resources/data/nirvana/advancements/recipes/decorations/weed_crate.json index dfb3d03..6cbf8de 100644 --- a/common/src/generated/resources/data/blissful/advancements/recipes/decorations/weed_crate.json +++ b/common/src/generated/resources/data/nirvana/advancements/recipes/decorations/weed_crate.json @@ -3,7 +3,7 @@ "criteria": { "has_the_recipe": { "conditions": { - "recipe": "blissful:weed_crate" + "recipe": "nirvana:weed_crate" }, "trigger": "minecraft:recipe_unlocked" }, @@ -12,7 +12,7 @@ "items": [ { "items": [ - "blissful:weed" + "nirvana:weed" ] } ] @@ -28,7 +28,7 @@ ], "rewards": { "recipes": [ - "blissful:weed_crate" + "nirvana:weed_crate" ] }, "sends_telemetry_event": false diff --git a/common/src/generated/resources/data/blissful/advancements/recipes/decorations/weed_from_weed_crate.json b/common/src/generated/resources/data/nirvana/advancements/recipes/decorations/weed_from_weed_crate.json similarity index 80% rename from common/src/generated/resources/data/blissful/advancements/recipes/decorations/weed_from_weed_crate.json rename to common/src/generated/resources/data/nirvana/advancements/recipes/decorations/weed_from_weed_crate.json index 22add04..3c2692c 100644 --- a/common/src/generated/resources/data/blissful/advancements/recipes/decorations/weed_from_weed_crate.json +++ b/common/src/generated/resources/data/nirvana/advancements/recipes/decorations/weed_from_weed_crate.json @@ -3,7 +3,7 @@ "criteria": { "has_the_recipe": { "conditions": { - "recipe": "blissful:weed_from_weed_crate" + "recipe": "nirvana:weed_from_weed_crate" }, "trigger": "minecraft:recipe_unlocked" }, @@ -12,7 +12,7 @@ "items": [ { "items": [ - "blissful:weed_crate" + "nirvana:weed_crate" ] } ] @@ -28,7 +28,7 @@ ], "rewards": { "recipes": [ - "blissful:weed_from_weed_crate" + "nirvana:weed_from_weed_crate" ] }, "sends_telemetry_event": false diff --git a/common/src/generated/resources/data/blissful/advancements/recipes/food/joint.json b/common/src/generated/resources/data/nirvana/advancements/recipes/food/joint.json similarity index 85% rename from common/src/generated/resources/data/blissful/advancements/recipes/food/joint.json rename to common/src/generated/resources/data/nirvana/advancements/recipes/food/joint.json index e8d6810..a762c30 100644 --- a/common/src/generated/resources/data/blissful/advancements/recipes/food/joint.json +++ b/common/src/generated/resources/data/nirvana/advancements/recipes/food/joint.json @@ -3,7 +3,7 @@ "criteria": { "has_the_recipe": { "conditions": { - "recipe": "blissful:joint" + "recipe": "nirvana:joint" }, "trigger": "minecraft:recipe_unlocked" }, @@ -12,7 +12,7 @@ "items": [ { "items": [ - "blissful:weed" + "nirvana:weed" ] } ] @@ -28,7 +28,7 @@ ], "rewards": { "recipes": [ - "blissful:joint" + "nirvana:joint" ] }, "sends_telemetry_event": false diff --git a/common/src/generated/resources/data/blissful/advancements/recipes/food/weed_brownies.json b/common/src/generated/resources/data/nirvana/advancements/recipes/food/weed_brownies.json similarity index 82% rename from common/src/generated/resources/data/blissful/advancements/recipes/food/weed_brownies.json rename to common/src/generated/resources/data/nirvana/advancements/recipes/food/weed_brownies.json index febeb02..518d2a0 100644 --- a/common/src/generated/resources/data/blissful/advancements/recipes/food/weed_brownies.json +++ b/common/src/generated/resources/data/nirvana/advancements/recipes/food/weed_brownies.json @@ -6,7 +6,7 @@ "items": [ { "items": [ - "blissful:hemp_seeds" + "nirvana:hemp_seeds" ] } ] @@ -15,7 +15,7 @@ }, "has_the_recipe": { "conditions": { - "recipe": "blissful:weed_brownies" + "recipe": "nirvana:weed_brownies" }, "trigger": "minecraft:recipe_unlocked" } @@ -28,7 +28,7 @@ ], "rewards": { "recipes": [ - "blissful:weed_brownies" + "nirvana:weed_brownies" ] }, "sends_telemetry_event": false diff --git a/common/src/generated/resources/data/blissful/advancements/recipes/misc/hemp_seeds.json b/common/src/generated/resources/data/nirvana/advancements/recipes/misc/hemp_seeds.json similarity index 84% rename from common/src/generated/resources/data/blissful/advancements/recipes/misc/hemp_seeds.json rename to common/src/generated/resources/data/nirvana/advancements/recipes/misc/hemp_seeds.json index 629b5fb..717a94c 100644 --- a/common/src/generated/resources/data/blissful/advancements/recipes/misc/hemp_seeds.json +++ b/common/src/generated/resources/data/nirvana/advancements/recipes/misc/hemp_seeds.json @@ -6,7 +6,7 @@ "items": [ { "items": [ - "blissful:hemp" + "nirvana:hemp" ] } ] @@ -15,7 +15,7 @@ }, "has_the_recipe": { "conditions": { - "recipe": "blissful:hemp_seeds" + "recipe": "nirvana:hemp_seeds" }, "trigger": "minecraft:recipe_unlocked" } @@ -28,7 +28,7 @@ ], "rewards": { "recipes": [ - "blissful:hemp_seeds" + "nirvana:hemp_seeds" ] }, "sends_telemetry_event": false diff --git a/common/src/generated/resources/data/nirvana/advancements/recipes/misc/weed_from_hemp_campfire.json b/common/src/generated/resources/data/nirvana/advancements/recipes/misc/weed_from_hemp_campfire.json new file mode 100644 index 0000000..44db1f4 --- /dev/null +++ b/common/src/generated/resources/data/nirvana/advancements/recipes/misc/weed_from_hemp_campfire.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_hemp": { + "conditions": { + "items": [ + { + "items": [ + "nirvana:hemp" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "nirvana:weed_from_hemp_campfire" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_hemp", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "nirvana:weed_from_hemp_campfire" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/common/src/generated/resources/data/nirvana/advancements/recipes/misc/weed_from_hemp_smelting.json b/common/src/generated/resources/data/nirvana/advancements/recipes/misc/weed_from_hemp_smelting.json new file mode 100644 index 0000000..9de1eb3 --- /dev/null +++ b/common/src/generated/resources/data/nirvana/advancements/recipes/misc/weed_from_hemp_smelting.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_hemp": { + "conditions": { + "items": [ + { + "items": [ + "nirvana:hemp" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "nirvana:weed_from_hemp_smelting" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_hemp", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "nirvana:weed_from_hemp_smelting" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/common/src/generated/resources/data/nirvana/advancements/recipes/misc/weed_from_hemp_smoking.json b/common/src/generated/resources/data/nirvana/advancements/recipes/misc/weed_from_hemp_smoking.json new file mode 100644 index 0000000..9b4cbcc --- /dev/null +++ b/common/src/generated/resources/data/nirvana/advancements/recipes/misc/weed_from_hemp_smoking.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_hemp": { + "conditions": { + "items": [ + { + "items": [ + "nirvana:hemp" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "nirvana:weed_from_hemp_smoking" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_hemp", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "nirvana:weed_from_hemp_smoking" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/common/src/generated/resources/data/blissful/advancements/recipes/tools/lead_from_hemp.json b/common/src/generated/resources/data/nirvana/advancements/recipes/tools/lead_from_hemp.json similarity index 82% rename from common/src/generated/resources/data/blissful/advancements/recipes/tools/lead_from_hemp.json rename to common/src/generated/resources/data/nirvana/advancements/recipes/tools/lead_from_hemp.json index d91de7c..19bce92 100644 --- a/common/src/generated/resources/data/blissful/advancements/recipes/tools/lead_from_hemp.json +++ b/common/src/generated/resources/data/nirvana/advancements/recipes/tools/lead_from_hemp.json @@ -6,7 +6,7 @@ "items": [ { "items": [ - "blissful:hemp" + "nirvana:hemp" ] } ] @@ -15,7 +15,7 @@ }, "has_the_recipe": { "conditions": { - "recipe": "blissful:lead_from_hemp" + "recipe": "nirvana:lead_from_hemp" }, "trigger": "minecraft:recipe_unlocked" } @@ -28,7 +28,7 @@ ], "rewards": { "recipes": [ - "blissful:lead_from_hemp" + "nirvana:lead_from_hemp" ] }, "sends_telemetry_event": false diff --git a/common/src/generated/resources/data/blissful/advancements/recipes/tools/leather_from_hemp.json b/common/src/generated/resources/data/nirvana/advancements/recipes/tools/leather_from_hemp.json similarity index 82% rename from common/src/generated/resources/data/blissful/advancements/recipes/tools/leather_from_hemp.json rename to common/src/generated/resources/data/nirvana/advancements/recipes/tools/leather_from_hemp.json index 4878500..d422eaa 100644 --- a/common/src/generated/resources/data/blissful/advancements/recipes/tools/leather_from_hemp.json +++ b/common/src/generated/resources/data/nirvana/advancements/recipes/tools/leather_from_hemp.json @@ -6,7 +6,7 @@ "items": [ { "items": [ - "blissful:hemp" + "nirvana:hemp" ] } ] @@ -15,7 +15,7 @@ }, "has_the_recipe": { "conditions": { - "recipe": "blissful:leather_from_hemp" + "recipe": "nirvana:leather_from_hemp" }, "trigger": "minecraft:recipe_unlocked" } @@ -28,7 +28,7 @@ ], "rewards": { "recipes": [ - "blissful:leather_from_hemp" + "nirvana:leather_from_hemp" ] }, "sends_telemetry_event": false diff --git a/common/src/generated/resources/data/blissful/loot_tables/blocks/bliss_bloom.json b/common/src/generated/resources/data/nirvana/loot_tables/blocks/bliss_bloom.json similarity index 76% rename from common/src/generated/resources/data/blissful/loot_tables/blocks/bliss_bloom.json rename to common/src/generated/resources/data/nirvana/loot_tables/blocks/bliss_bloom.json index b926c77..a6f4fe0 100644 --- a/common/src/generated/resources/data/blissful/loot_tables/blocks/bliss_bloom.json +++ b/common/src/generated/resources/data/nirvana/loot_tables/blocks/bliss_bloom.json @@ -8,7 +8,7 @@ "condition": "minecraft:survives_explosion" }, { - "block": "blissful:bliss_bloom", + "block": "nirvana:bliss_bloom", "condition": "minecraft:block_state_property", "properties": { "half": "lower" @@ -18,11 +18,11 @@ "entries": [ { "type": "minecraft:item", - "name": "blissful:bliss_bloom" + "name": "nirvana:bliss_bloom" } ], "rolls": 1.0 } ], - "random_sequence": "blissful:blocks/bliss_bloom" + "random_sequence": "nirvana:blocks/bliss_bloom" } \ No newline at end of file diff --git a/common/src/generated/resources/data/blissful/loot_tables/blocks/feral_hemp.json b/common/src/generated/resources/data/nirvana/loot_tables/blocks/feral_hemp.json similarity index 84% rename from common/src/generated/resources/data/blissful/loot_tables/blocks/feral_hemp.json rename to common/src/generated/resources/data/nirvana/loot_tables/blocks/feral_hemp.json index 0a510e0..11d7971 100644 --- a/common/src/generated/resources/data/blissful/loot_tables/blocks/feral_hemp.json +++ b/common/src/generated/resources/data/nirvana/loot_tables/blocks/feral_hemp.json @@ -18,11 +18,11 @@ { "condition": "minecraft:match_tool", "predicate": { - "tag": "blissful:shears" + "tag": "nirvana:shears" } } ], - "name": "blissful:feral_hemp" + "name": "nirvana:feral_hemp" }, { "type": "minecraft:item", @@ -37,7 +37,7 @@ "function": "minecraft:set_count" } ], - "name": "blissful:hemp" + "name": "nirvana:hemp" } ] } @@ -45,5 +45,5 @@ "rolls": 1.0 } ], - "random_sequence": "blissful:blocks/feral_hemp" + "random_sequence": "nirvana:blocks/feral_hemp" } \ No newline at end of file diff --git a/common/src/generated/resources/data/blissful/loot_tables/blocks/hemp.json b/common/src/generated/resources/data/nirvana/loot_tables/blocks/hemp.json similarity index 88% rename from common/src/generated/resources/data/blissful/loot_tables/blocks/hemp.json rename to common/src/generated/resources/data/nirvana/loot_tables/blocks/hemp.json index 63e599a..be3fc70 100644 --- a/common/src/generated/resources/data/blissful/loot_tables/blocks/hemp.json +++ b/common/src/generated/resources/data/nirvana/loot_tables/blocks/hemp.json @@ -16,7 +16,7 @@ "type": "minecraft:item", "conditions": [ { - "block": "blissful:hemp", + "block": "nirvana:hemp", "condition": "minecraft:block_state_property", "properties": { "age": "5" @@ -34,13 +34,13 @@ } } ], - "name": "blissful:hemp" + "name": "nirvana:hemp" }, { "type": "minecraft:item", "conditions": [ { - "block": "blissful:hemp", + "block": "nirvana:hemp", "condition": "minecraft:block_state_property", "properties": { "age": "6" @@ -58,11 +58,11 @@ } } ], - "name": "blissful:hemp" + "name": "nirvana:hemp" }, { "type": "minecraft:item", - "name": "blissful:hemp_seeds" + "name": "nirvana:hemp_seeds" } ] } @@ -79,7 +79,7 @@ "type": "minecraft:item", "conditions": [ { - "block": "blissful:hemp", + "block": "nirvana:hemp", "condition": "minecraft:block_state_property", "properties": { "age": "5" @@ -97,13 +97,13 @@ } } ], - "name": "blissful:hemp_seeds" + "name": "nirvana:hemp_seeds" }, { "type": "minecraft:item", "conditions": [ { - "block": "blissful:hemp", + "block": "nirvana:hemp", "condition": "minecraft:block_state_property", "properties": { "age": "6" @@ -121,7 +121,7 @@ } } ], - "name": "blissful:hemp_seeds" + "name": "nirvana:hemp_seeds" } ] } @@ -129,5 +129,5 @@ "rolls": 1.0 } ], - "random_sequence": "blissful:blocks/hemp" + "random_sequence": "nirvana:blocks/hemp" } \ No newline at end of file diff --git a/common/src/generated/resources/data/blissful/loot_tables/blocks/hemp_crate.json b/common/src/generated/resources/data/nirvana/loot_tables/blocks/hemp_crate.json similarity index 76% rename from common/src/generated/resources/data/blissful/loot_tables/blocks/hemp_crate.json rename to common/src/generated/resources/data/nirvana/loot_tables/blocks/hemp_crate.json index 8a4e87e..996c4c2 100644 --- a/common/src/generated/resources/data/blissful/loot_tables/blocks/hemp_crate.json +++ b/common/src/generated/resources/data/nirvana/loot_tables/blocks/hemp_crate.json @@ -11,11 +11,11 @@ "entries": [ { "type": "minecraft:item", - "name": "blissful:hemp_crate" + "name": "nirvana:hemp_crate" } ], "rolls": 1.0 } ], - "random_sequence": "blissful:blocks/hemp_crate" + "random_sequence": "nirvana:blocks/hemp_crate" } \ No newline at end of file diff --git a/common/src/generated/resources/data/blissful/loot_tables/blocks/weed_crate.json b/common/src/generated/resources/data/nirvana/loot_tables/blocks/weed_crate.json similarity index 76% rename from common/src/generated/resources/data/blissful/loot_tables/blocks/weed_crate.json rename to common/src/generated/resources/data/nirvana/loot_tables/blocks/weed_crate.json index 70ec865..fe8b233 100644 --- a/common/src/generated/resources/data/blissful/loot_tables/blocks/weed_crate.json +++ b/common/src/generated/resources/data/nirvana/loot_tables/blocks/weed_crate.json @@ -11,11 +11,11 @@ "entries": [ { "type": "minecraft:item", - "name": "blissful:weed_crate" + "name": "nirvana:weed_crate" } ], "rolls": 1.0 } ], - "random_sequence": "blissful:blocks/weed_crate" + "random_sequence": "nirvana:blocks/weed_crate" } \ No newline at end of file diff --git a/common/src/generated/resources/data/blissful/recipes/hemp_crate.json b/common/src/generated/resources/data/nirvana/recipes/hemp_crate.json similarity index 75% rename from common/src/generated/resources/data/blissful/recipes/hemp_crate.json rename to common/src/generated/resources/data/nirvana/recipes/hemp_crate.json index 1b8bb4e..2eda3fa 100644 --- a/common/src/generated/resources/data/blissful/recipes/hemp_crate.json +++ b/common/src/generated/resources/data/nirvana/recipes/hemp_crate.json @@ -3,7 +3,7 @@ "category": "misc", "key": { "X": { - "item": "blissful:hemp" + "item": "nirvana:hemp" } }, "pattern": [ @@ -12,7 +12,7 @@ "XXX" ], "result": { - "item": "blissful:hemp_crate" + "item": "nirvana:hemp_crate" }, "show_notification": true } \ No newline at end of file diff --git a/common/src/generated/resources/data/blissful/recipes/hemp_from_hemp_crate.json b/common/src/generated/resources/data/nirvana/recipes/hemp_from_hemp_crate.json similarity index 68% rename from common/src/generated/resources/data/blissful/recipes/hemp_from_hemp_crate.json rename to common/src/generated/resources/data/nirvana/recipes/hemp_from_hemp_crate.json index b138687..87e3ab2 100644 --- a/common/src/generated/resources/data/blissful/recipes/hemp_from_hemp_crate.json +++ b/common/src/generated/resources/data/nirvana/recipes/hemp_from_hemp_crate.json @@ -3,11 +3,11 @@ "category": "misc", "ingredients": [ { - "item": "blissful:hemp_crate" + "item": "nirvana:hemp_crate" } ], "result": { "count": 9, - "item": "blissful:hemp" + "item": "nirvana:hemp" } } \ No newline at end of file diff --git a/common/src/generated/resources/data/blissful/recipes/hemp_seeds.json b/common/src/generated/resources/data/nirvana/recipes/hemp_seeds.json similarity index 68% rename from common/src/generated/resources/data/blissful/recipes/hemp_seeds.json rename to common/src/generated/resources/data/nirvana/recipes/hemp_seeds.json index 4a68490..b67487b 100644 --- a/common/src/generated/resources/data/blissful/recipes/hemp_seeds.json +++ b/common/src/generated/resources/data/nirvana/recipes/hemp_seeds.json @@ -3,11 +3,11 @@ "category": "misc", "ingredients": [ { - "item": "blissful:hemp" + "item": "nirvana:hemp" } ], "result": { "count": 2, - "item": "blissful:hemp_seeds" + "item": "nirvana:hemp_seeds" } } \ No newline at end of file diff --git a/common/src/generated/resources/data/blissful/recipes/joint.json b/common/src/generated/resources/data/nirvana/recipes/joint.json similarity index 73% rename from common/src/generated/resources/data/blissful/recipes/joint.json rename to common/src/generated/resources/data/nirvana/recipes/joint.json index ef12c90..ad3ace2 100644 --- a/common/src/generated/resources/data/blissful/recipes/joint.json +++ b/common/src/generated/resources/data/nirvana/recipes/joint.json @@ -6,10 +6,10 @@ "item": "minecraft:paper" }, { - "item": "blissful:weed" + "item": "nirvana:weed" } ], "result": { - "item": "blissful:joint" + "item": "nirvana:joint" } } \ No newline at end of file diff --git a/common/src/generated/resources/data/blissful/recipes/lead_from_hemp.json b/common/src/generated/resources/data/nirvana/recipes/lead_from_hemp.json similarity index 90% rename from common/src/generated/resources/data/blissful/recipes/lead_from_hemp.json rename to common/src/generated/resources/data/nirvana/recipes/lead_from_hemp.json index ee120f9..6450f16 100644 --- a/common/src/generated/resources/data/blissful/recipes/lead_from_hemp.json +++ b/common/src/generated/resources/data/nirvana/recipes/lead_from_hemp.json @@ -3,7 +3,7 @@ "category": "equipment", "key": { "h": { - "item": "blissful:hemp" + "item": "nirvana:hemp" }, "s": { "item": "minecraft:string" diff --git a/common/src/generated/resources/data/blissful/recipes/leather_from_hemp.json b/common/src/generated/resources/data/nirvana/recipes/leather_from_hemp.json similarity index 88% rename from common/src/generated/resources/data/blissful/recipes/leather_from_hemp.json rename to common/src/generated/resources/data/nirvana/recipes/leather_from_hemp.json index 8573f69..a820589 100644 --- a/common/src/generated/resources/data/blissful/recipes/leather_from_hemp.json +++ b/common/src/generated/resources/data/nirvana/recipes/leather_from_hemp.json @@ -3,7 +3,7 @@ "category": "equipment", "key": { "h": { - "item": "blissful:hemp" + "item": "nirvana:hemp" } }, "pattern": [ diff --git a/common/src/generated/resources/data/blissful/recipes/weed_brownies.json b/common/src/generated/resources/data/nirvana/recipes/weed_brownies.json similarity index 76% rename from common/src/generated/resources/data/blissful/recipes/weed_brownies.json rename to common/src/generated/resources/data/nirvana/recipes/weed_brownies.json index e54d573..c33f841 100644 --- a/common/src/generated/resources/data/blissful/recipes/weed_brownies.json +++ b/common/src/generated/resources/data/nirvana/recipes/weed_brownies.json @@ -3,7 +3,7 @@ "category": "misc", "ingredients": [ { - "item": "blissful:hemp_seeds" + "item": "nirvana:hemp_seeds" }, { "item": "minecraft:wheat" @@ -14,6 +14,6 @@ ], "result": { "count": 2, - "item": "blissful:weed_brownies" + "item": "nirvana:weed_brownies" } } \ No newline at end of file diff --git a/common/src/generated/resources/data/blissful/recipes/weed_crate.json b/common/src/generated/resources/data/nirvana/recipes/weed_crate.json similarity index 75% rename from common/src/generated/resources/data/blissful/recipes/weed_crate.json rename to common/src/generated/resources/data/nirvana/recipes/weed_crate.json index 5cfa0ef..fba8d80 100644 --- a/common/src/generated/resources/data/blissful/recipes/weed_crate.json +++ b/common/src/generated/resources/data/nirvana/recipes/weed_crate.json @@ -3,7 +3,7 @@ "category": "misc", "key": { "X": { - "item": "blissful:weed" + "item": "nirvana:weed" } }, "pattern": [ @@ -12,7 +12,7 @@ "XXX" ], "result": { - "item": "blissful:weed_crate" + "item": "nirvana:weed_crate" }, "show_notification": true } \ No newline at end of file diff --git a/common/src/generated/resources/data/blissful/recipes/weed_from_hemp_campfire.json b/common/src/generated/resources/data/nirvana/recipes/weed_from_hemp_campfire.json similarity index 70% rename from common/src/generated/resources/data/blissful/recipes/weed_from_hemp_campfire.json rename to common/src/generated/resources/data/nirvana/recipes/weed_from_hemp_campfire.json index 016115c..b09f0f7 100644 --- a/common/src/generated/resources/data/blissful/recipes/weed_from_hemp_campfire.json +++ b/common/src/generated/resources/data/nirvana/recipes/weed_from_hemp_campfire.json @@ -4,7 +4,7 @@ "cookingtime": 600, "experience": 0.25, "ingredient": { - "item": "blissful:hemp" + "item": "nirvana:hemp" }, - "result": "blissful:weed" + "result": "nirvana:weed" } \ No newline at end of file diff --git a/common/src/generated/resources/data/blissful/recipes/weed_from_hemp_smelting.json b/common/src/generated/resources/data/nirvana/recipes/weed_from_hemp_smelting.json similarity index 68% rename from common/src/generated/resources/data/blissful/recipes/weed_from_hemp_smelting.json rename to common/src/generated/resources/data/nirvana/recipes/weed_from_hemp_smelting.json index acc2dce..fe1e862 100644 --- a/common/src/generated/resources/data/blissful/recipes/weed_from_hemp_smelting.json +++ b/common/src/generated/resources/data/nirvana/recipes/weed_from_hemp_smelting.json @@ -4,7 +4,7 @@ "cookingtime": 200, "experience": 0.25, "ingredient": { - "item": "blissful:hemp" + "item": "nirvana:hemp" }, - "result": "blissful:weed" + "result": "nirvana:weed" } \ No newline at end of file diff --git a/common/src/generated/resources/data/blissful/recipes/weed_from_hemp_smoking.json b/common/src/generated/resources/data/nirvana/recipes/weed_from_hemp_smoking.json similarity index 68% rename from common/src/generated/resources/data/blissful/recipes/weed_from_hemp_smoking.json rename to common/src/generated/resources/data/nirvana/recipes/weed_from_hemp_smoking.json index a9905b9..d5a32b3 100644 --- a/common/src/generated/resources/data/blissful/recipes/weed_from_hemp_smoking.json +++ b/common/src/generated/resources/data/nirvana/recipes/weed_from_hemp_smoking.json @@ -4,7 +4,7 @@ "cookingtime": 100, "experience": 0.25, "ingredient": { - "item": "blissful:hemp" + "item": "nirvana:hemp" }, - "result": "blissful:weed" + "result": "nirvana:weed" } \ No newline at end of file diff --git a/common/src/generated/resources/data/blissful/recipes/weed_from_weed_crate.json b/common/src/generated/resources/data/nirvana/recipes/weed_from_weed_crate.json similarity index 68% rename from common/src/generated/resources/data/blissful/recipes/weed_from_weed_crate.json rename to common/src/generated/resources/data/nirvana/recipes/weed_from_weed_crate.json index f82ad9b..3d1fc01 100644 --- a/common/src/generated/resources/data/blissful/recipes/weed_from_weed_crate.json +++ b/common/src/generated/resources/data/nirvana/recipes/weed_from_weed_crate.json @@ -3,11 +3,11 @@ "category": "misc", "ingredients": [ { - "item": "blissful:weed_crate" + "item": "nirvana:weed_crate" } ], "result": { "count": 9, - "item": "blissful:weed" + "item": "nirvana:weed" } } \ No newline at end of file diff --git a/common/src/generated/resources/data/blissful/tags/items/attached_to_head.json b/common/src/generated/resources/data/nirvana/tags/items/attached_to_head.json similarity index 66% rename from common/src/generated/resources/data/blissful/tags/items/attached_to_head.json rename to common/src/generated/resources/data/nirvana/tags/items/attached_to_head.json index fb41b2d..bcfe8a2 100644 --- a/common/src/generated/resources/data/blissful/tags/items/attached_to_head.json +++ b/common/src/generated/resources/data/nirvana/tags/items/attached_to_head.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "blissful:joint" + "nirvana:joint" ] } \ No newline at end of file diff --git a/common/src/generated/resources/data/blissful/tags/items/nauseating.json b/common/src/generated/resources/data/nirvana/tags/items/nauseating.json similarity index 66% rename from common/src/generated/resources/data/blissful/tags/items/nauseating.json rename to common/src/generated/resources/data/nirvana/tags/items/nauseating.json index fb41b2d..bcfe8a2 100644 --- a/common/src/generated/resources/data/blissful/tags/items/nauseating.json +++ b/common/src/generated/resources/data/nirvana/tags/items/nauseating.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "blissful:joint" + "nirvana:joint" ] } \ No newline at end of file diff --git a/common/src/generated/resources/data/sereneseasons/tags/blocks/summer_crops.json b/common/src/generated/resources/data/sereneseasons/tags/blocks/summer_crops.json index 141c66e..383a390 100644 --- a/common/src/generated/resources/data/sereneseasons/tags/blocks/summer_crops.json +++ b/common/src/generated/resources/data/sereneseasons/tags/blocks/summer_crops.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "blissful:hemp" + "nirvana:hemp" ] } \ No newline at end of file diff --git a/common/src/main/java/galena/blissful/BlissfulCommon.java b/common/src/main/java/galena/blissful/BlissfulCommon.java deleted file mode 100644 index 03cedd6..0000000 --- a/common/src/main/java/galena/blissful/BlissfulCommon.java +++ /dev/null @@ -1,22 +0,0 @@ -package galena.blissful; - -import galena.blissful.index.BlissfulRecipeTypes; -import galena.blissful.index.BlissfulBrewing; -import galena.blissful.index.BlissfulEffects; -import galena.blissful.index.BlissfulBlocks; -import galena.blissful.index.BlissfulItems; -import galena.blissful.platform.Services; -import net.minecraft.core.registries.Registries; - -public class BlissfulCommon { - - public static void init() { - BlissfulEffects.register(); - BlissfulBlocks.register(); - BlissfulItems.register(); - BlissfulRecipeTypes.register(); - - Services.PLATFORM.getRegistrate().addRegisterCallback(Registries.POTION, BlissfulBrewing::register); - } - -} diff --git a/common/src/main/java/galena/blissful/BlissfulConstants.java b/common/src/main/java/galena/blissful/BlissfulConstants.java deleted file mode 100644 index ee6be81..0000000 --- a/common/src/main/java/galena/blissful/BlissfulConstants.java +++ /dev/null @@ -1,12 +0,0 @@ -package galena.blissful; - -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; - -public class BlissfulConstants { - - public static final String MOD_ID = "blissful"; - - public static final Logger LOGGER = LogManager.getLogger("Blissful"); - -} diff --git a/common/src/main/java/galena/blissful/config/ConfigsImpl.java b/common/src/main/java/galena/blissful/config/ConfigsImpl.java deleted file mode 100644 index 3f0dcbf..0000000 --- a/common/src/main/java/galena/blissful/config/ConfigsImpl.java +++ /dev/null @@ -1,13 +0,0 @@ -package galena.blissful.config; - -import galena.blissful.platform.services.IConfigs; - -public class ConfigsImpl implements IConfigs { - - private final BlissfulCommonConfig common = new BlissfulCommonConfig(); - - @Override - public BlissfulCommonConfig common() { - return common; - } -} diff --git a/common/src/main/java/galena/blissful/platform/services/IConfigs.java b/common/src/main/java/galena/blissful/platform/services/IConfigs.java deleted file mode 100644 index a6c74a1..0000000 --- a/common/src/main/java/galena/blissful/platform/services/IConfigs.java +++ /dev/null @@ -1,9 +0,0 @@ -package galena.blissful.platform.services; - -import galena.blissful.config.BlissfulCommonConfig; - -public interface IConfigs { - - BlissfulCommonConfig common(); - -} diff --git a/common/src/main/java/galena/blissful/BlissfulClient.java b/common/src/main/java/galena/nirvana/NirvanaClient.java similarity index 82% rename from common/src/main/java/galena/blissful/BlissfulClient.java rename to common/src/main/java/galena/nirvana/NirvanaClient.java index feaf596..6692b65 100644 --- a/common/src/main/java/galena/blissful/BlissfulClient.java +++ b/common/src/main/java/galena/nirvana/NirvanaClient.java @@ -1,9 +1,9 @@ -package galena.blissful; +package galena.nirvana; import net.minecraft.client.color.item.ItemColor; import net.minecraft.world.item.alchemy.PotionUtils; -public class BlissfulClient { +public class NirvanaClient { public static final ItemColor POTION_COLOR = (stack, i) -> { if(i != 1) return -1; diff --git a/common/src/main/java/galena/nirvana/NirvanaCommon.java b/common/src/main/java/galena/nirvana/NirvanaCommon.java new file mode 100644 index 0000000..95745fd --- /dev/null +++ b/common/src/main/java/galena/nirvana/NirvanaCommon.java @@ -0,0 +1,22 @@ +package galena.nirvana; + +import galena.nirvana.index.NirvanaRecipeTypes; +import galena.nirvana.index.NirvanaBrewing; +import galena.nirvana.index.NirvanaEffects; +import galena.nirvana.index.NirvanaBlocks; +import galena.nirvana.index.NirvanaItems; +import galena.nirvana.platform.Services; +import net.minecraft.core.registries.Registries; + +public class NirvanaCommon { + + public static void init() { + NirvanaEffects.register(); + NirvanaBlocks.register(); + NirvanaItems.register(); + NirvanaRecipeTypes.register(); + + Services.PLATFORM.getRegistrate().addRegisterCallback(Registries.POTION, NirvanaBrewing::register); + } + +} diff --git a/common/src/main/java/galena/nirvana/NirvanaConstants.java b/common/src/main/java/galena/nirvana/NirvanaConstants.java new file mode 100644 index 0000000..860694b --- /dev/null +++ b/common/src/main/java/galena/nirvana/NirvanaConstants.java @@ -0,0 +1,12 @@ +package galena.nirvana; + +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + +public class NirvanaConstants { + + public static final String MOD_ID = "nirvana"; + + public static final Logger LOGGER = LogManager.getLogger("Nirvana"); + +} diff --git a/common/src/main/java/galena/blissful/client/JointModels.java b/common/src/main/java/galena/nirvana/client/JointModels.java similarity index 90% rename from common/src/main/java/galena/blissful/client/JointModels.java rename to common/src/main/java/galena/nirvana/client/JointModels.java index c3c8167..37489c9 100644 --- a/common/src/main/java/galena/blissful/client/JointModels.java +++ b/common/src/main/java/galena/nirvana/client/JointModels.java @@ -1,9 +1,9 @@ -package galena.blissful.client; +package galena.nirvana.client; import com.mojang.blaze3d.platform.Lighting; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; -import galena.blissful.BlissfulConstants; +import galena.nirvana.NirvanaConstants; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.ItemBlockRenderTypes; import net.minecraft.client.renderer.MultiBufferSource; @@ -23,8 +23,8 @@ public interface Renderer { void render(ItemRenderer renderer, BakedModel model, VertexConsumer vertexConsumer); } - public static final ModelResourceLocation HAND_MODEL = new ModelResourceLocation(BlissfulConstants.MOD_ID, "joint_in_hand", "inventory"); - public static final ModelResourceLocation FLAT_MODEL = new ModelResourceLocation(BlissfulConstants.MOD_ID, "joint_flat", "inventory"); + public static final ModelResourceLocation HAND_MODEL = new ModelResourceLocation(NirvanaConstants.MOD_ID, "joint_in_hand", "inventory"); + public static final ModelResourceLocation FLAT_MODEL = new ModelResourceLocation(NirvanaConstants.MOD_ID, "joint_flat", "inventory"); public static Optional getModel(ItemDisplayContext mode) { diff --git a/common/src/main/java/galena/blissful/compat/BlissfulJeiCompat.java b/common/src/main/java/galena/nirvana/compat/NirvanaJeiCompat.java similarity index 80% rename from common/src/main/java/galena/blissful/compat/BlissfulJeiCompat.java rename to common/src/main/java/galena/nirvana/compat/NirvanaJeiCompat.java index 7e48c39..58cb2bf 100644 --- a/common/src/main/java/galena/blissful/compat/BlissfulJeiCompat.java +++ b/common/src/main/java/galena/nirvana/compat/NirvanaJeiCompat.java @@ -1,13 +1,13 @@ -package galena.blissful.compat; +package galena.nirvana.compat; -import galena.blissful.BlissfulConstants; +import galena.nirvana.NirvanaConstants; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.alchemy.PotionUtils; -public class BlissfulJeiCompat { +public class NirvanaJeiCompat { - public static final ResourceLocation ID = new ResourceLocation(BlissfulConstants.MOD_ID, "jei"); + public static final ResourceLocation ID = new ResourceLocation(NirvanaConstants.MOD_ID, "jei"); public static String interpretPotion(ItemStack ingredient, Object unused) { var potion = PotionUtils.getPotion(ingredient); diff --git a/common/src/main/java/galena/nirvana/config/ConfigsImpl.java b/common/src/main/java/galena/nirvana/config/ConfigsImpl.java new file mode 100644 index 0000000..ff9a024 --- /dev/null +++ b/common/src/main/java/galena/nirvana/config/ConfigsImpl.java @@ -0,0 +1,13 @@ +package galena.nirvana.config; + +import galena.nirvana.platform.services.IConfigs; + +public class ConfigsImpl implements IConfigs { + + private final NirvanaCommonConfig common = new NirvanaCommonConfig(); + + @Override + public NirvanaCommonConfig common() { + return common; + } +} diff --git a/common/src/main/java/galena/blissful/config/BlissfulCommonConfig.java b/common/src/main/java/galena/nirvana/config/NirvanaCommonConfig.java similarity index 89% rename from common/src/main/java/galena/blissful/config/BlissfulCommonConfig.java rename to common/src/main/java/galena/nirvana/config/NirvanaCommonConfig.java index d666c32..ad5bd66 100644 --- a/common/src/main/java/galena/blissful/config/BlissfulCommonConfig.java +++ b/common/src/main/java/galena/nirvana/config/NirvanaCommonConfig.java @@ -1,6 +1,6 @@ -package galena.blissful.config; +package galena.nirvana.config; -public class BlissfulCommonConfig { +public class NirvanaCommonConfig { public double jointRadius() { return 15.0; diff --git a/common/src/main/java/galena/blissful/index/BlissfulBlocks.java b/common/src/main/java/galena/nirvana/index/NirvanaBlocks.java similarity index 75% rename from common/src/main/java/galena/blissful/index/BlissfulBlocks.java rename to common/src/main/java/galena/nirvana/index/NirvanaBlocks.java index 7a4b68a..9f14e48 100644 --- a/common/src/main/java/galena/blissful/index/BlissfulBlocks.java +++ b/common/src/main/java/galena/nirvana/index/NirvanaBlocks.java @@ -1,10 +1,10 @@ -package galena.blissful.index; +package galena.nirvana.index; import com.tterrag.registrate.AbstractRegistrate; import com.tterrag.registrate.util.entry.BlockEntry; -import galena.blissful.platform.Services; -import galena.blissful.world.block.CrateBlock; -import galena.blissful.world.block.HempCropBlock; +import galena.nirvana.platform.Services; +import galena.nirvana.world.block.CrateBlock; +import galena.nirvana.world.block.HempCropBlock; import net.minecraft.client.renderer.RenderType; import net.minecraft.data.recipes.RecipeCategory; import net.minecraft.tags.BlockTags; @@ -13,9 +13,7 @@ import net.minecraft.world.level.block.BushBlock; import net.minecraft.world.level.block.DoublePlantBlock; -import static galena.blissful.platform.Services.DATAGEN; - -public class BlissfulBlocks { +public class NirvanaBlocks { private static final AbstractRegistrate REGISTRATE = Services.PLATFORM.getRegistrate(); @@ -23,17 +21,17 @@ public class BlissfulBlocks { .block("hemp", HempCropBlock::new) .initialProperties(() -> Blocks.WHEAT) .addLayer(() -> RenderType::cutout) - .blockstate(DATAGEN::hempCrop) + .blockstate(Services.DATAGEN::hempCrop) .tag(BlockTags.CROPS) - .tag(BlissfulTags.SUMMER_CROPS) - .loot(DATAGEN::hempCrop) + .tag(NirvanaTags.SUMMER_CROPS) + .loot(Services.DATAGEN::hempCrop) .register(); public static final BlockEntry HEMP_CRATE = REGISTRATE .block("hemp_crate", CrateBlock::new) .initialProperties(() -> Blocks.BARREL) - .blockstate(DATAGEN::crate) - .recipe((c, p) -> p.storage(BlissfulItems.HEMP, RecipeCategory.DECORATIONS, c)) + .blockstate(Services.DATAGEN::crate) + .recipe((c, p) -> p.storage(NirvanaItems.HEMP, RecipeCategory.DECORATIONS, c)) .tag(BlockTags.MINEABLE_WITH_AXE) .item() .tab(CreativeModeTabs.BUILDING_BLOCKS) @@ -43,8 +41,8 @@ public class BlissfulBlocks { public static final BlockEntry WEED_CRATE = REGISTRATE .block("weed_crate", CrateBlock::new) .initialProperties(() -> Blocks.BARREL) - .blockstate(DATAGEN::crate) - .recipe((c, p) -> p.storage(BlissfulItems.WEED, RecipeCategory.DECORATIONS, c)) + .blockstate(Services.DATAGEN::crate) + .recipe((c, p) -> p.storage(NirvanaItems.WEED, RecipeCategory.DECORATIONS, c)) .tag(BlockTags.MINEABLE_WITH_AXE) .item() .tab(CreativeModeTabs.BUILDING_BLOCKS) @@ -55,8 +53,8 @@ public class BlissfulBlocks { .block("bliss_bloom", DoublePlantBlock::new) .initialProperties(() -> Blocks.ROSE_BUSH) .addLayer(() -> RenderType::cutout) - .blockstate(DATAGEN::blissBloom) - .loot(DATAGEN::blissBloom) + .blockstate(Services.DATAGEN::blissBloom) + .loot(Services.DATAGEN::blissBloom) .tag(BlockTags.TALL_FLOWERS) .item() .tab(CreativeModeTabs.NATURAL_BLOCKS) @@ -68,8 +66,8 @@ public class BlissfulBlocks { .block("feral_hemp", BushBlock::new) .initialProperties(() -> Blocks.FERN) .addLayer(() -> RenderType::cutout) - .blockstate(DATAGEN::feralHemp) - .loot(DATAGEN::feralHemp) + .blockstate(Services.DATAGEN::feralHemp) + .loot(Services.DATAGEN::feralHemp) .tag(BlockTags.SMALL_FLOWERS) .item() .tab(CreativeModeTabs.NATURAL_BLOCKS) diff --git a/common/src/main/java/galena/blissful/index/BlissfulBrewing.java b/common/src/main/java/galena/nirvana/index/NirvanaBrewing.java similarity index 77% rename from common/src/main/java/galena/blissful/index/BlissfulBrewing.java rename to common/src/main/java/galena/nirvana/index/NirvanaBrewing.java index 371a635..09a97c4 100644 --- a/common/src/main/java/galena/blissful/index/BlissfulBrewing.java +++ b/common/src/main/java/galena/nirvana/index/NirvanaBrewing.java @@ -1,5 +1,6 @@ -package galena.blissful.index; +package galena.nirvana.index; +import galena.nirvana.platform.Services; import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Items; @@ -10,25 +11,23 @@ import net.minecraft.world.item.crafting.Ingredient; import net.minecraft.world.level.ItemLike; -import static galena.blissful.platform.Services.BREWING; - -public class BlissfulBrewing { +public class NirvanaBrewing { private static ItemStack withPotion(ItemLike item, Potion potion) { return PotionUtils.setPotion(new ItemStack(item), potion); } private static void registerMix(ItemStack ingredient, ItemStack from) { - var input = PotionUtils.getPotion(from) == Potions.WATER ? BlissfulItems.BONG.asStack() : from; + var input = PotionUtils.getPotion(from) == Potions.WATER ? NirvanaItems.BONG.asStack() : from; var output = PotionBrewing.mix(ingredient, from); if (output == from) return; - BREWING.addRecipe(Ingredient.of(input), Ingredient.of(ingredient), output); + Services.BREWING.addRecipe(Ingredient.of(input), Ingredient.of(ingredient), output); } private static void registerBongRecipes() { var waterBottle = withPotion(Items.POTION, Potions.WATER); - BREWING.addRecipe(Ingredient.of(waterBottle), Ingredient.of(BlissfulItems.WEED), BlissfulItems.BONG.asStack()); + Services.BREWING.addRecipe(Ingredient.of(waterBottle), Ingredient.of(NirvanaItems.WEED), NirvanaItems.BONG.asStack()); var catalysts = BuiltInRegistries.ITEM.stream() .map(ItemStack::new) @@ -36,7 +35,7 @@ private static void registerBongRecipes() { .toList(); BuiltInRegistries.POTION.stream().forEach(potion -> { - var from = withPotion(BlissfulItems.POTION_BONG, potion); + var from = withPotion(NirvanaItems.POTION_BONG, potion); var potionStack = withPotion(Items.POTION, potion); catalysts.stream() .filter(it -> PotionBrewing.hasMix(potionStack, it)) diff --git a/common/src/main/java/galena/blissful/index/BlissfulEffects.java b/common/src/main/java/galena/nirvana/index/NirvanaEffects.java similarity index 74% rename from common/src/main/java/galena/blissful/index/BlissfulEffects.java rename to common/src/main/java/galena/nirvana/index/NirvanaEffects.java index ca5ea0c..858e07f 100644 --- a/common/src/main/java/galena/blissful/index/BlissfulEffects.java +++ b/common/src/main/java/galena/nirvana/index/NirvanaEffects.java @@ -1,10 +1,10 @@ -package galena.blissful.index; +package galena.nirvana.index; import com.tterrag.registrate.AbstractRegistrate; import com.tterrag.registrate.util.entry.RegistryEntry; -import galena.blissful.BlissfulConstants; -import galena.blissful.platform.Services; -import galena.blissful.world.effects.PeaceEffect; +import galena.nirvana.NirvanaConstants; +import galena.nirvana.platform.Services; +import galena.nirvana.world.effects.PeaceEffect; import net.minecraft.core.registries.Registries; import net.minecraft.resources.ResourceLocation; import net.minecraft.tags.TagKey; @@ -12,11 +12,11 @@ import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.LivingEntity; -public class BlissfulEffects { +public class NirvanaEffects { private static final AbstractRegistrate REGISTRATE = Services.PLATFORM.getRegistrate(); - public static final TagKey STACKING_EFFECTS = TagKey.create(Registries.MOB_EFFECT, new ResourceLocation(BlissfulConstants.MOD_ID, "stacking")); + public static final TagKey STACKING_EFFECTS = TagKey.create(Registries.MOB_EFFECT, new ResourceLocation(NirvanaConstants.MOD_ID, "stacking")); public static final RegistryEntry PEACE = REGISTRATE .generic("peace", Registries.MOB_EFFECT, PeaceEffect::new) @@ -24,7 +24,7 @@ public class BlissfulEffects { public static boolean arePeaceful(Entity target, LivingEntity attacker) { if (!(target instanceof LivingEntity living)) return false; - var effect = BlissfulEffects.PEACE.get(); + var effect = NirvanaEffects.PEACE.get(); return attacker.hasEffect(effect) || living.hasEffect(effect); } diff --git a/common/src/main/java/galena/blissful/index/BlissfulItems.java b/common/src/main/java/galena/nirvana/index/NirvanaItems.java similarity index 84% rename from common/src/main/java/galena/blissful/index/BlissfulItems.java rename to common/src/main/java/galena/nirvana/index/NirvanaItems.java index 87ad1c8..d572656 100644 --- a/common/src/main/java/galena/blissful/index/BlissfulItems.java +++ b/common/src/main/java/galena/nirvana/index/NirvanaItems.java @@ -1,4 +1,4 @@ -package galena.blissful.index; +package galena.nirvana.index; import com.mojang.datafixers.util.Pair; import com.tterrag.registrate.AbstractRegistrate; @@ -8,13 +8,13 @@ import com.tterrag.registrate.util.DataIngredient; import com.tterrag.registrate.util.entry.ItemEntry; import com.tterrag.registrate.util.nullness.NonNullSupplier; -import galena.blissful.BlissfulClient; -import galena.blissful.platform.Services; -import galena.blissful.world.item.BongItem; -import galena.blissful.world.item.HerbalSalveItem; -import galena.blissful.world.item.JointItem; -import galena.blissful.world.item.LazyFoodItem; -import galena.blissful.world.item.PotionBongItem; +import galena.nirvana.NirvanaClient; +import galena.nirvana.platform.Services; +import galena.nirvana.world.item.BongItem; +import galena.nirvana.world.item.HerbalSalveItem; +import galena.nirvana.world.item.JointItem; +import galena.nirvana.world.item.LazyFoodItem; +import galena.nirvana.world.item.PotionBongItem; import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.data.recipes.RecipeCategory; import net.minecraft.data.recipes.ShapelessRecipeBuilder; @@ -30,7 +30,7 @@ import java.util.function.Consumer; -public class BlissfulItems { +public class NirvanaItems { private static final AbstractRegistrate REGISTRATE = Services.PLATFORM.getRegistrate(); @@ -40,7 +40,7 @@ public class BlissfulItems { .register(); public static final ItemEntry HEMP_SEEDS = REGISTRATE - .item("hemp_seeds", p -> new ItemNameBlockItem(BlissfulBlocks.HEMP.get(), p)) + .item("hemp_seeds", p -> new ItemNameBlockItem(NirvanaBlocks.HEMP.get(), p)) .tab(CreativeModeTabs.NATURAL_BLOCKS) .recipe((c, p) -> p.singleItem(DataIngredient.items(HEMP.get()), RecipeCategory.MISC, c, 1, 2)) .register(); @@ -56,7 +56,7 @@ public class BlissfulItems { .register(); private static final NonNullSupplier BROWNIES_FOOD = NonNullSupplier.lazy(() -> new FoodProperties.Builder() - .effect(new MobEffectInstance(BlissfulEffects.PEACE.get(), 20 * Services.CONFIG.common().browniesPeaceSeconds(), 0), 1.0F) + .effect(new MobEffectInstance(NirvanaEffects.PEACE.get(), 20 * Services.CONFIG.common().browniesPeaceSeconds(), 0), 1.0F) .nutrition(2) .saturationMod(0.1F) .build() @@ -90,15 +90,15 @@ private static Consumer addPotionStack } private static Consumer addSalveStacks() { - return modifier -> BlissfulRecipeTypes.getSalves() + return modifier -> NirvanaRecipeTypes.getSalves() .map(Pair::getSecond) .forEach(modifier::accept); } public static final ItemEntry POTION_BONG = REGISTRATE .item("potion_bong", PotionBongItem::new) - .transform(it -> it.tab(CreativeModeTabs.FOOD_AND_DRINKS, BlissfulItems.addPotionStacks(it))) - .color(() -> () -> BlissfulClient.POTION_COLOR) + .transform(it -> it.tab(CreativeModeTabs.FOOD_AND_DRINKS, NirvanaItems.addPotionStacks(it))) + .color(() -> () -> NirvanaClient.POTION_COLOR) .properties(it -> it.durability(Services.CONFIG.common().getBongHits())) .properties(it -> it.craftRemainder(Items.GLASS_BOTTLE)) .model((c, p) -> p.generated(c, p.modLoc("item/bong_potion"), p.modLoc("item/bong_potion_overlay"))) @@ -106,8 +106,8 @@ private static Consumer addSalveStacks public static final ItemEntry JOINT = REGISTRATE .item("joint", Services.PLATFORM::createJointItem) .properties(it -> it.durability(Services.CONFIG.common().getJointHits())) - .tag(BlissfulTags.NAUSEATING) - .tag(BlissfulTags.ATTACHED_TO_HEAD) + .tag(NirvanaTags.NAUSEATING) + .tag(NirvanaTags.ATTACHED_TO_HEAD) .tab(CreativeModeTabs.FOOD_AND_DRINKS) .model(Services.DATAGEN::joint) .recipe((c, p) -> ShapelessRecipeBuilder @@ -123,7 +123,7 @@ private static Consumer addSalveStacks .item("herbal_salve", HerbalSalveItem::new) .properties(it -> it.stacksTo(1)) .properties(it -> it.craftRemainder(Items.BOWL)) - .tab(CreativeModeTabs.FOOD_AND_DRINKS, BlissfulItems.addSalveStacks()) + .tab(CreativeModeTabs.FOOD_AND_DRINKS, NirvanaItems.addSalveStacks()) .register(); public static void register() { diff --git a/common/src/main/java/galena/blissful/index/BlissfulRecipeTypes.java b/common/src/main/java/galena/nirvana/index/NirvanaRecipeTypes.java similarity index 87% rename from common/src/main/java/galena/blissful/index/BlissfulRecipeTypes.java rename to common/src/main/java/galena/nirvana/index/NirvanaRecipeTypes.java index 14ff27a..ad5a1d1 100644 --- a/common/src/main/java/galena/blissful/index/BlissfulRecipeTypes.java +++ b/common/src/main/java/galena/nirvana/index/NirvanaRecipeTypes.java @@ -1,11 +1,11 @@ -package galena.blissful.index; +package galena.nirvana.index; import com.mojang.datafixers.util.Pair; import com.tterrag.registrate.AbstractRegistrate; import com.tterrag.registrate.util.entry.RegistryEntry; -import galena.blissful.BlissfulConstants; -import galena.blissful.platform.Services; -import galena.blissful.world.recipe.HerbalSalveRecipe; +import galena.nirvana.NirvanaConstants; +import galena.nirvana.platform.Services; +import galena.nirvana.world.recipe.HerbalSalveRecipe; import net.minecraft.core.Holder; import net.minecraft.core.HolderSet; import net.minecraft.core.NonNullList; @@ -31,7 +31,7 @@ import java.util.List; import java.util.stream.Stream; -public class BlissfulRecipeTypes { +public class NirvanaRecipeTypes { public static class SimpleRecipeType> implements RecipeType { } @@ -56,7 +56,7 @@ public static Stream> getSalves() { .filter(FlowerBlock.class::isInstance) .map(FlowerBlock.class::cast) .map(flower -> { - ItemStack output = BlissfulItems.HERBAL_SALVE.asStack(); + ItemStack output = NirvanaItems.HERBAL_SALVE.asStack(); MobEffect mobeffect = flower.getSuspiciousEffect(); SuspiciousStewItem.saveMobEffect(output, mobeffect, flower.getEffectDuration()); @@ -67,7 +67,7 @@ public static Stream> getSalves() { public static List createSalveRecipes() { String group = "jei.herbal_salves"; Ingredient bowl = Ingredient.of(Items.BOWL); - Ingredient weed = Ingredient.of(BlissfulItems.WEED); + Ingredient weed = Ingredient.of(NirvanaItems.WEED); return getSalves().map(pair -> { var flowerBlock = pair.getFirst().asItem(); @@ -75,7 +75,7 @@ public static List createSalveRecipes() { Ingredient flower = Ingredient.of(flowerBlock); NonNullList inputs = NonNullList.of(Ingredient.EMPTY, flower, flower, flower, weed, weed, weed, bowl); - ResourceLocation id = new ResourceLocation(BlissfulConstants.MOD_ID, group + flowerBlock.getDescriptionId()); + ResourceLocation id = new ResourceLocation(NirvanaConstants.MOD_ID, group + flowerBlock.getDescriptionId()); return new ShapelessRecipe(id, group, CraftingBookCategory.MISC, output, inputs); }) .toList(); diff --git a/common/src/main/java/galena/blissful/index/BlissfulTags.java b/common/src/main/java/galena/nirvana/index/NirvanaTags.java similarity index 59% rename from common/src/main/java/galena/blissful/index/BlissfulTags.java rename to common/src/main/java/galena/nirvana/index/NirvanaTags.java index 28a025d..01f44a7 100644 --- a/common/src/main/java/galena/blissful/index/BlissfulTags.java +++ b/common/src/main/java/galena/nirvana/index/NirvanaTags.java @@ -1,6 +1,6 @@ -package galena.blissful.index; +package galena.nirvana.index; -import galena.blissful.BlissfulConstants; +import galena.nirvana.NirvanaConstants; import net.minecraft.core.registries.Registries; import net.minecraft.resources.ResourceLocation; import net.minecraft.tags.TagKey; @@ -8,16 +8,16 @@ import net.minecraft.world.level.biome.Biome; import net.minecraft.world.level.block.Block; -public class BlissfulTags { +public class NirvanaTags { public static final TagKey SUMMER_CROPS = TagKey.create(Registries.BLOCK, new ResourceLocation("sereneseasons", "summer_crops")); - public static final TagKey NAUSEATING = TagKey.create(Registries.ITEM, new ResourceLocation(BlissfulConstants.MOD_ID, "nauseating")); + public static final TagKey NAUSEATING = TagKey.create(Registries.ITEM, new ResourceLocation(NirvanaConstants.MOD_ID, "nauseating")); - public static final TagKey ATTACHED_TO_HEAD = TagKey.create(Registries.ITEM, new ResourceLocation(BlissfulConstants.MOD_ID, "attached_to_head")); + 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(BlissfulConstants.MOD_ID, "has_feature/feral_hemp")); + public static final TagKey GENERATES_FERAL_HEMP = TagKey.create(Registries.BIOME, new ResourceLocation(NirvanaConstants.MOD_ID, "has_feature/feral_hemp")); - public static final TagKey SHEARS = TagKey.create(Registries.ITEM, new ResourceLocation(BlissfulConstants.MOD_ID, "shears")); + public static final TagKey SHEARS = TagKey.create(Registries.ITEM, new ResourceLocation(NirvanaConstants.MOD_ID, "shears")); } diff --git a/common/src/main/java/galena/blissful/mixins/EntityMixin.java b/common/src/main/java/galena/nirvana/mixins/EntityMixin.java similarity index 79% rename from common/src/main/java/galena/blissful/mixins/EntityMixin.java rename to common/src/main/java/galena/nirvana/mixins/EntityMixin.java index ce5b6d8..98d3884 100644 --- a/common/src/main/java/galena/blissful/mixins/EntityMixin.java +++ b/common/src/main/java/galena/nirvana/mixins/EntityMixin.java @@ -1,11 +1,10 @@ -package galena.blissful.mixins; +package galena.nirvana.mixins; -import galena.blissful.index.BlissfulEffects; +import galena.nirvana.index.NirvanaEffects; import net.minecraft.world.damagesource.DamageSource; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.LivingEntity; import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Redirect; @@ -16,7 +15,7 @@ public abstract class EntityMixin { public boolean canAttack(Entity instance, DamageSource damageSource) { return (instance instanceof LivingEntity && damageSource.getEntity() instanceof LivingEntity attacker - && BlissfulEffects.arePeaceful(instance, attacker) + && NirvanaEffects.arePeaceful(instance, attacker) ) || instance.isInvulnerable(); } diff --git a/common/src/main/java/galena/blissful/mixins/ItemInHandRendererMixin.java b/common/src/main/java/galena/nirvana/mixins/ItemInHandRendererMixin.java similarity index 93% rename from common/src/main/java/galena/blissful/mixins/ItemInHandRendererMixin.java rename to common/src/main/java/galena/nirvana/mixins/ItemInHandRendererMixin.java index 359ef8c..b56a095 100644 --- a/common/src/main/java/galena/blissful/mixins/ItemInHandRendererMixin.java +++ b/common/src/main/java/galena/nirvana/mixins/ItemInHandRendererMixin.java @@ -1,7 +1,7 @@ -package galena.blissful.mixins; +package galena.nirvana.mixins; import com.mojang.blaze3d.vertex.PoseStack; -import galena.blissful.world.item.SmokingItem; +import galena.nirvana.world.item.SmokingItem; import net.minecraft.client.player.AbstractClientPlayer; import net.minecraft.client.renderer.ItemInHandRenderer; import net.minecraft.client.renderer.MultiBufferSource; diff --git a/common/src/main/java/galena/blissful/mixins/LivingEntityMixin.java b/common/src/main/java/galena/nirvana/mixins/LivingEntityMixin.java similarity index 83% rename from common/src/main/java/galena/blissful/mixins/LivingEntityMixin.java rename to common/src/main/java/galena/nirvana/mixins/LivingEntityMixin.java index 7a18dac..8e3e746 100644 --- a/common/src/main/java/galena/blissful/mixins/LivingEntityMixin.java +++ b/common/src/main/java/galena/nirvana/mixins/LivingEntityMixin.java @@ -1,6 +1,6 @@ -package galena.blissful.mixins; +package galena.nirvana.mixins; -import galena.blissful.index.BlissfulEffects; +import galena.nirvana.index.NirvanaEffects; import net.minecraft.world.entity.LivingEntity; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; @@ -15,7 +15,7 @@ public void canAttack(LivingEntity target, CallbackInfoReturnable cir) @SuppressWarnings("DataFlowIssue") var self = (LivingEntity) (Object) (this); - if(BlissfulEffects.arePeaceful(self, target)) { + if(NirvanaEffects.arePeaceful(self, target)) { cir.setReturnValue(false); } } diff --git a/common/src/main/java/galena/blissful/mixins/MobMixin.java b/common/src/main/java/galena/nirvana/mixins/MobMixin.java similarity index 85% rename from common/src/main/java/galena/blissful/mixins/MobMixin.java rename to common/src/main/java/galena/nirvana/mixins/MobMixin.java index 93cb813..f145048 100644 --- a/common/src/main/java/galena/blissful/mixins/MobMixin.java +++ b/common/src/main/java/galena/nirvana/mixins/MobMixin.java @@ -1,6 +1,6 @@ -package galena.blissful.mixins; +package galena.nirvana.mixins; -import galena.blissful.index.BlissfulEffects; +import galena.nirvana.index.NirvanaEffects; import net.minecraft.world.entity.Mob; import net.minecraft.world.entity.ai.goal.GoalSelector; import org.spongepowered.asm.mixin.Mixin; @@ -21,7 +21,7 @@ public abstract class MobMixin { public void interruptTargetGoal(GoalSelector targetSelector, boolean argument) { @SuppressWarnings("DataFlowIssue") var self = (Mob) (Object) (this); - if(self.hasEffect(BlissfulEffects.PEACE.get())) return; + if(self.hasEffect(NirvanaEffects.PEACE.get())) return; targetSelector.tickRunningGoals(argument); } @@ -36,7 +36,7 @@ public void interruptTargetGoal(GoalSelector targetSelector, boolean argument) { public void interruptTargetGoal(GoalSelector targetSelector) { @SuppressWarnings("DataFlowIssue") var self = (Mob) (Object) (this); - if(self.hasEffect(BlissfulEffects.PEACE.get())) return; + if(self.hasEffect(NirvanaEffects.PEACE.get())) return; targetSelector.tick(); } diff --git a/common/src/main/java/galena/blissful/mixins/PlayerItemInHandLayerMixin.java b/common/src/main/java/galena/nirvana/mixins/PlayerItemInHandLayerMixin.java similarity index 82% rename from common/src/main/java/galena/blissful/mixins/PlayerItemInHandLayerMixin.java rename to common/src/main/java/galena/nirvana/mixins/PlayerItemInHandLayerMixin.java index 3431d42..1b7eede 100644 --- a/common/src/main/java/galena/blissful/mixins/PlayerItemInHandLayerMixin.java +++ b/common/src/main/java/galena/nirvana/mixins/PlayerItemInHandLayerMixin.java @@ -1,6 +1,6 @@ -package galena.blissful.mixins; +package galena.nirvana.mixins; -import galena.blissful.index.BlissfulItems; +import galena.nirvana.index.NirvanaItems; import net.minecraft.client.renderer.entity.layers.PlayerItemInHandLayer; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; @@ -19,7 +19,7 @@ public class PlayerItemInHandLayerMixin { ) ) public boolean isUsingJoint(ItemStack instance, Item item) { - return BlissfulItems.JOINT.isIn(instance) || instance.is(item); + return NirvanaItems.JOINT.isIn(instance) || instance.is(item); } } diff --git a/common/src/main/java/galena/blissful/platform/Services.java b/common/src/main/java/galena/nirvana/platform/Services.java similarity index 69% rename from common/src/main/java/galena/blissful/platform/Services.java rename to common/src/main/java/galena/nirvana/platform/Services.java index 8c1cc08..67c710b 100644 --- a/common/src/main/java/galena/blissful/platform/Services.java +++ b/common/src/main/java/galena/nirvana/platform/Services.java @@ -1,9 +1,9 @@ -package galena.blissful.platform; +package galena.nirvana.platform; -import galena.blissful.platform.services.IBrewingRegistry; -import galena.blissful.platform.services.IConfigs; -import galena.blissful.platform.services.IDataGenHelper; -import galena.blissful.platform.services.IPlatformHelper; +import galena.nirvana.platform.services.IBrewingRegistry; +import galena.nirvana.platform.services.IConfigs; +import galena.nirvana.platform.services.IDataGenHelper; +import galena.nirvana.platform.services.IPlatformHelper; import java.util.ServiceLoader; diff --git a/common/src/main/java/galena/blissful/platform/services/IBrewingRegistry.java b/common/src/main/java/galena/nirvana/platform/services/IBrewingRegistry.java similarity index 83% rename from common/src/main/java/galena/blissful/platform/services/IBrewingRegistry.java rename to common/src/main/java/galena/nirvana/platform/services/IBrewingRegistry.java index 0c0dcc0..410f59b 100644 --- a/common/src/main/java/galena/blissful/platform/services/IBrewingRegistry.java +++ b/common/src/main/java/galena/nirvana/platform/services/IBrewingRegistry.java @@ -1,4 +1,4 @@ -package galena.blissful.platform.services; +package galena.nirvana.platform.services; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.crafting.Ingredient; diff --git a/common/src/main/java/galena/nirvana/platform/services/IConfigs.java b/common/src/main/java/galena/nirvana/platform/services/IConfigs.java new file mode 100644 index 0000000..bff39f6 --- /dev/null +++ b/common/src/main/java/galena/nirvana/platform/services/IConfigs.java @@ -0,0 +1,9 @@ +package galena.nirvana.platform.services; + +import galena.nirvana.config.NirvanaCommonConfig; + +public interface IConfigs { + + NirvanaCommonConfig common(); + +} diff --git a/common/src/main/java/galena/blissful/platform/services/IDataGenHelper.java b/common/src/main/java/galena/nirvana/platform/services/IDataGenHelper.java similarity index 96% rename from common/src/main/java/galena/blissful/platform/services/IDataGenHelper.java rename to common/src/main/java/galena/nirvana/platform/services/IDataGenHelper.java index df82a10..3bcb3b3 100644 --- a/common/src/main/java/galena/blissful/platform/services/IDataGenHelper.java +++ b/common/src/main/java/galena/nirvana/platform/services/IDataGenHelper.java @@ -1,4 +1,4 @@ -package galena.blissful.platform.services; +package galena.nirvana.platform.services; import com.tterrag.registrate.providers.DataGenContext; import com.tterrag.registrate.providers.RegistrateBlockstateProvider; diff --git a/common/src/main/java/galena/blissful/platform/services/IPlatformHelper.java b/common/src/main/java/galena/nirvana/platform/services/IPlatformHelper.java similarity index 76% rename from common/src/main/java/galena/blissful/platform/services/IPlatformHelper.java rename to common/src/main/java/galena/nirvana/platform/services/IPlatformHelper.java index 562fcf0..6bdcf82 100644 --- a/common/src/main/java/galena/blissful/platform/services/IPlatformHelper.java +++ b/common/src/main/java/galena/nirvana/platform/services/IPlatformHelper.java @@ -1,7 +1,7 @@ -package galena.blissful.platform.services; +package galena.nirvana.platform.services; import com.tterrag.registrate.AbstractRegistrate; -import galena.blissful.world.item.JointItem; +import galena.nirvana.world.item.JointItem; import net.minecraft.world.item.Item; public interface IPlatformHelper { diff --git a/common/src/main/java/galena/blissful/world/block/CrateBlock.java b/common/src/main/java/galena/nirvana/world/block/CrateBlock.java similarity index 95% rename from common/src/main/java/galena/blissful/world/block/CrateBlock.java rename to common/src/main/java/galena/nirvana/world/block/CrateBlock.java index 1869f8c..b97c6df 100644 --- a/common/src/main/java/galena/blissful/world/block/CrateBlock.java +++ b/common/src/main/java/galena/nirvana/world/block/CrateBlock.java @@ -1,4 +1,4 @@ -package galena.blissful.world.block; +package galena.nirvana.world.block; import net.minecraft.world.item.context.BlockPlaceContext; import net.minecraft.world.level.block.Block; diff --git a/common/src/main/java/galena/blissful/world/block/HempCropBlock.java b/common/src/main/java/galena/nirvana/world/block/HempCropBlock.java similarity index 93% rename from common/src/main/java/galena/blissful/world/block/HempCropBlock.java rename to common/src/main/java/galena/nirvana/world/block/HempCropBlock.java index 97c20da..6d46677 100644 --- a/common/src/main/java/galena/blissful/world/block/HempCropBlock.java +++ b/common/src/main/java/galena/nirvana/world/block/HempCropBlock.java @@ -1,6 +1,6 @@ -package galena.blissful.world.block; +package galena.nirvana.world.block; -import galena.blissful.index.BlissfulItems; +import galena.nirvana.index.NirvanaItems; import net.minecraft.core.BlockPos; import net.minecraft.util.Mth; import net.minecraft.world.level.BlockGetter; @@ -34,7 +34,7 @@ public HempCropBlock(Properties properties) { @Override protected ItemLike getBaseSeedId() { - return BlissfulItems.HEMP_SEEDS.get(); + return NirvanaItems.HEMP_SEEDS.get(); } @Override diff --git a/common/src/main/java/galena/blissful/world/effects/IStackingEffect.java b/common/src/main/java/galena/nirvana/world/effects/IStackingEffect.java similarity index 89% rename from common/src/main/java/galena/blissful/world/effects/IStackingEffect.java rename to common/src/main/java/galena/nirvana/world/effects/IStackingEffect.java index 14df283..2b78102 100644 --- a/common/src/main/java/galena/blissful/world/effects/IStackingEffect.java +++ b/common/src/main/java/galena/nirvana/world/effects/IStackingEffect.java @@ -1,4 +1,4 @@ -package galena.blissful.world.effects; +package galena.nirvana.world.effects; import net.minecraft.world.effect.MobEffectInstance; import net.minecraft.world.entity.LivingEntity; diff --git a/common/src/main/java/galena/blissful/world/effects/PeaceEffect.java b/common/src/main/java/galena/nirvana/world/effects/PeaceEffect.java similarity index 82% rename from common/src/main/java/galena/blissful/world/effects/PeaceEffect.java rename to common/src/main/java/galena/nirvana/world/effects/PeaceEffect.java index 86ec85c..9d29ed9 100644 --- a/common/src/main/java/galena/blissful/world/effects/PeaceEffect.java +++ b/common/src/main/java/galena/nirvana/world/effects/PeaceEffect.java @@ -1,7 +1,7 @@ -package galena.blissful.world.effects; +package galena.nirvana.world.effects; -import galena.blissful.index.BlissfulTags; -import galena.blissful.platform.Services; +import galena.nirvana.index.NirvanaTags; +import galena.nirvana.platform.Services; import net.minecraft.world.effect.MobEffect; import net.minecraft.world.effect.MobEffectCategory; import net.minecraft.world.effect.MobEffectInstance; @@ -20,7 +20,7 @@ public PeaceEffect() { @Override public void onIncreasedTo(MobEffectInstance instance, ItemStack source, LivingEntity target, Level level) { var hitsTaken = instance.getAmplifier() + 1; - if (source.is(BlissfulTags.NAUSEATING) && hitsTaken >= Services.CONFIG.common().nauseaAfterHits()) { + if (source.is(NirvanaTags.NAUSEATING) && hitsTaken >= Services.CONFIG.common().nauseaAfterHits()) { target.addEffect(new MobEffectInstance(MobEffects.CONFUSION, 20 * 20, 0)); } } diff --git a/common/src/main/java/galena/blissful/world/item/BongItem.java b/common/src/main/java/galena/nirvana/world/item/BongItem.java similarity index 80% rename from common/src/main/java/galena/blissful/world/item/BongItem.java rename to common/src/main/java/galena/nirvana/world/item/BongItem.java index 6c5aa75..7e0fb92 100644 --- a/common/src/main/java/galena/blissful/world/item/BongItem.java +++ b/common/src/main/java/galena/nirvana/world/item/BongItem.java @@ -1,7 +1,7 @@ -package galena.blissful.world.item; +package galena.nirvana.world.item; -import galena.blissful.index.BlissfulEffects; -import galena.blissful.platform.Services; +import galena.nirvana.index.NirvanaEffects; +import galena.nirvana.platform.Services; import net.minecraft.network.chat.Component; import net.minecraft.world.effect.MobEffectInstance; import net.minecraft.world.entity.LivingEntity; @@ -22,7 +22,7 @@ public BongItem(Properties properties) { @Override Stream getEffects(ItemStack stack, @Nullable Level level, @Nullable LivingEntity entity) { - return Stream.of(new MobEffectInstance(BlissfulEffects.PEACE.get(), 20 * Services.CONFIG.common().bongPeaceSeconds(), 0)); + return Stream.of(new MobEffectInstance(NirvanaEffects.PEACE.get(), 20 * Services.CONFIG.common().bongPeaceSeconds(), 0)); } @Override diff --git a/common/src/main/java/galena/blissful/world/item/HerbalSalveItem.java b/common/src/main/java/galena/nirvana/world/item/HerbalSalveItem.java similarity index 97% rename from common/src/main/java/galena/blissful/world/item/HerbalSalveItem.java rename to common/src/main/java/galena/nirvana/world/item/HerbalSalveItem.java index f53fec3..5be7373 100644 --- a/common/src/main/java/galena/blissful/world/item/HerbalSalveItem.java +++ b/common/src/main/java/galena/nirvana/world/item/HerbalSalveItem.java @@ -1,7 +1,7 @@ -package galena.blissful.world.item; +package galena.nirvana.world.item; import com.google.common.collect.ImmutableList; -import galena.blissful.platform.Services; +import galena.nirvana.platform.Services; import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.ListTag; import net.minecraft.world.InteractionHand; diff --git a/common/src/main/java/galena/blissful/world/item/JointItem.java b/common/src/main/java/galena/nirvana/world/item/JointItem.java similarity index 73% rename from common/src/main/java/galena/blissful/world/item/JointItem.java rename to common/src/main/java/galena/nirvana/world/item/JointItem.java index 39dce94..b505993 100644 --- a/common/src/main/java/galena/blissful/world/item/JointItem.java +++ b/common/src/main/java/galena/nirvana/world/item/JointItem.java @@ -1,7 +1,7 @@ -package galena.blissful.world.item; +package galena.nirvana.world.item; -import galena.blissful.index.BlissfulEffects; -import galena.blissful.platform.Services; +import galena.nirvana.index.NirvanaEffects; +import galena.nirvana.platform.Services; import net.minecraft.world.effect.MobEffectInstance; import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.item.ItemStack; @@ -18,7 +18,7 @@ public JointItem(Properties properties) { @Override Stream getEffects(ItemStack stack, @Nullable Level level, @Nullable LivingEntity entity) { - return Stream.of(new MobEffectInstance(BlissfulEffects.PEACE.get(), 20 * Services.CONFIG.common().jointPeaceSeconds(), 0)); + return Stream.of(new MobEffectInstance(NirvanaEffects.PEACE.get(), 20 * Services.CONFIG.common().jointPeaceSeconds(), 0)); } @Override diff --git a/common/src/main/java/galena/blissful/world/item/LazyFoodItem.java b/common/src/main/java/galena/nirvana/world/item/LazyFoodItem.java similarity index 94% rename from common/src/main/java/galena/blissful/world/item/LazyFoodItem.java rename to common/src/main/java/galena/nirvana/world/item/LazyFoodItem.java index e28b2d2..02ce803 100644 --- a/common/src/main/java/galena/blissful/world/item/LazyFoodItem.java +++ b/common/src/main/java/galena/nirvana/world/item/LazyFoodItem.java @@ -1,4 +1,4 @@ -package galena.blissful.world.item; +package galena.nirvana.world.item; import com.tterrag.registrate.util.nullness.NonNullSupplier; import net.minecraft.world.food.FoodProperties; diff --git a/common/src/main/java/galena/blissful/world/item/PotionBongItem.java b/common/src/main/java/galena/nirvana/world/item/PotionBongItem.java similarity index 95% rename from common/src/main/java/galena/blissful/world/item/PotionBongItem.java rename to common/src/main/java/galena/nirvana/world/item/PotionBongItem.java index c89831f..fed5a42 100644 --- a/common/src/main/java/galena/blissful/world/item/PotionBongItem.java +++ b/common/src/main/java/galena/nirvana/world/item/PotionBongItem.java @@ -1,6 +1,6 @@ -package galena.blissful.world.item; +package galena.nirvana.world.item; -import galena.blissful.platform.Services; +import galena.nirvana.platform.Services; import net.minecraft.network.chat.Component; import net.minecraft.world.effect.MobEffectInstance; import net.minecraft.world.entity.LivingEntity; diff --git a/common/src/main/java/galena/blissful/world/item/SmokingItem.java b/common/src/main/java/galena/nirvana/world/item/SmokingItem.java similarity index 96% rename from common/src/main/java/galena/blissful/world/item/SmokingItem.java rename to common/src/main/java/galena/nirvana/world/item/SmokingItem.java index 879c075..be1d2d5 100644 --- a/common/src/main/java/galena/blissful/world/item/SmokingItem.java +++ b/common/src/main/java/galena/nirvana/world/item/SmokingItem.java @@ -1,7 +1,7 @@ -package galena.blissful.world.item; +package galena.nirvana.world.item; -import galena.blissful.index.BlissfulEffects; -import galena.blissful.world.effects.IStackingEffect; +import galena.nirvana.index.NirvanaEffects; +import galena.nirvana.world.effects.IStackingEffect; import net.minecraft.advancements.CriteriaTriggers; import net.minecraft.core.particles.ParticleTypes; import net.minecraft.core.registries.BuiltInRegistries; @@ -47,7 +47,7 @@ private void addParticles(ServerLevel level, LivingEntity entity) { private boolean isStackingEffect(MobEffect effect) { var holder = BuiltInRegistries.MOB_EFFECT.wrapAsHolder(effect); - return holder.is(BlissfulEffects.STACKING_EFFECTS); + return holder.is(NirvanaEffects.STACKING_EFFECTS); } private void applyEffect(MobEffectInstance instance, ItemStack source, LivingEntity target, LivingEntity cause) { diff --git a/common/src/main/java/galena/blissful/world/recipe/HerbalSalveRecipe.java b/common/src/main/java/galena/nirvana/world/recipe/HerbalSalveRecipe.java similarity index 89% rename from common/src/main/java/galena/blissful/world/recipe/HerbalSalveRecipe.java rename to common/src/main/java/galena/nirvana/world/recipe/HerbalSalveRecipe.java index ea23327..5df5827 100644 --- a/common/src/main/java/galena/blissful/world/recipe/HerbalSalveRecipe.java +++ b/common/src/main/java/galena/nirvana/world/recipe/HerbalSalveRecipe.java @@ -1,7 +1,7 @@ -package galena.blissful.world.recipe; +package galena.nirvana.world.recipe; -import galena.blissful.index.BlissfulItems; -import galena.blissful.index.BlissfulRecipeTypes; +import galena.nirvana.index.NirvanaItems; +import galena.nirvana.index.NirvanaRecipeTypes; import net.minecraft.core.RegistryAccess; import net.minecraft.resources.ResourceLocation; import net.minecraft.tags.ItemTags; @@ -33,7 +33,7 @@ public boolean matches(CraftingContainer container, Level level) { for (int i = 0; i < container.getContainerSize(); ++i) { var stack = container.getItem(i); - if (BlissfulItems.WEED.isIn(stack)) { + if (NirvanaItems.WEED.isIn(stack)) { weedCount++; } else if (stack.is(ItemTags.SMALL_FLOWERS)) { if (flowerType == null) flowerType = stack.getItem(); @@ -52,7 +52,7 @@ public boolean matches(CraftingContainer container, Level level) { @Override public ItemStack assemble(CraftingContainer container, RegistryAccess registryAccess) { - var result = BlissfulItems.HERBAL_SALVE.asStack(); + var result = NirvanaItems.HERBAL_SALVE.asStack(); for(int i = 0; i < container.getContainerSize(); ++i) { ItemStack stack = container.getItem(i); @@ -75,6 +75,6 @@ public boolean canCraftInDimensions(int i, int j) { @Override public RecipeSerializer getSerializer() { - return BlissfulRecipeTypes.HERBAL_SALVE_RECIPE_SERIALIZER.get(); + return NirvanaRecipeTypes.HERBAL_SALVE_RECIPE_SERIALIZER.get(); } } diff --git a/common/src/main/resources/META-INF/services/galena.blissful.platform.services.IConfigs b/common/src/main/resources/META-INF/services/galena.blissful.platform.services.IConfigs deleted file mode 100644 index 09fea28..0000000 --- a/common/src/main/resources/META-INF/services/galena.blissful.platform.services.IConfigs +++ /dev/null @@ -1 +0,0 @@ -galena.blissful.config.ConfigsImpl \ No newline at end of file diff --git a/common/src/main/resources/META-INF/services/galena.nirvana.platform.services.IConfigs b/common/src/main/resources/META-INF/services/galena.nirvana.platform.services.IConfigs new file mode 100644 index 0000000..3b73378 --- /dev/null +++ b/common/src/main/resources/META-INF/services/galena.nirvana.platform.services.IConfigs @@ -0,0 +1 @@ +galena.nirvana.config.ConfigsImpl \ No newline at end of file diff --git a/common/src/main/resources/assets/blissful/lang/de_de.json b/common/src/main/resources/assets/blissful/lang/de_de.json deleted file mode 100644 index 9573485..0000000 --- a/common/src/main/resources/assets/blissful/lang/de_de.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "block.blissful.hemp": "Hanf", - "effect.blissful.peace": "Friede", - "effect.blissful.peace.description": "Benebelt den Nutzer in Glückseligkeit", - "item.blissful.hemp": "Hanf", - "item.blissful.hemp_seeds": "Hanfsamen", - "item.blissful.joint": "Bubatz", - "item.blissful.weed": "Canabis", - "block.blissful.hemp_crate": "Hanfkiste", - "block.blissful.weed_crate": "Canabiskiste", - "item.blissful.weed_brownies": "Weedbrownies" -} \ No newline at end of file diff --git a/common/src/main/resources/assets/blissful/models/item/joint_in_hand.bbmodel b/common/src/main/resources/assets/blissful/models/item/joint_in_hand.bbmodel deleted file mode 100644 index a807d7e..0000000 --- a/common/src/main/resources/assets/blissful/models/item/joint_in_hand.bbmodel +++ /dev/null @@ -1 +0,0 @@ -{"meta":{"format_version":"4.5","model_format":"java_block","box_uv":true},"name":"joint_in_hand","parent":"","ambientocclusion":true,"front_gui_light":false,"visible_box":[1,1,0],"variable_placeholders":"","variable_placeholder_buttons":[],"unhandled_root_fields":{},"resolution":{"width":64,"height":64},"elements":[{"name":"cube","box_uv":false,"rescale":false,"locked":false,"render_order":"default","allow_mirror_modeling":true,"from":[7,6,4],"to":[9,8,12],"autouv":0,"color":5,"origin":[8,7,8],"faces":{"north":{"uv":[4,0,6,2],"rotation":180,"texture":0},"east":{"uv":[0,2,2,10],"rotation":270,"texture":0},"south":{"uv":[2,0,4,2],"rotation":180,"texture":0},"west":{"uv":[4,2,6,10],"rotation":90,"texture":0},"up":{"uv":[4,2,2,10],"rotation":180,"texture":0},"down":{"uv":[4,2,2,10],"texture":0}},"type":"cube","uuid":"3b627823-ebf5-1080-a94f-799a9d8426b7"}],"outliner":["3b627823-ebf5-1080-a94f-799a9d8426b7"],"textures":[{"path":"D:\\repos\\Minecraft\\Blissful\\common\\src\\main\\resources\\assets\\blissful\\textures\\item\\joint_in_hand.png","name":"joint_in_hand.png","folder":"item","namespace":"blissful","id":"texture","particle":true,"render_mode":"default","render_sides":"auto","frame_time":1,"frame_order_type":"loop","frame_order":"","frame_interpolate":false,"visible":true,"mode":"bitmap","saved":true,"uuid":"e78fa5f9-a8fd-2f43-6a37-70833c41d6b2","relative_path":"../../../textures/item/joint_in_hand.png","source":"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAYAAACqaXHeAAAAAXNSR0IArs4c6QAAAaVJREFUeF7tlr0vQ2EchX93MfhoImnaCiI0hiYSlUgawu4PECOTpZPFyOAfYGExsRFmYpEgoSFR0x2kDIhWmkjqY7BcuW+R2M583tOleduznOc8b28D+3ltLExHyUSr7V9cuk92jsLg9zvm97+SMYChvpStHxxboqvFNrdu/ACwuzwbZTrb3chRsteC+oNVX9/dud74tOLaHjWIIAaQHsy5wiPZHruuPFrtNvQHwMlqMcoXxv5d83Lp3J1jE2ZWtrkNWFocjyYnmgZkB9JWuavZ6VnTgOrLB/1vQTA/NxxNFUZd4Y5us7cns8PSlTs3nr/onwaB9wZ4DyC+AplUm1M+35+z8n3o7r43V4D5Xx7SjfoRJwAAARkAQKKOyADqeYFyMgCARB2RAdTzAuVkAACJOiIDqOcFyskAABJ1RAZQzwuUkwEAJOqIDKCeFygnAwBI1BEZQD0vUE4GAJCoIzKAel6gnAwAIFFHZAD1vEA5GQBAoo7IAOp5gXIyAIBEHZEB1PMC5WQAAIk6IgOo5wXKyQAAEnVEBlDPC5STAQAk6oj3BnwDPk5yQYirNyUAAAAASUVORK5CYII="}]} \ No newline at end of file diff --git a/common/src/main/resources/assets/nirvana/lang/de_de.json b/common/src/main/resources/assets/nirvana/lang/de_de.json new file mode 100644 index 0000000..ac78c35 --- /dev/null +++ b/common/src/main/resources/assets/nirvana/lang/de_de.json @@ -0,0 +1,12 @@ +{ + "block.nirvana.hemp": "Hanf", + "effect.nirvana.peace": "Friede", + "effect.nirvana.peace.description": "Benebelt den Nutzer in Glückseligkeit", + "item.nirvana.hemp": "Hanf", + "item.nirvana.hemp_seeds": "Hanfsamen", + "item.nirvana.joint": "Bubatz", + "item.nirvana.weed": "Canabis", + "block.nirvana.hemp_crate": "Hanfkiste", + "block.nirvana.weed_crate": "Canabiskiste", + "item.nirvana.weed_brownies": "Weedbrownies" +} \ No newline at end of file diff --git a/common/src/main/resources/assets/blissful/models/block/crop_cross.json b/common/src/main/resources/assets/nirvana/models/block/crop_cross.json similarity index 100% rename from common/src/main/resources/assets/blissful/models/block/crop_cross.json rename to common/src/main/resources/assets/nirvana/models/block/crop_cross.json diff --git a/common/src/main/resources/assets/blissful/models/block/feral_hemp.json b/common/src/main/resources/assets/nirvana/models/block/feral_hemp.json similarity index 98% rename from common/src/main/resources/assets/blissful/models/block/feral_hemp.json rename to common/src/main/resources/assets/nirvana/models/block/feral_hemp.json index 0a5ad62..9cdb9d9 100644 --- a/common/src/main/resources/assets/blissful/models/block/feral_hemp.json +++ b/common/src/main/resources/assets/nirvana/models/block/feral_hemp.json @@ -2,8 +2,8 @@ "credit": "Made with Blockbench", "texture_size": [32, 32], "textures": { - "0": "blissful:block/feral_hemp", - "particle": "blissful:block/feral_hemp" + "0": "nirvana:block/feral_hemp", + "particle": "nirvana:block/feral_hemp" }, "ambientocclusion": false, "elements": [ diff --git a/common/src/main/resources/assets/blissful/models/block/feral_hemp_2.json b/common/src/main/resources/assets/nirvana/models/block/feral_hemp_2.json similarity index 98% rename from common/src/main/resources/assets/blissful/models/block/feral_hemp_2.json rename to common/src/main/resources/assets/nirvana/models/block/feral_hemp_2.json index b2566de..031293d 100644 --- a/common/src/main/resources/assets/blissful/models/block/feral_hemp_2.json +++ b/common/src/main/resources/assets/nirvana/models/block/feral_hemp_2.json @@ -2,8 +2,8 @@ "credit": "Made with Blockbench", "texture_size": [32, 32], "textures": { - "0": "blissful:block/feral_hemp", - "particle": "blissful:block/feral_hemp" + "0": "nirvana:block/feral_hemp", + "particle": "nirvana:block/feral_hemp" }, "ambientocclusion": false, "elements": [ diff --git a/common/src/main/resources/assets/blissful/models/block/feral_hemp_3.json b/common/src/main/resources/assets/nirvana/models/block/feral_hemp_3.json similarity index 98% rename from common/src/main/resources/assets/blissful/models/block/feral_hemp_3.json rename to common/src/main/resources/assets/nirvana/models/block/feral_hemp_3.json index 5be29ab..f35ae35 100644 --- a/common/src/main/resources/assets/blissful/models/block/feral_hemp_3.json +++ b/common/src/main/resources/assets/nirvana/models/block/feral_hemp_3.json @@ -2,8 +2,8 @@ "credit": "Made with Blockbench", "texture_size": [32, 32], "textures": { - "0": "blissful:block/feral_hemp", - "particle": "blissful:block/feral_hemp" + "0": "nirvana:block/feral_hemp", + "particle": "nirvana:block/feral_hemp" }, "ambientocclusion": false, "elements": [ diff --git a/common/src/main/resources/assets/blissful/models/block/hemp_3.bbmodel b/common/src/main/resources/assets/nirvana/models/block/hemp_3.bbmodel similarity index 69% rename from common/src/main/resources/assets/blissful/models/block/hemp_3.bbmodel rename to common/src/main/resources/assets/nirvana/models/block/hemp_3.bbmodel index b0a66a6..61482fb 100644 --- a/common/src/main/resources/assets/blissful/models/block/hemp_3.bbmodel +++ b/common/src/main/resources/assets/nirvana/models/block/hemp_3.bbmodel @@ -1 +1 @@ -{"meta":{"format_version":"4.5","model_format":"java_block","box_uv":false},"name":"hemp_stage_2 - Converted","parent":"","ambientocclusion":true,"front_gui_light":false,"visible_box":[1,1,0],"variable_placeholders":"","variable_placeholder_buttons":[],"unhandled_root_fields":{},"resolution":{"width":32,"height":32},"elements":[{"name":"cube","box_uv":false,"rescale":false,"locked":false,"render_order":"default","allow_mirror_modeling":true,"from":[8,-1,0],"to":[8,15,16],"autouv":0,"color":1,"origin":[8,-9,8],"faces":{"north":{"uv":[0,0,0,0],"texture":null},"east":{"uv":[0,0,16,16],"texture":0},"south":{"uv":[0,0,0,0],"texture":null},"west":{"uv":[0,0,16,16],"texture":0},"up":{"uv":[0,0,0,0],"texture":null},"down":{"uv":[0,0,0,0],"texture":null}},"type":"cube","uuid":"d8bc06c5-0490-846d-7def-3037099f76a5"},{"name":"cube","box_uv":false,"rescale":false,"locked":false,"render_order":"default","allow_mirror_modeling":true,"from":[0,-1,8],"to":[16,15,8],"autouv":0,"color":1,"origin":[8,-9,8],"faces":{"north":{"uv":[0,0,16,16],"texture":0},"east":{"uv":[0,0,0,0],"texture":null},"south":{"uv":[0,0,16,16],"texture":0},"west":{"uv":[0,0,0,0],"texture":null},"up":{"uv":[0,0,0,0],"texture":null},"down":{"uv":[0,0,0,0],"texture":null}},"type":"cube","uuid":"7757a989-0493-c7f8-fbd7-66967ef63e9f"},{"name":"cube","box_uv":false,"rescale":false,"locked":false,"render_order":"default","allow_mirror_modeling":true,"from":[8,5,4.5],"to":[15,5,11.5],"autouv":0,"color":6,"rotation":[0,0,-45],"origin":[8,5,8],"faces":{"north":{"uv":[0,0,0,0],"texture":null},"east":{"uv":[0,0,0,0],"texture":null},"south":{"uv":[0,0,0,0],"texture":null},"west":{"uv":[0,0,0,0],"texture":null},"up":{"uv":[16,9,23,16],"texture":0},"down":{"uv":[16,9,23,16],"texture":0}},"type":"cube","uuid":"008e0073-4555-7555-1aff-a6a2faf2d927"},{"name":"cube","box_uv":false,"rescale":false,"locked":false,"render_order":"default","allow_mirror_modeling":true,"from":[1,5,4.5],"to":[8,5,11.5],"autouv":0,"color":6,"rotation":[0,0,45],"origin":[8,5,8],"faces":{"north":{"uv":[0,0,0,0],"texture":null},"east":{"uv":[0,0,0,0],"texture":null},"south":{"uv":[0,0,0,0],"texture":null},"west":{"uv":[0,0,0,0],"texture":null},"up":{"uv":[23,9,16,16],"texture":0},"down":{"uv":[23,9,16,16],"texture":0}},"type":"cube","uuid":"b902f54e-2fc3-beec-6ff8-4885e559b852"}],"outliner":[{"name":"group3","origin":[0,0,0],"color":0,"uuid":"04b328f0-7f21-3cf5-a05c-d3c4703028fd","export":true,"mirror_uv":false,"isOpen":true,"locked":false,"visibility":true,"autouv":0,"children":["d8bc06c5-0490-846d-7def-3037099f76a5","7757a989-0493-c7f8-fbd7-66967ef63e9f",{"name":"bone","origin":[0,-11,0],"color":0,"uuid":"926cb65f-bc7e-090a-6ceb-81a746b00694","export":true,"mirror_uv":false,"isOpen":true,"locked":false,"visibility":true,"autouv":0,"children":["b902f54e-2fc3-beec-6ff8-4885e559b852","008e0073-4555-7555-1aff-a6a2faf2d927"]}]}],"textures":[{"path":"C:\\Users\\Admin\\Desktop\\Экспо\\hemp.png","name":"hemp.png","folder":"block","namespace":"blissful","id":"texture","particle":true,"render_mode":"default","render_sides":"auto","frame_time":1,"frame_order_type":"loop","frame_order":"","frame_interpolate":false,"visible":true,"mode":"bitmap","saved":false,"uuid":"ffd510b8-6889-23b7-b970-1301bd98870a","source":"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAk9JREFUWEftVj1Iw0AUvji5CHarQ1GhUslkFwVFoYu6OUnn4iTiLnYWXJxEncSuRRcR8WepPygoSDupxYLWqu3Wgh2cGvkOXj1CcnepKS5mSTTpfX/v3j2D+Xyt7k5ZS7MnBu79vWEWH94wZBDSl165za2PWpMjUXZ6k2W4q8Cxvq8EoPqp8tkEJ0LPxQKDK06CfCMAMACQctGN7cVrV5xfEwDQQLCLIW9cUEvPdsVOTjgSsBdQ+nbBQq4yJYllkzsQiYa43fgbz4jEswOJpGl1BLu5ncf7GRYZCrF8rsR2Vu6ljsGNRrnWJEHugJjnGgCJ6ZkYr+hGpaYEBwipzmdLTRKqneQaARjDejgA5VAjs5KA6DtS76acvnckIFoH6xGHygXdxmN3xDVT2kZwAJcsf/oWjccrEWlRIYLU5gE7Sr0qvwO4SESVvTQCegk154cPUgKk2L7/Zd1PJCdVpkMAi9EBpFt42gSw4MfdmzICEZi2oqr6fYuAFvIKrE1ApwPqFpzn0xDZ/hP4Uwf46aZ5ELVaB8rjVWcbtgqunAl1+0DbCGAmqLzXlY1IRYA6pdjiqbakEbRKAL8TT08abmhMB6HiXp1tpa+MttSAXTGflpKmRaNdZyHAwdtSA6I60XL7hEWHmC8OkOUEjsWhcD4+ZuFO6jGun63l2Fe4ygddxOBLDdgJEKhoNdUBJiz8n0j6QiA2YVqDPQGuDMUH5Xh+uWQsc/EzyjvF4wsBqAGJvnHG1T2Wq1yhCE6ZU/VrHcdeWzFstqsWewTei7Hg3TeEBfWjk+5RsQAAAABJRU5ErkJggg==","relative_path":"C:/Users/Admin/Desktop/Экспо/hemp.png"}]} \ No newline at end of file +{"meta":{"format_version":"4.5","model_format":"java_block","box_uv":false},"name":"hemp_stage_2 - Converted","parent":"","ambientocclusion":true,"front_gui_light":false,"visible_box":[1,1,0],"variable_placeholders":"","variable_placeholder_buttons":[],"unhandled_root_fields":{},"resolution":{"width":32,"height":32},"elements":[{"name":"cube","box_uv":false,"rescale":false,"locked":false,"render_order":"default","allow_mirror_modeling":true,"from":[8,-1,0],"to":[8,15,16],"autouv":0,"color":1,"origin":[8,-9,8],"faces":{"north":{"uv":[0,0,0,0],"texture":null},"east":{"uv":[0,0,16,16],"texture":0},"south":{"uv":[0,0,0,0],"texture":null},"west":{"uv":[0,0,16,16],"texture":0},"up":{"uv":[0,0,0,0],"texture":null},"down":{"uv":[0,0,0,0],"texture":null}},"type":"cube","uuid":"d8bc06c5-0490-846d-7def-3037099f76a5"},{"name":"cube","box_uv":false,"rescale":false,"locked":false,"render_order":"default","allow_mirror_modeling":true,"from":[0,-1,8],"to":[16,15,8],"autouv":0,"color":1,"origin":[8,-9,8],"faces":{"north":{"uv":[0,0,16,16],"texture":0},"east":{"uv":[0,0,0,0],"texture":null},"south":{"uv":[0,0,16,16],"texture":0},"west":{"uv":[0,0,0,0],"texture":null},"up":{"uv":[0,0,0,0],"texture":null},"down":{"uv":[0,0,0,0],"texture":null}},"type":"cube","uuid":"7757a989-0493-c7f8-fbd7-66967ef63e9f"},{"name":"cube","box_uv":false,"rescale":false,"locked":false,"render_order":"default","allow_mirror_modeling":true,"from":[8,5,4.5],"to":[15,5,11.5],"autouv":0,"color":6,"rotation":[0,0,-45],"origin":[8,5,8],"faces":{"north":{"uv":[0,0,0,0],"texture":null},"east":{"uv":[0,0,0,0],"texture":null},"south":{"uv":[0,0,0,0],"texture":null},"west":{"uv":[0,0,0,0],"texture":null},"up":{"uv":[16,9,23,16],"texture":0},"down":{"uv":[16,9,23,16],"texture":0}},"type":"cube","uuid":"008e0073-4555-7555-1aff-a6a2faf2d927"},{"name":"cube","box_uv":false,"rescale":false,"locked":false,"render_order":"default","allow_mirror_modeling":true,"from":[1,5,4.5],"to":[8,5,11.5],"autouv":0,"color":6,"rotation":[0,0,45],"origin":[8,5,8],"faces":{"north":{"uv":[0,0,0,0],"texture":null},"east":{"uv":[0,0,0,0],"texture":null},"south":{"uv":[0,0,0,0],"texture":null},"west":{"uv":[0,0,0,0],"texture":null},"up":{"uv":[23,9,16,16],"texture":0},"down":{"uv":[23,9,16,16],"texture":0}},"type":"cube","uuid":"b902f54e-2fc3-beec-6ff8-4885e559b852"}],"outliner":[{"name":"group3","origin":[0,0,0],"color":0,"uuid":"04b328f0-7f21-3cf5-a05c-d3c4703028fd","export":true,"mirror_uv":false,"isOpen":true,"locked":false,"visibility":true,"autouv":0,"children":["d8bc06c5-0490-846d-7def-3037099f76a5","7757a989-0493-c7f8-fbd7-66967ef63e9f",{"name":"bone","origin":[0,-11,0],"color":0,"uuid":"926cb65f-bc7e-090a-6ceb-81a746b00694","export":true,"mirror_uv":false,"isOpen":true,"locked":false,"visibility":true,"autouv":0,"children":["b902f54e-2fc3-beec-6ff8-4885e559b852","008e0073-4555-7555-1aff-a6a2faf2d927"]}]}],"textures":[{"path":"C:\\Users\\Admin\\Desktop\\Экспо\\hemp.png","name":"hemp.png","folder":"block","namespace":"nirvana","id":"texture","particle":true,"render_mode":"default","render_sides":"auto","frame_time":1,"frame_order_type":"loop","frame_order":"","frame_interpolate":false,"visible":true,"mode":"bitmap","saved":false,"uuid":"ffd510b8-6889-23b7-b970-1301bd98870a","source":"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAk9JREFUWEftVj1Iw0AUvji5CHarQ1GhUslkFwVFoYu6OUnn4iTiLnYWXJxEncSuRRcR8WepPygoSDupxYLWqu3Wgh2cGvkOXj1CcnepKS5mSTTpfX/v3j2D+Xyt7k5ZS7MnBu79vWEWH94wZBDSl165za2PWpMjUXZ6k2W4q8Cxvq8EoPqp8tkEJ0LPxQKDK06CfCMAMACQctGN7cVrV5xfEwDQQLCLIW9cUEvPdsVOTjgSsBdQ+nbBQq4yJYllkzsQiYa43fgbz4jEswOJpGl1BLu5ncf7GRYZCrF8rsR2Vu6ljsGNRrnWJEHugJjnGgCJ6ZkYr+hGpaYEBwipzmdLTRKqneQaARjDejgA5VAjs5KA6DtS76acvnckIFoH6xGHygXdxmN3xDVT2kZwAJcsf/oWjccrEWlRIYLU5gE7Sr0qvwO4SESVvTQCegk154cPUgKk2L7/Zd1PJCdVpkMAi9EBpFt42gSw4MfdmzICEZi2oqr6fYuAFvIKrE1ApwPqFpzn0xDZ/hP4Uwf46aZ5ELVaB8rjVWcbtgqunAl1+0DbCGAmqLzXlY1IRYA6pdjiqbakEbRKAL8TT08abmhMB6HiXp1tpa+MttSAXTGflpKmRaNdZyHAwdtSA6I60XL7hEWHmC8OkOUEjsWhcD4+ZuFO6jGun63l2Fe4ygddxOBLDdgJEKhoNdUBJiz8n0j6QiA2YVqDPQGuDMUH5Xh+uWQsc/EzyjvF4wsBqAGJvnHG1T2Wq1yhCE6ZU/VrHcdeWzFstqsWewTei7Hg3TeEBfWjk+5RsQAAAABJRU5ErkJggg==","relative_path":"C:/Users/Admin/Desktop/Экспо/hemp.png"}]} \ No newline at end of file diff --git a/common/src/main/resources/assets/blissful/models/block/hemp_3.json b/common/src/main/resources/assets/nirvana/models/block/hemp_3.json similarity index 95% rename from common/src/main/resources/assets/blissful/models/block/hemp_3.json rename to common/src/main/resources/assets/nirvana/models/block/hemp_3.json index f5dda08..c09afd7 100644 --- a/common/src/main/resources/assets/blissful/models/block/hemp_3.json +++ b/common/src/main/resources/assets/nirvana/models/block/hemp_3.json @@ -3,8 +3,8 @@ "ambientocclusion": false, "texture_size": [32, 32], "textures": { - "particle": "blissful:block/hemp", - "texture": "blissful:block/hemp" + "particle": "nirvana:block/hemp", + "texture": "nirvana:block/hemp" }, "elements": [ { diff --git a/common/src/main/resources/assets/blissful/models/block/hemp_4.bbmodel b/common/src/main/resources/assets/nirvana/models/block/hemp_4.bbmodel similarity index 75% rename from common/src/main/resources/assets/blissful/models/block/hemp_4.bbmodel rename to common/src/main/resources/assets/nirvana/models/block/hemp_4.bbmodel index 421f8ee..5fa7e43 100644 --- a/common/src/main/resources/assets/blissful/models/block/hemp_4.bbmodel +++ b/common/src/main/resources/assets/nirvana/models/block/hemp_4.bbmodel @@ -1 +1 @@ -{"meta":{"format_version":"4.5","model_format":"java_block","box_uv":false},"name":"hemp_4","parent":"","ambientocclusion":true,"front_gui_light":false,"visible_box":[1,1,0],"variable_placeholders":"","variable_placeholder_buttons":[],"unhandled_root_fields":{},"resolution":{"width":32,"height":32},"elements":[{"name":"cube","box_uv":false,"rescale":false,"locked":false,"render_order":"default","allow_mirror_modeling":true,"from":[8,-1,0],"to":[8,23,16],"autouv":0,"color":1,"origin":[8,-9,8],"faces":{"north":{"uv":[0,0,0,0],"texture":null},"east":{"uv":[0,0,16,24],"texture":0},"south":{"uv":[0,0,0,0],"texture":null},"west":{"uv":[0,0,16,24],"texture":0},"up":{"uv":[0,0,0,0],"texture":null},"down":{"uv":[0,0,0,0],"texture":null}},"type":"cube","uuid":"6d2f8c8d-b630-4172-e838-9ab6e5690047"},{"name":"cube","box_uv":false,"rescale":false,"locked":false,"render_order":"default","allow_mirror_modeling":true,"from":[0,-1,8],"to":[16,23,8],"autouv":0,"color":1,"origin":[8,-9,8],"faces":{"north":{"uv":[0,0,16,24],"texture":0},"east":{"uv":[0,0,0,0],"texture":null},"south":{"uv":[0,0,16,24],"texture":0},"west":{"uv":[0,0,0,0],"texture":null},"up":{"uv":[0,0,0,0],"texture":null},"down":{"uv":[0,0,0,0],"texture":null}},"type":"cube","uuid":"74ab6308-4bc3-4f7a-1530-05a097527c05"},{"name":"cube","box_uv":false,"rescale":false,"locked":false,"render_order":"default","allow_mirror_modeling":true,"from":[3.5,11,-4],"to":[12.5,11,8],"autouv":0,"color":6,"rotation":[-45,0,0],"origin":[8,11,8],"faces":{"north":{"uv":[0,0,0,0],"texture":null},"east":{"uv":[0,0,0,0],"texture":null},"south":{"uv":[0,0,0,0],"texture":null},"west":{"uv":[0,0,0,0],"texture":null},"up":{"uv":[16,0,28,9],"rotation":270,"texture":0},"down":{"uv":[16,0,28,9],"rotation":90,"texture":0}},"type":"cube","uuid":"f15ca647-704d-b4ea-cf25-369f6aeeb661"},{"name":"cube","box_uv":false,"rescale":false,"locked":false,"render_order":"default","allow_mirror_modeling":true,"from":[3.5,11,8],"to":[12.5,11,20],"autouv":0,"color":6,"rotation":[45,0,0],"origin":[8,11,8],"faces":{"north":{"uv":[0,0,0,0],"texture":null},"east":{"uv":[0,0,0,0],"texture":null},"south":{"uv":[0,0,0,0],"texture":null},"west":{"uv":[0,0,0,0],"texture":null},"up":{"uv":[16,0,28,9],"rotation":90,"texture":0},"down":{"uv":[16,0,28,9],"rotation":270,"texture":0}},"type":"cube","uuid":"5f2d9bc5-dc1b-4dcf-cc41-f381b4668221"},{"name":"cube","box_uv":false,"rescale":false,"locked":false,"render_order":"default","allow_mirror_modeling":true,"from":[8,9,3.5],"to":[20,9,12.5],"autouv":0,"color":6,"rotation":[0,0,-45],"origin":[8,9,8],"faces":{"north":{"uv":[0,0,0,0],"texture":null},"east":{"uv":[0,0,0,0],"texture":null},"south":{"uv":[0,0,0,0],"texture":null},"west":{"uv":[0,0,0,0],"texture":null},"up":{"uv":[16,0,28,9],"texture":0},"down":{"uv":[16,0,28,9],"texture":0}},"type":"cube","uuid":"dc8149fe-a4b6-8f47-0a43-3317ffe89854"},{"name":"cube","box_uv":false,"rescale":false,"locked":false,"render_order":"default","allow_mirror_modeling":true,"from":[-4,8,3.5],"to":[8,8,12.5],"autouv":0,"color":6,"rotation":[0,0,45],"origin":[8,8,8],"faces":{"north":{"uv":[0,0,0,0],"texture":null},"east":{"uv":[0,0,0,0],"texture":null},"south":{"uv":[0,0,0,0],"texture":null},"west":{"uv":[0,0,0,0],"texture":null},"up":{"uv":[28,0,16,9],"texture":0},"down":{"uv":[28,0,16,9],"texture":0}},"type":"cube","uuid":"10d4f3e8-c619-4459-0801-dccbb88bc713"}],"outliner":[{"name":"group2","origin":[0,0,0],"color":0,"uuid":"ad4ae13a-99bc-aac1-8ca9-db374047f885","export":true,"mirror_uv":false,"isOpen":true,"locked":false,"visibility":true,"autouv":0,"children":["6d2f8c8d-b630-4172-e838-9ab6e5690047","74ab6308-4bc3-4f7a-1530-05a097527c05","f15ca647-704d-b4ea-cf25-369f6aeeb661","5f2d9bc5-dc1b-4dcf-cc41-f381b4668221","dc8149fe-a4b6-8f47-0a43-3317ffe89854","10d4f3e8-c619-4459-0801-dccbb88bc713"]}],"textures":[{"path":"C:\\Users\\Admin\\Desktop\\Экспо\\hemp.png","name":"hemp.png","folder":"block","namespace":"blissful","id":"texture","particle":true,"render_mode":"default","render_sides":"auto","frame_time":1,"frame_order_type":"loop","frame_order":"","frame_interpolate":false,"visible":true,"mode":"bitmap","saved":false,"uuid":"ffd510b8-6889-23b7-b970-1301bd98870a","source":"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAk9JREFUWEftVj1Iw0AUvji5CHarQ1GhUslkFwVFoYu6OUnn4iTiLnYWXJxEncSuRRcR8WepPygoSDupxYLWqu3Wgh2cGvkOXj1CcnepKS5mSTTpfX/v3j2D+Xyt7k5ZS7MnBu79vWEWH94wZBDSl165za2PWpMjUXZ6k2W4q8Cxvq8EoPqp8tkEJ0LPxQKDK06CfCMAMACQctGN7cVrV5xfEwDQQLCLIW9cUEvPdsVOTjgSsBdQ+nbBQq4yJYllkzsQiYa43fgbz4jEswOJpGl1BLu5ncf7GRYZCrF8rsR2Vu6ljsGNRrnWJEHugJjnGgCJ6ZkYr+hGpaYEBwipzmdLTRKqneQaARjDejgA5VAjs5KA6DtS76acvnckIFoH6xGHygXdxmN3xDVT2kZwAJcsf/oWjccrEWlRIYLU5gE7Sr0qvwO4SESVvTQCegk154cPUgKk2L7/Zd1PJCdVpkMAi9EBpFt42gSw4MfdmzICEZi2oqr6fYuAFvIKrE1ApwPqFpzn0xDZ/hP4Uwf46aZ5ELVaB8rjVWcbtgqunAl1+0DbCGAmqLzXlY1IRYA6pdjiqbakEbRKAL8TT08abmhMB6HiXp1tpa+MttSAXTGflpKmRaNdZyHAwdtSA6I60XL7hEWHmC8OkOUEjsWhcD4+ZuFO6jGun63l2Fe4ygddxOBLDdgJEKhoNdUBJiz8n0j6QiA2YVqDPQGuDMUH5Xh+uWQsc/EzyjvF4wsBqAGJvnHG1T2Wq1yhCE6ZU/VrHcdeWzFstqsWewTei7Hg3TeEBfWjk+5RsQAAAABJRU5ErkJggg==","relative_path":"C:/Users/Admin/Desktop/Экспо/hemp.png"}]} \ No newline at end of file +{"meta":{"format_version":"4.5","model_format":"java_block","box_uv":false},"name":"hemp_4","parent":"","ambientocclusion":true,"front_gui_light":false,"visible_box":[1,1,0],"variable_placeholders":"","variable_placeholder_buttons":[],"unhandled_root_fields":{},"resolution":{"width":32,"height":32},"elements":[{"name":"cube","box_uv":false,"rescale":false,"locked":false,"render_order":"default","allow_mirror_modeling":true,"from":[8,-1,0],"to":[8,23,16],"autouv":0,"color":1,"origin":[8,-9,8],"faces":{"north":{"uv":[0,0,0,0],"texture":null},"east":{"uv":[0,0,16,24],"texture":0},"south":{"uv":[0,0,0,0],"texture":null},"west":{"uv":[0,0,16,24],"texture":0},"up":{"uv":[0,0,0,0],"texture":null},"down":{"uv":[0,0,0,0],"texture":null}},"type":"cube","uuid":"6d2f8c8d-b630-4172-e838-9ab6e5690047"},{"name":"cube","box_uv":false,"rescale":false,"locked":false,"render_order":"default","allow_mirror_modeling":true,"from":[0,-1,8],"to":[16,23,8],"autouv":0,"color":1,"origin":[8,-9,8],"faces":{"north":{"uv":[0,0,16,24],"texture":0},"east":{"uv":[0,0,0,0],"texture":null},"south":{"uv":[0,0,16,24],"texture":0},"west":{"uv":[0,0,0,0],"texture":null},"up":{"uv":[0,0,0,0],"texture":null},"down":{"uv":[0,0,0,0],"texture":null}},"type":"cube","uuid":"74ab6308-4bc3-4f7a-1530-05a097527c05"},{"name":"cube","box_uv":false,"rescale":false,"locked":false,"render_order":"default","allow_mirror_modeling":true,"from":[3.5,11,-4],"to":[12.5,11,8],"autouv":0,"color":6,"rotation":[-45,0,0],"origin":[8,11,8],"faces":{"north":{"uv":[0,0,0,0],"texture":null},"east":{"uv":[0,0,0,0],"texture":null},"south":{"uv":[0,0,0,0],"texture":null},"west":{"uv":[0,0,0,0],"texture":null},"up":{"uv":[16,0,28,9],"rotation":270,"texture":0},"down":{"uv":[16,0,28,9],"rotation":90,"texture":0}},"type":"cube","uuid":"f15ca647-704d-b4ea-cf25-369f6aeeb661"},{"name":"cube","box_uv":false,"rescale":false,"locked":false,"render_order":"default","allow_mirror_modeling":true,"from":[3.5,11,8],"to":[12.5,11,20],"autouv":0,"color":6,"rotation":[45,0,0],"origin":[8,11,8],"faces":{"north":{"uv":[0,0,0,0],"texture":null},"east":{"uv":[0,0,0,0],"texture":null},"south":{"uv":[0,0,0,0],"texture":null},"west":{"uv":[0,0,0,0],"texture":null},"up":{"uv":[16,0,28,9],"rotation":90,"texture":0},"down":{"uv":[16,0,28,9],"rotation":270,"texture":0}},"type":"cube","uuid":"5f2d9bc5-dc1b-4dcf-cc41-f381b4668221"},{"name":"cube","box_uv":false,"rescale":false,"locked":false,"render_order":"default","allow_mirror_modeling":true,"from":[8,9,3.5],"to":[20,9,12.5],"autouv":0,"color":6,"rotation":[0,0,-45],"origin":[8,9,8],"faces":{"north":{"uv":[0,0,0,0],"texture":null},"east":{"uv":[0,0,0,0],"texture":null},"south":{"uv":[0,0,0,0],"texture":null},"west":{"uv":[0,0,0,0],"texture":null},"up":{"uv":[16,0,28,9],"texture":0},"down":{"uv":[16,0,28,9],"texture":0}},"type":"cube","uuid":"dc8149fe-a4b6-8f47-0a43-3317ffe89854"},{"name":"cube","box_uv":false,"rescale":false,"locked":false,"render_order":"default","allow_mirror_modeling":true,"from":[-4,8,3.5],"to":[8,8,12.5],"autouv":0,"color":6,"rotation":[0,0,45],"origin":[8,8,8],"faces":{"north":{"uv":[0,0,0,0],"texture":null},"east":{"uv":[0,0,0,0],"texture":null},"south":{"uv":[0,0,0,0],"texture":null},"west":{"uv":[0,0,0,0],"texture":null},"up":{"uv":[28,0,16,9],"texture":0},"down":{"uv":[28,0,16,9],"texture":0}},"type":"cube","uuid":"10d4f3e8-c619-4459-0801-dccbb88bc713"}],"outliner":[{"name":"group2","origin":[0,0,0],"color":0,"uuid":"ad4ae13a-99bc-aac1-8ca9-db374047f885","export":true,"mirror_uv":false,"isOpen":true,"locked":false,"visibility":true,"autouv":0,"children":["6d2f8c8d-b630-4172-e838-9ab6e5690047","74ab6308-4bc3-4f7a-1530-05a097527c05","f15ca647-704d-b4ea-cf25-369f6aeeb661","5f2d9bc5-dc1b-4dcf-cc41-f381b4668221","dc8149fe-a4b6-8f47-0a43-3317ffe89854","10d4f3e8-c619-4459-0801-dccbb88bc713"]}],"textures":[{"path":"C:\\Users\\Admin\\Desktop\\Экспо\\hemp.png","name":"hemp.png","folder":"block","namespace":"nirvana","id":"texture","particle":true,"render_mode":"default","render_sides":"auto","frame_time":1,"frame_order_type":"loop","frame_order":"","frame_interpolate":false,"visible":true,"mode":"bitmap","saved":false,"uuid":"ffd510b8-6889-23b7-b970-1301bd98870a","source":"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAk9JREFUWEftVj1Iw0AUvji5CHarQ1GhUslkFwVFoYu6OUnn4iTiLnYWXJxEncSuRRcR8WepPygoSDupxYLWqu3Wgh2cGvkOXj1CcnepKS5mSTTpfX/v3j2D+Xyt7k5ZS7MnBu79vWEWH94wZBDSl165za2PWpMjUXZ6k2W4q8Cxvq8EoPqp8tkEJ0LPxQKDK06CfCMAMACQctGN7cVrV5xfEwDQQLCLIW9cUEvPdsVOTjgSsBdQ+nbBQq4yJYllkzsQiYa43fgbz4jEswOJpGl1BLu5ncf7GRYZCrF8rsR2Vu6ljsGNRrnWJEHugJjnGgCJ6ZkYr+hGpaYEBwipzmdLTRKqneQaARjDejgA5VAjs5KA6DtS76acvnckIFoH6xGHygXdxmN3xDVT2kZwAJcsf/oWjccrEWlRIYLU5gE7Sr0qvwO4SESVvTQCegk154cPUgKk2L7/Zd1PJCdVpkMAi9EBpFt42gSw4MfdmzICEZi2oqr6fYuAFvIKrE1ApwPqFpzn0xDZ/hP4Uwf46aZ5ELVaB8rjVWcbtgqunAl1+0DbCGAmqLzXlY1IRYA6pdjiqbakEbRKAL8TT08abmhMB6HiXp1tpa+MttSAXTGflpKmRaNdZyHAwdtSA6I60XL7hEWHmC8OkOUEjsWhcD4+ZuFO6jGun63l2Fe4ygddxOBLDdgJEKhoNdUBJiz8n0j6QiA2YVqDPQGuDMUH5Xh+uWQsc/EzyjvF4wsBqAGJvnHG1T2Wq1yhCE6ZU/VrHcdeWzFstqsWewTei7Hg3TeEBfWjk+5RsQAAAABJRU5ErkJggg==","relative_path":"C:/Users/Admin/Desktop/Экспо/hemp.png"}]} \ No newline at end of file diff --git a/common/src/main/resources/assets/blissful/models/block/hemp_4.json b/common/src/main/resources/assets/nirvana/models/block/hemp_4.json similarity index 96% rename from common/src/main/resources/assets/blissful/models/block/hemp_4.json rename to common/src/main/resources/assets/nirvana/models/block/hemp_4.json index 5efa6d2..9d56239 100644 --- a/common/src/main/resources/assets/blissful/models/block/hemp_4.json +++ b/common/src/main/resources/assets/nirvana/models/block/hemp_4.json @@ -3,8 +3,8 @@ "ambientocclusion": false, "texture_size": [32, 32], "textures": { - "particle": "blissful:block/hemp", - "texture": "blissful:block/hemp" + "particle": "nirvana:block/hemp", + "texture": "nirvana:block/hemp" }, "elements": [ { diff --git a/common/src/main/resources/assets/blissful/models/block/hemp_5.bbmodel b/common/src/main/resources/assets/nirvana/models/block/hemp_5.bbmodel similarity index 83% rename from common/src/main/resources/assets/blissful/models/block/hemp_5.bbmodel rename to common/src/main/resources/assets/nirvana/models/block/hemp_5.bbmodel index 001e0f8..8dca710 100644 --- a/common/src/main/resources/assets/blissful/models/block/hemp_5.bbmodel +++ b/common/src/main/resources/assets/nirvana/models/block/hemp_5.bbmodel @@ -1 +1 @@ -{"meta":{"format_version":"4.5","model_format":"java_block","box_uv":false},"name":"hemp_5","parent":"","ambientocclusion":true,"front_gui_light":false,"visible_box":[1,1,0],"variable_placeholders":"","variable_placeholder_buttons":[],"unhandled_root_fields":{},"resolution":{"width":32,"height":32},"elements":[{"name":"cube","box_uv":false,"rescale":false,"locked":false,"render_order":"default","allow_mirror_modeling":true,"from":[8,-1,0],"to":[8,31,16],"autouv":1,"color":1,"origin":[8,-1,8],"faces":{"north":{"uv":[0,0,0,32],"texture":null},"east":{"uv":[0,0,16,32],"texture":0},"south":{"uv":[0,0,0,32],"texture":null},"west":{"uv":[0,0,16,32],"texture":0},"up":{"uv":[0,0,0,16],"rotation":180,"texture":null},"down":{"uv":[0,0,0,16],"rotation":180,"texture":null}},"type":"cube","uuid":"4b464bef-e9ce-e00a-98c8-83a9e151708d"},{"name":"cube","box_uv":false,"rescale":false,"locked":false,"render_order":"default","allow_mirror_modeling":true,"from":[0,-1,8],"to":[16,31,8],"autouv":0,"color":1,"origin":[8,-1,8],"faces":{"north":{"uv":[0,0,16,32],"texture":0},"east":{"uv":[0,0,0,0],"texture":null},"south":{"uv":[0,0,16,32],"texture":0},"west":{"uv":[0,0,0,0],"texture":null},"up":{"uv":[0,0,0,0],"rotation":270,"texture":null},"down":{"uv":[0,0,0,0],"rotation":90,"texture":null}},"type":"cube","uuid":"46634245-73f5-23c3-9c87-99a336ac7f32"},{"name":"cube","box_uv":false,"rescale":false,"locked":false,"render_order":"default","allow_mirror_modeling":true,"from":[3.5,-2,8],"to":[12.5,10,8],"autouv":0,"color":6,"rotation":[45,0,0],"origin":[8,10,8],"faces":{"north":{"uv":[16,0,28,9],"rotation":90,"texture":0},"east":{"uv":[0,0,0,0],"rotation":90,"texture":null},"south":{"uv":[16,0,28,9],"rotation":90,"texture":0},"west":{"uv":[0,0,0,0],"rotation":270,"texture":null},"up":{"uv":[0,0,0,0],"texture":null},"down":{"uv":[0,0,0,0],"rotation":180,"texture":null}},"type":"cube","uuid":"49fe957a-6317-4ef0-e6d3-314c92976f07"},{"name":"cube","box_uv":false,"rescale":false,"locked":false,"render_order":"default","allow_mirror_modeling":true,"from":[3.5,10,8],"to":[12.5,10,20],"autouv":0,"color":6,"rotation":[45,0,0],"origin":[8,10,8],"faces":{"north":{"uv":[0,0,0,0],"texture":null},"east":{"uv":[0,0,0,0],"texture":null},"south":{"uv":[0,0,0,0],"texture":null},"west":{"uv":[0,0,0,0],"texture":null},"up":{"uv":[16,0,28,9],"rotation":90,"texture":0},"down":{"uv":[16,0,28,9],"rotation":270,"texture":0}},"type":"cube","uuid":"d75284ac-31e9-d4db-e399-959ce7348852"},{"name":"cube","box_uv":false,"rescale":false,"locked":false,"render_order":"default","allow_mirror_modeling":true,"from":[3.5,19,-4],"to":[12.5,19,8],"autouv":0,"color":6,"rotation":[-45,0,0],"origin":[8,19,8],"faces":{"north":{"uv":[0,0,0,0],"texture":null},"east":{"uv":[0,0,0,0],"texture":null},"south":{"uv":[0,0,0,0],"texture":null},"west":{"uv":[0,0,0,0],"texture":null},"up":{"uv":[16,0,28,9],"rotation":270,"texture":0},"down":{"uv":[16,0,28,9],"rotation":90,"texture":0}},"type":"cube","uuid":"33957b57-5fef-3654-fa15-2ccfdb819e7c"},{"name":"cube","box_uv":false,"rescale":false,"locked":false,"render_order":"default","allow_mirror_modeling":true,"from":[3.5,19,8],"to":[12.5,19,20],"autouv":0,"color":6,"rotation":[45,0,0],"origin":[8,19,8],"faces":{"north":{"uv":[0,0,0,0],"texture":null},"east":{"uv":[0,0,0,0],"texture":null},"south":{"uv":[0,0,0,0],"texture":null},"west":{"uv":[0,0,0,0],"texture":null},"up":{"uv":[16,0,28,9],"rotation":90,"texture":0},"down":{"uv":[16,0,28,9],"rotation":270,"texture":0}},"type":"cube","uuid":"5a4f37dc-baf1-49ca-4e6a-6940e21c7f20"},{"name":"cube","box_uv":false,"rescale":false,"locked":false,"render_order":"default","allow_mirror_modeling":true,"from":[8,17,3.5],"to":[20,17,12.5],"autouv":0,"color":6,"rotation":[0,0,-45],"origin":[8,17,8],"faces":{"north":{"uv":[0,0,0,0],"texture":null},"east":{"uv":[0,0,0,0],"texture":null},"south":{"uv":[0,0,0,0],"texture":null},"west":{"uv":[0,0,0,0],"texture":null},"up":{"uv":[16,0,28,9],"texture":0},"down":{"uv":[16,0,28,9],"texture":0}},"type":"cube","uuid":"32075fbb-7e82-2238-f5c1-2fe912422d05"},{"name":"cube","box_uv":false,"rescale":false,"locked":false,"render_order":"default","allow_mirror_modeling":true,"from":[8,8,3.5],"to":[20,8,12.5],"autouv":0,"color":6,"rotation":[0,0,-45],"origin":[8,7,8],"faces":{"north":{"uv":[0,0,0,0],"texture":null},"east":{"uv":[0,0,0,0],"texture":null},"south":{"uv":[0,0,0,0],"texture":null},"west":{"uv":[0,0,0,0],"texture":null},"up":{"uv":[16,0,28,9],"texture":0},"down":{"uv":[16,0,28,9],"texture":0}},"type":"cube","uuid":"efec5411-1900-f82a-c59e-2c3acb2d0f0c"},{"name":"cube","box_uv":false,"rescale":false,"locked":false,"render_order":"default","allow_mirror_modeling":true,"from":[-4,8,3.5],"to":[8,8,12.5],"autouv":0,"color":6,"rotation":[0,0,45],"origin":[8,7,8],"faces":{"north":{"uv":[0,0,0,0],"texture":null},"east":{"uv":[0,0,0,0],"texture":null},"south":{"uv":[0,0,0,0],"texture":null},"west":{"uv":[0,0,0,0],"texture":null},"up":{"uv":[28,0,16,9],"texture":0},"down":{"uv":[28,0,16,9],"texture":0}},"type":"cube","uuid":"2dacbb52-cb7e-76f9-27e3-a96e35168ab7"},{"name":"cube","box_uv":false,"rescale":false,"locked":false,"render_order":"default","allow_mirror_modeling":true,"from":[8,4,3.5],"to":[8,16,12.5],"autouv":0,"color":6,"rotation":[0,0,-45],"origin":[8,16,8],"faces":{"north":{"uv":[0,0,0,0],"rotation":90,"texture":null},"east":{"uv":[28,0,16,9],"rotation":270,"texture":0},"south":{"uv":[0,0,0,0],"rotation":270,"texture":null},"west":{"uv":[28,0,16,9],"rotation":270,"texture":0},"up":{"uv":[0,0,0,0],"rotation":270,"texture":null},"down":{"uv":[0,0,0,0],"rotation":270,"texture":null}},"type":"cube","uuid":"68878531-2c24-215d-ce83-1203e2adf5f7"}],"outliner":[{"name":"group","origin":[0,8,0],"color":0,"uuid":"36c56c7d-061d-eb17-82d1-852c81ecebd0","export":true,"mirror_uv":false,"isOpen":true,"locked":false,"visibility":true,"autouv":0,"children":["4b464bef-e9ce-e00a-98c8-83a9e151708d","46634245-73f5-23c3-9c87-99a336ac7f32","49fe957a-6317-4ef0-e6d3-314c92976f07","d75284ac-31e9-d4db-e399-959ce7348852","33957b57-5fef-3654-fa15-2ccfdb819e7c","5a4f37dc-baf1-49ca-4e6a-6940e21c7f20","32075fbb-7e82-2238-f5c1-2fe912422d05","efec5411-1900-f82a-c59e-2c3acb2d0f0c","2dacbb52-cb7e-76f9-27e3-a96e35168ab7","68878531-2c24-215d-ce83-1203e2adf5f7"]}],"textures":[{"path":"C:\\Users\\Admin\\Desktop\\Экспо\\hemp.png","name":"hemp.png","folder":"block","namespace":"blissful","id":"texture","particle":true,"render_mode":"default","render_sides":"auto","frame_time":1,"frame_order_type":"loop","frame_order":"","frame_interpolate":false,"visible":true,"mode":"bitmap","saved":false,"uuid":"ffd510b8-6889-23b7-b970-1301bd98870a","source":"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAk9JREFUWEftVj1Iw0AUvji5CHarQ1GhUslkFwVFoYu6OUnn4iTiLnYWXJxEncSuRRcR8WepPygoSDupxYLWqu3Wgh2cGvkOXj1CcnepKS5mSTTpfX/v3j2D+Xyt7k5ZS7MnBu79vWEWH94wZBDSl165za2PWpMjUXZ6k2W4q8Cxvq8EoPqp8tkEJ0LPxQKDK06CfCMAMACQctGN7cVrV5xfEwDQQLCLIW9cUEvPdsVOTjgSsBdQ+nbBQq4yJYllkzsQiYa43fgbz4jEswOJpGl1BLu5ncf7GRYZCrF8rsR2Vu6ljsGNRrnWJEHugJjnGgCJ6ZkYr+hGpaYEBwipzmdLTRKqneQaARjDejgA5VAjs5KA6DtS76acvnckIFoH6xGHygXdxmN3xDVT2kZwAJcsf/oWjccrEWlRIYLU5gE7Sr0qvwO4SESVvTQCegk154cPUgKk2L7/Zd1PJCdVpkMAi9EBpFt42gSw4MfdmzICEZi2oqr6fYuAFvIKrE1ApwPqFpzn0xDZ/hP4Uwf46aZ5ELVaB8rjVWcbtgqunAl1+0DbCGAmqLzXlY1IRYA6pdjiqbakEbRKAL8TT08abmhMB6HiXp1tpa+MttSAXTGflpKmRaNdZyHAwdtSA6I60XL7hEWHmC8OkOUEjsWhcD4+ZuFO6jGun63l2Fe4ygddxOBLDdgJEKhoNdUBJiz8n0j6QiA2YVqDPQGuDMUH5Xh+uWQsc/EzyjvF4wsBqAGJvnHG1T2Wq1yhCE6ZU/VrHcdeWzFstqsWewTei7Hg3TeEBfWjk+5RsQAAAABJRU5ErkJggg==","relative_path":"C:/Users/Admin/Desktop/Экспо/hemp.png"}]} \ No newline at end of file +{"meta":{"format_version":"4.5","model_format":"java_block","box_uv":false},"name":"hemp_5","parent":"","ambientocclusion":true,"front_gui_light":false,"visible_box":[1,1,0],"variable_placeholders":"","variable_placeholder_buttons":[],"unhandled_root_fields":{},"resolution":{"width":32,"height":32},"elements":[{"name":"cube","box_uv":false,"rescale":false,"locked":false,"render_order":"default","allow_mirror_modeling":true,"from":[8,-1,0],"to":[8,31,16],"autouv":1,"color":1,"origin":[8,-1,8],"faces":{"north":{"uv":[0,0,0,32],"texture":null},"east":{"uv":[0,0,16,32],"texture":0},"south":{"uv":[0,0,0,32],"texture":null},"west":{"uv":[0,0,16,32],"texture":0},"up":{"uv":[0,0,0,16],"rotation":180,"texture":null},"down":{"uv":[0,0,0,16],"rotation":180,"texture":null}},"type":"cube","uuid":"4b464bef-e9ce-e00a-98c8-83a9e151708d"},{"name":"cube","box_uv":false,"rescale":false,"locked":false,"render_order":"default","allow_mirror_modeling":true,"from":[0,-1,8],"to":[16,31,8],"autouv":0,"color":1,"origin":[8,-1,8],"faces":{"north":{"uv":[0,0,16,32],"texture":0},"east":{"uv":[0,0,0,0],"texture":null},"south":{"uv":[0,0,16,32],"texture":0},"west":{"uv":[0,0,0,0],"texture":null},"up":{"uv":[0,0,0,0],"rotation":270,"texture":null},"down":{"uv":[0,0,0,0],"rotation":90,"texture":null}},"type":"cube","uuid":"46634245-73f5-23c3-9c87-99a336ac7f32"},{"name":"cube","box_uv":false,"rescale":false,"locked":false,"render_order":"default","allow_mirror_modeling":true,"from":[3.5,-2,8],"to":[12.5,10,8],"autouv":0,"color":6,"rotation":[45,0,0],"origin":[8,10,8],"faces":{"north":{"uv":[16,0,28,9],"rotation":90,"texture":0},"east":{"uv":[0,0,0,0],"rotation":90,"texture":null},"south":{"uv":[16,0,28,9],"rotation":90,"texture":0},"west":{"uv":[0,0,0,0],"rotation":270,"texture":null},"up":{"uv":[0,0,0,0],"texture":null},"down":{"uv":[0,0,0,0],"rotation":180,"texture":null}},"type":"cube","uuid":"49fe957a-6317-4ef0-e6d3-314c92976f07"},{"name":"cube","box_uv":false,"rescale":false,"locked":false,"render_order":"default","allow_mirror_modeling":true,"from":[3.5,10,8],"to":[12.5,10,20],"autouv":0,"color":6,"rotation":[45,0,0],"origin":[8,10,8],"faces":{"north":{"uv":[0,0,0,0],"texture":null},"east":{"uv":[0,0,0,0],"texture":null},"south":{"uv":[0,0,0,0],"texture":null},"west":{"uv":[0,0,0,0],"texture":null},"up":{"uv":[16,0,28,9],"rotation":90,"texture":0},"down":{"uv":[16,0,28,9],"rotation":270,"texture":0}},"type":"cube","uuid":"d75284ac-31e9-d4db-e399-959ce7348852"},{"name":"cube","box_uv":false,"rescale":false,"locked":false,"render_order":"default","allow_mirror_modeling":true,"from":[3.5,19,-4],"to":[12.5,19,8],"autouv":0,"color":6,"rotation":[-45,0,0],"origin":[8,19,8],"faces":{"north":{"uv":[0,0,0,0],"texture":null},"east":{"uv":[0,0,0,0],"texture":null},"south":{"uv":[0,0,0,0],"texture":null},"west":{"uv":[0,0,0,0],"texture":null},"up":{"uv":[16,0,28,9],"rotation":270,"texture":0},"down":{"uv":[16,0,28,9],"rotation":90,"texture":0}},"type":"cube","uuid":"33957b57-5fef-3654-fa15-2ccfdb819e7c"},{"name":"cube","box_uv":false,"rescale":false,"locked":false,"render_order":"default","allow_mirror_modeling":true,"from":[3.5,19,8],"to":[12.5,19,20],"autouv":0,"color":6,"rotation":[45,0,0],"origin":[8,19,8],"faces":{"north":{"uv":[0,0,0,0],"texture":null},"east":{"uv":[0,0,0,0],"texture":null},"south":{"uv":[0,0,0,0],"texture":null},"west":{"uv":[0,0,0,0],"texture":null},"up":{"uv":[16,0,28,9],"rotation":90,"texture":0},"down":{"uv":[16,0,28,9],"rotation":270,"texture":0}},"type":"cube","uuid":"5a4f37dc-baf1-49ca-4e6a-6940e21c7f20"},{"name":"cube","box_uv":false,"rescale":false,"locked":false,"render_order":"default","allow_mirror_modeling":true,"from":[8,17,3.5],"to":[20,17,12.5],"autouv":0,"color":6,"rotation":[0,0,-45],"origin":[8,17,8],"faces":{"north":{"uv":[0,0,0,0],"texture":null},"east":{"uv":[0,0,0,0],"texture":null},"south":{"uv":[0,0,0,0],"texture":null},"west":{"uv":[0,0,0,0],"texture":null},"up":{"uv":[16,0,28,9],"texture":0},"down":{"uv":[16,0,28,9],"texture":0}},"type":"cube","uuid":"32075fbb-7e82-2238-f5c1-2fe912422d05"},{"name":"cube","box_uv":false,"rescale":false,"locked":false,"render_order":"default","allow_mirror_modeling":true,"from":[8,8,3.5],"to":[20,8,12.5],"autouv":0,"color":6,"rotation":[0,0,-45],"origin":[8,7,8],"faces":{"north":{"uv":[0,0,0,0],"texture":null},"east":{"uv":[0,0,0,0],"texture":null},"south":{"uv":[0,0,0,0],"texture":null},"west":{"uv":[0,0,0,0],"texture":null},"up":{"uv":[16,0,28,9],"texture":0},"down":{"uv":[16,0,28,9],"texture":0}},"type":"cube","uuid":"efec5411-1900-f82a-c59e-2c3acb2d0f0c"},{"name":"cube","box_uv":false,"rescale":false,"locked":false,"render_order":"default","allow_mirror_modeling":true,"from":[-4,8,3.5],"to":[8,8,12.5],"autouv":0,"color":6,"rotation":[0,0,45],"origin":[8,7,8],"faces":{"north":{"uv":[0,0,0,0],"texture":null},"east":{"uv":[0,0,0,0],"texture":null},"south":{"uv":[0,0,0,0],"texture":null},"west":{"uv":[0,0,0,0],"texture":null},"up":{"uv":[28,0,16,9],"texture":0},"down":{"uv":[28,0,16,9],"texture":0}},"type":"cube","uuid":"2dacbb52-cb7e-76f9-27e3-a96e35168ab7"},{"name":"cube","box_uv":false,"rescale":false,"locked":false,"render_order":"default","allow_mirror_modeling":true,"from":[8,4,3.5],"to":[8,16,12.5],"autouv":0,"color":6,"rotation":[0,0,-45],"origin":[8,16,8],"faces":{"north":{"uv":[0,0,0,0],"rotation":90,"texture":null},"east":{"uv":[28,0,16,9],"rotation":270,"texture":0},"south":{"uv":[0,0,0,0],"rotation":270,"texture":null},"west":{"uv":[28,0,16,9],"rotation":270,"texture":0},"up":{"uv":[0,0,0,0],"rotation":270,"texture":null},"down":{"uv":[0,0,0,0],"rotation":270,"texture":null}},"type":"cube","uuid":"68878531-2c24-215d-ce83-1203e2adf5f7"}],"outliner":[{"name":"group","origin":[0,8,0],"color":0,"uuid":"36c56c7d-061d-eb17-82d1-852c81ecebd0","export":true,"mirror_uv":false,"isOpen":true,"locked":false,"visibility":true,"autouv":0,"children":["4b464bef-e9ce-e00a-98c8-83a9e151708d","46634245-73f5-23c3-9c87-99a336ac7f32","49fe957a-6317-4ef0-e6d3-314c92976f07","d75284ac-31e9-d4db-e399-959ce7348852","33957b57-5fef-3654-fa15-2ccfdb819e7c","5a4f37dc-baf1-49ca-4e6a-6940e21c7f20","32075fbb-7e82-2238-f5c1-2fe912422d05","efec5411-1900-f82a-c59e-2c3acb2d0f0c","2dacbb52-cb7e-76f9-27e3-a96e35168ab7","68878531-2c24-215d-ce83-1203e2adf5f7"]}],"textures":[{"path":"C:\\Users\\Admin\\Desktop\\Экспо\\hemp.png","name":"hemp.png","folder":"block","namespace":"nirvana","id":"texture","particle":true,"render_mode":"default","render_sides":"auto","frame_time":1,"frame_order_type":"loop","frame_order":"","frame_interpolate":false,"visible":true,"mode":"bitmap","saved":false,"uuid":"ffd510b8-6889-23b7-b970-1301bd98870a","source":"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAk9JREFUWEftVj1Iw0AUvji5CHarQ1GhUslkFwVFoYu6OUnn4iTiLnYWXJxEncSuRRcR8WepPygoSDupxYLWqu3Wgh2cGvkOXj1CcnepKS5mSTTpfX/v3j2D+Xyt7k5ZS7MnBu79vWEWH94wZBDSl165za2PWpMjUXZ6k2W4q8Cxvq8EoPqp8tkEJ0LPxQKDK06CfCMAMACQctGN7cVrV5xfEwDQQLCLIW9cUEvPdsVOTjgSsBdQ+nbBQq4yJYllkzsQiYa43fgbz4jEswOJpGl1BLu5ncf7GRYZCrF8rsR2Vu6ljsGNRrnWJEHugJjnGgCJ6ZkYr+hGpaYEBwipzmdLTRKqneQaARjDejgA5VAjs5KA6DtS76acvnckIFoH6xGHygXdxmN3xDVT2kZwAJcsf/oWjccrEWlRIYLU5gE7Sr0qvwO4SESVvTQCegk154cPUgKk2L7/Zd1PJCdVpkMAi9EBpFt42gSw4MfdmzICEZi2oqr6fYuAFvIKrE1ApwPqFpzn0xDZ/hP4Uwf46aZ5ELVaB8rjVWcbtgqunAl1+0DbCGAmqLzXlY1IRYA6pdjiqbakEbRKAL8TT08abmhMB6HiXp1tpa+MttSAXTGflpKmRaNdZyHAwdtSA6I60XL7hEWHmC8OkOUEjsWhcD4+ZuFO6jGun63l2Fe4ygddxOBLDdgJEKhoNdUBJiz8n0j6QiA2YVqDPQGuDMUH5Xh+uWQsc/EzyjvF4wsBqAGJvnHG1T2Wq1yhCE6ZU/VrHcdeWzFstqsWewTei7Hg3TeEBfWjk+5RsQAAAABJRU5ErkJggg==","relative_path":"C:/Users/Admin/Desktop/Экспо/hemp.png"}]} \ No newline at end of file diff --git a/common/src/main/resources/assets/blissful/models/block/hemp_5.json b/common/src/main/resources/assets/nirvana/models/block/hemp_5.json similarity index 97% rename from common/src/main/resources/assets/blissful/models/block/hemp_5.json rename to common/src/main/resources/assets/nirvana/models/block/hemp_5.json index 0d8708e..6556f8e 100644 --- a/common/src/main/resources/assets/blissful/models/block/hemp_5.json +++ b/common/src/main/resources/assets/nirvana/models/block/hemp_5.json @@ -3,8 +3,8 @@ "ambientocclusion": false, "texture_size": [32, 32], "textures": { - "particle": "blissful:block/hemp", - "texture": "blissful:block/hemp" + "particle": "nirvana:block/hemp", + "texture": "nirvana:block/hemp" }, "elements": [ { diff --git a/common/src/main/resources/assets/nirvana/models/item/joint_in_hand.bbmodel b/common/src/main/resources/assets/nirvana/models/item/joint_in_hand.bbmodel new file mode 100644 index 0000000..3a0ffa6 --- /dev/null +++ b/common/src/main/resources/assets/nirvana/models/item/joint_in_hand.bbmodel @@ -0,0 +1 @@ +{"meta":{"format_version":"4.5","model_format":"java_block","box_uv":true},"name":"joint_in_hand","parent":"","ambientocclusion":true,"front_gui_light":false,"visible_box":[1,1,0],"variable_placeholders":"","variable_placeholder_buttons":[],"unhandled_root_fields":{},"resolution":{"width":64,"height":64},"elements":[{"name":"cube","box_uv":false,"rescale":false,"locked":false,"render_order":"default","allow_mirror_modeling":true,"from":[7,6,4],"to":[9,8,12],"autouv":0,"color":5,"origin":[8,7,8],"faces":{"north":{"uv":[4,0,6,2],"rotation":180,"texture":0},"east":{"uv":[0,2,2,10],"rotation":270,"texture":0},"south":{"uv":[2,0,4,2],"rotation":180,"texture":0},"west":{"uv":[4,2,6,10],"rotation":90,"texture":0},"up":{"uv":[4,2,2,10],"rotation":180,"texture":0},"down":{"uv":[4,2,2,10],"texture":0}},"type":"cube","uuid":"3b627823-ebf5-1080-a94f-799a9d8426b7"}],"outliner":["3b627823-ebf5-1080-a94f-799a9d8426b7"],"textures":[{"path":"D:\\repos\\Minecraft\\Nirvana\\common\\src\\main\\resources\\assets\\nirvana\\textures\\item\\joint_in_hand.png","name":"joint_in_hand.png","folder":"item","namespace":"nirvana","id":"texture","particle":true,"render_mode":"default","render_sides":"auto","frame_time":1,"frame_order_type":"loop","frame_order":"","frame_interpolate":false,"visible":true,"mode":"bitmap","saved":true,"uuid":"e78fa5f9-a8fd-2f43-6a37-70833c41d6b2","relative_path":"../../../textures/item/joint_in_hand.png","source":"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAYAAACqaXHeAAAAAXNSR0IArs4c6QAAAaVJREFUeF7tlr0vQ2EchX93MfhoImnaCiI0hiYSlUgawu4PECOTpZPFyOAfYGExsRFmYpEgoSFR0x2kDIhWmkjqY7BcuW+R2M583tOleduznOc8b28D+3ltLExHyUSr7V9cuk92jsLg9zvm97+SMYChvpStHxxboqvFNrdu/ACwuzwbZTrb3chRsteC+oNVX9/dud74tOLaHjWIIAaQHsy5wiPZHruuPFrtNvQHwMlqMcoXxv5d83Lp3J1jE2ZWtrkNWFocjyYnmgZkB9JWuavZ6VnTgOrLB/1vQTA/NxxNFUZd4Y5us7cns8PSlTs3nr/onwaB9wZ4DyC+AplUm1M+35+z8n3o7r43V4D5Xx7SjfoRJwAAARkAQKKOyADqeYFyMgCARB2RAdTzAuVkAACJOiIDqOcFyskAABJ1RAZQzwuUkwEAJOqIDKCeFygnAwBI1BEZQD0vUE4GAJCoIzKAel6gnAwAIFFHZAD1vEA5GQBAoo7IAOp5gXIyAIBEHZEB1PMC5WQAAIk6IgOo5wXKyQAAEnVEBlDPC5STAQAk6oj3BnwDPk5yQYirNyUAAAAASUVORK5CYII="}]} \ No newline at end of file diff --git a/common/src/main/resources/assets/blissful/models/item/joint_in_hand.json b/common/src/main/resources/assets/nirvana/models/item/joint_in_hand.json similarity index 91% rename from common/src/main/resources/assets/blissful/models/item/joint_in_hand.json rename to common/src/main/resources/assets/nirvana/models/item/joint_in_hand.json index 59cc3de..e97d1d3 100644 --- a/common/src/main/resources/assets/blissful/models/item/joint_in_hand.json +++ b/common/src/main/resources/assets/nirvana/models/item/joint_in_hand.json @@ -2,8 +2,8 @@ "credit": "Made with Blockbench", "texture_size": [64, 64], "textures": { - "particle": "blissful:item/joint_in_hand", - "texture": "blissful:item/joint_in_hand" + "particle": "nirvana:item/joint_in_hand", + "texture": "nirvana:item/joint_in_hand" }, "elements": [ { diff --git a/common/src/main/resources/assets/blissful/textures/block/bliss_bloom_lower.png b/common/src/main/resources/assets/nirvana/textures/block/bliss_bloom_lower.png similarity index 100% rename from common/src/main/resources/assets/blissful/textures/block/bliss_bloom_lower.png rename to common/src/main/resources/assets/nirvana/textures/block/bliss_bloom_lower.png diff --git a/common/src/main/resources/assets/blissful/textures/block/bliss_bloom_upper.png b/common/src/main/resources/assets/nirvana/textures/block/bliss_bloom_upper.png similarity index 100% rename from common/src/main/resources/assets/blissful/textures/block/bliss_bloom_upper.png rename to common/src/main/resources/assets/nirvana/textures/block/bliss_bloom_upper.png diff --git a/common/src/main/resources/assets/blissful/textures/block/feral_hemp.png b/common/src/main/resources/assets/nirvana/textures/block/feral_hemp.png similarity index 100% rename from common/src/main/resources/assets/blissful/textures/block/feral_hemp.png rename to common/src/main/resources/assets/nirvana/textures/block/feral_hemp.png diff --git a/common/src/main/resources/assets/blissful/textures/block/hemp.png b/common/src/main/resources/assets/nirvana/textures/block/hemp.png similarity index 100% rename from common/src/main/resources/assets/blissful/textures/block/hemp.png rename to common/src/main/resources/assets/nirvana/textures/block/hemp.png diff --git a/common/src/main/resources/assets/blissful/textures/block/hemp_0.png b/common/src/main/resources/assets/nirvana/textures/block/hemp_0.png similarity index 100% rename from common/src/main/resources/assets/blissful/textures/block/hemp_0.png rename to common/src/main/resources/assets/nirvana/textures/block/hemp_0.png diff --git a/common/src/main/resources/assets/blissful/textures/block/hemp_1.png b/common/src/main/resources/assets/nirvana/textures/block/hemp_1.png similarity index 100% rename from common/src/main/resources/assets/blissful/textures/block/hemp_1.png rename to common/src/main/resources/assets/nirvana/textures/block/hemp_1.png diff --git a/common/src/main/resources/assets/blissful/textures/block/hemp_2.png b/common/src/main/resources/assets/nirvana/textures/block/hemp_2.png similarity index 100% rename from common/src/main/resources/assets/blissful/textures/block/hemp_2.png rename to common/src/main/resources/assets/nirvana/textures/block/hemp_2.png diff --git a/common/src/main/resources/assets/blissful/textures/block/hemp_crate_back.png b/common/src/main/resources/assets/nirvana/textures/block/hemp_crate_back.png similarity index 100% rename from common/src/main/resources/assets/blissful/textures/block/hemp_crate_back.png rename to common/src/main/resources/assets/nirvana/textures/block/hemp_crate_back.png diff --git a/common/src/main/resources/assets/blissful/textures/block/hemp_crate_bottom.png b/common/src/main/resources/assets/nirvana/textures/block/hemp_crate_bottom.png similarity index 100% rename from common/src/main/resources/assets/blissful/textures/block/hemp_crate_bottom.png rename to common/src/main/resources/assets/nirvana/textures/block/hemp_crate_bottom.png diff --git a/common/src/main/resources/assets/blissful/textures/block/hemp_crate_front.png b/common/src/main/resources/assets/nirvana/textures/block/hemp_crate_front.png similarity index 100% rename from common/src/main/resources/assets/blissful/textures/block/hemp_crate_front.png rename to common/src/main/resources/assets/nirvana/textures/block/hemp_crate_front.png diff --git a/common/src/main/resources/assets/blissful/textures/block/hemp_crate_side.png b/common/src/main/resources/assets/nirvana/textures/block/hemp_crate_side.png similarity index 100% rename from common/src/main/resources/assets/blissful/textures/block/hemp_crate_side.png rename to common/src/main/resources/assets/nirvana/textures/block/hemp_crate_side.png diff --git a/common/src/main/resources/assets/blissful/textures/block/hemp_crate_top.png b/common/src/main/resources/assets/nirvana/textures/block/hemp_crate_top.png similarity index 100% rename from common/src/main/resources/assets/blissful/textures/block/hemp_crate_top.png rename to common/src/main/resources/assets/nirvana/textures/block/hemp_crate_top.png diff --git a/common/src/main/resources/assets/blissful/textures/block/weed_crate_back.png b/common/src/main/resources/assets/nirvana/textures/block/weed_crate_back.png similarity index 100% rename from common/src/main/resources/assets/blissful/textures/block/weed_crate_back.png rename to common/src/main/resources/assets/nirvana/textures/block/weed_crate_back.png diff --git a/common/src/main/resources/assets/blissful/textures/block/weed_crate_bottom.png b/common/src/main/resources/assets/nirvana/textures/block/weed_crate_bottom.png similarity index 100% rename from common/src/main/resources/assets/blissful/textures/block/weed_crate_bottom.png rename to common/src/main/resources/assets/nirvana/textures/block/weed_crate_bottom.png diff --git a/common/src/main/resources/assets/blissful/textures/block/weed_crate_front.png b/common/src/main/resources/assets/nirvana/textures/block/weed_crate_front.png similarity index 100% rename from common/src/main/resources/assets/blissful/textures/block/weed_crate_front.png rename to common/src/main/resources/assets/nirvana/textures/block/weed_crate_front.png diff --git a/common/src/main/resources/assets/blissful/textures/block/weed_crate_side.png b/common/src/main/resources/assets/nirvana/textures/block/weed_crate_side.png similarity index 100% rename from common/src/main/resources/assets/blissful/textures/block/weed_crate_side.png rename to common/src/main/resources/assets/nirvana/textures/block/weed_crate_side.png diff --git a/common/src/main/resources/assets/blissful/textures/block/weed_crate_top.png b/common/src/main/resources/assets/nirvana/textures/block/weed_crate_top.png similarity index 100% rename from common/src/main/resources/assets/blissful/textures/block/weed_crate_top.png rename to common/src/main/resources/assets/nirvana/textures/block/weed_crate_top.png diff --git a/common/src/main/resources/assets/blissful/textures/item/bong.png b/common/src/main/resources/assets/nirvana/textures/item/bong.png similarity index 100% rename from common/src/main/resources/assets/blissful/textures/item/bong.png rename to common/src/main/resources/assets/nirvana/textures/item/bong.png diff --git a/common/src/main/resources/assets/blissful/textures/item/bong_potion.png b/common/src/main/resources/assets/nirvana/textures/item/bong_potion.png similarity index 100% rename from common/src/main/resources/assets/blissful/textures/item/bong_potion.png rename to common/src/main/resources/assets/nirvana/textures/item/bong_potion.png diff --git a/common/src/main/resources/assets/blissful/textures/item/bong_potion_overlay.png b/common/src/main/resources/assets/nirvana/textures/item/bong_potion_overlay.png similarity index 100% rename from common/src/main/resources/assets/blissful/textures/item/bong_potion_overlay.png rename to common/src/main/resources/assets/nirvana/textures/item/bong_potion_overlay.png diff --git a/common/src/main/resources/assets/blissful/textures/item/feral_hemp.png b/common/src/main/resources/assets/nirvana/textures/item/feral_hemp.png similarity index 100% rename from common/src/main/resources/assets/blissful/textures/item/feral_hemp.png rename to common/src/main/resources/assets/nirvana/textures/item/feral_hemp.png diff --git a/common/src/main/resources/assets/blissful/textures/item/hemp.png b/common/src/main/resources/assets/nirvana/textures/item/hemp.png similarity index 100% rename from common/src/main/resources/assets/blissful/textures/item/hemp.png rename to common/src/main/resources/assets/nirvana/textures/item/hemp.png diff --git a/common/src/main/resources/assets/blissful/textures/item/hemp_seeds.png b/common/src/main/resources/assets/nirvana/textures/item/hemp_seeds.png similarity index 100% rename from common/src/main/resources/assets/blissful/textures/item/hemp_seeds.png rename to common/src/main/resources/assets/nirvana/textures/item/hemp_seeds.png diff --git a/common/src/main/resources/assets/blissful/textures/item/herbal_salve.png b/common/src/main/resources/assets/nirvana/textures/item/herbal_salve.png similarity index 100% rename from common/src/main/resources/assets/blissful/textures/item/herbal_salve.png rename to common/src/main/resources/assets/nirvana/textures/item/herbal_salve.png diff --git a/common/src/main/resources/assets/blissful/textures/item/joint.png b/common/src/main/resources/assets/nirvana/textures/item/joint.png similarity index 100% rename from common/src/main/resources/assets/blissful/textures/item/joint.png rename to common/src/main/resources/assets/nirvana/textures/item/joint.png diff --git a/common/src/main/resources/assets/blissful/textures/item/joint_in_hand.png b/common/src/main/resources/assets/nirvana/textures/item/joint_in_hand.png similarity index 100% rename from common/src/main/resources/assets/blissful/textures/item/joint_in_hand.png rename to common/src/main/resources/assets/nirvana/textures/item/joint_in_hand.png diff --git a/common/src/main/resources/assets/blissful/textures/item/weed.png b/common/src/main/resources/assets/nirvana/textures/item/weed.png similarity index 100% rename from common/src/main/resources/assets/blissful/textures/item/weed.png rename to common/src/main/resources/assets/nirvana/textures/item/weed.png diff --git a/common/src/main/resources/assets/blissful/textures/item/weed_brownies.png b/common/src/main/resources/assets/nirvana/textures/item/weed_brownies.png similarity index 100% rename from common/src/main/resources/assets/blissful/textures/item/weed_brownies.png rename to common/src/main/resources/assets/nirvana/textures/item/weed_brownies.png diff --git a/common/src/main/resources/assets/blissful/textures/mob_effect/peace.png b/common/src/main/resources/assets/nirvana/textures/mob_effect/peace.png similarity index 100% rename from common/src/main/resources/assets/blissful/textures/mob_effect/peace.png rename to common/src/main/resources/assets/nirvana/textures/mob_effect/peace.png diff --git a/common/src/main/resources/data/blissful/recipes/herbal_salve.json b/common/src/main/resources/data/blissful/recipes/herbal_salve.json deleted file mode 100644 index 0035fe6..0000000 --- a/common/src/main/resources/data/blissful/recipes/herbal_salve.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "type": "blissful:herbal_salve_crafting", - "category": "misc" -} \ No newline at end of file diff --git a/common/src/main/resources/data/blissful/recipes/jeed/peace_providers.json b/common/src/main/resources/data/blissful/recipes/jeed/peace_providers.json deleted file mode 100644 index 39b9f3f..0000000 --- a/common/src/main/resources/data/blissful/recipes/jeed/peace_providers.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "type": "jeed:effect_provider", - "effect": { - "id": "blissful:peace" - }, - "providers": [ - { - "item": "blissful:weed" - }, - { - "item": "blissful:joint" - }, - { - "item": "blissful:bong" - } - ] -} \ No newline at end of file diff --git a/common/src/main/resources/data/create/tags/items/upright_on_belt.json b/common/src/main/resources/data/create/tags/items/upright_on_belt.json index d15a57b..a772172 100644 --- a/common/src/main/resources/data/create/tags/items/upright_on_belt.json +++ b/common/src/main/resources/data/create/tags/items/upright_on_belt.json @@ -1,7 +1,7 @@ { "replace": false, "values": [ - "blissful:bong", - "blissful:potion_bong" + "nirvana:bong", + "nirvana:potion_bong" ] } \ No newline at end of file diff --git a/common/src/main/resources/data/nirvana/recipes/herbal_salve.json b/common/src/main/resources/data/nirvana/recipes/herbal_salve.json new file mode 100644 index 0000000..761a864 --- /dev/null +++ b/common/src/main/resources/data/nirvana/recipes/herbal_salve.json @@ -0,0 +1,4 @@ +{ + "type": "nirvana:herbal_salve_crafting", + "category": "misc" +} \ No newline at end of file diff --git a/common/src/main/resources/data/blissful/recipes/jeed/effect_providers.json b/common/src/main/resources/data/nirvana/recipes/jeed/effect_providers.json similarity index 52% rename from common/src/main/resources/data/blissful/recipes/jeed/effect_providers.json rename to common/src/main/resources/data/nirvana/recipes/jeed/effect_providers.json index 2c2c544..e97249e 100644 --- a/common/src/main/resources/data/blissful/recipes/jeed/effect_providers.json +++ b/common/src/main/resources/data/nirvana/recipes/jeed/effect_providers.json @@ -2,10 +2,10 @@ "type": "jeed:potion_provider", "providers": [ { - "item": "blissful:potion_bong" + "item": "nirvana:potion_bong" }, { - "item": "blissful:herbal_salve" + "item": "nirvana:herbal_salve" } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/nirvana/recipes/jeed/peace_providers.json b/common/src/main/resources/data/nirvana/recipes/jeed/peace_providers.json new file mode 100644 index 0000000..835d11a --- /dev/null +++ b/common/src/main/resources/data/nirvana/recipes/jeed/peace_providers.json @@ -0,0 +1,17 @@ +{ + "type": "jeed:effect_provider", + "effect": { + "id": "nirvana:peace" + }, + "providers": [ + { + "item": "nirvana:weed" + }, + { + "item": "nirvana:joint" + }, + { + "item": "nirvana:bong" + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/blissful/tags/items/shears.json b/common/src/main/resources/data/nirvana/tags/items/shears.json similarity index 100% rename from common/src/main/resources/data/blissful/tags/items/shears.json rename to common/src/main/resources/data/nirvana/tags/items/shears.json diff --git a/common/src/main/resources/data/blissful/tags/mob_effect/stacking.json b/common/src/main/resources/data/nirvana/tags/mob_effect/stacking.json similarity index 66% rename from common/src/main/resources/data/blissful/tags/mob_effect/stacking.json rename to common/src/main/resources/data/nirvana/tags/mob_effect/stacking.json index b3862e0..5952cda 100644 --- a/common/src/main/resources/data/blissful/tags/mob_effect/stacking.json +++ b/common/src/main/resources/data/nirvana/tags/mob_effect/stacking.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "blissful:peace" + "nirvana:peace" ] } \ No newline at end of file diff --git a/common/src/main/resources/data/blissful/tags/worldgen/biome/has_feature/feral_hemp.json b/common/src/main/resources/data/nirvana/tags/worldgen/biome/has_feature/feral_hemp.json similarity index 100% rename from common/src/main/resources/data/blissful/tags/worldgen/biome/has_feature/feral_hemp.json rename to common/src/main/resources/data/nirvana/tags/worldgen/biome/has_feature/feral_hemp.json diff --git a/common/src/main/resources/data/blissful/worldgen/configured_feature/patch_feral_hemp.json b/common/src/main/resources/data/nirvana/worldgen/configured_feature/patch_feral_hemp.json similarity index 93% rename from common/src/main/resources/data/blissful/worldgen/configured_feature/patch_feral_hemp.json rename to common/src/main/resources/data/nirvana/worldgen/configured_feature/patch_feral_hemp.json index 3cee6b7..7193b50 100644 --- a/common/src/main/resources/data/blissful/worldgen/configured_feature/patch_feral_hemp.json +++ b/common/src/main/resources/data/nirvana/worldgen/configured_feature/patch_feral_hemp.json @@ -8,7 +8,7 @@ "to_place": { "type": "minecraft:simple_state_provider", "state": { - "Name": "blissful:feral_hemp" + "Name": "nirvana:feral_hemp" } } } diff --git a/common/src/main/resources/data/blissful/worldgen/placed_feature/patch_feral_hemp.json b/common/src/main/resources/data/nirvana/worldgen/placed_feature/patch_feral_hemp.json similarity index 86% rename from common/src/main/resources/data/blissful/worldgen/placed_feature/patch_feral_hemp.json rename to common/src/main/resources/data/nirvana/worldgen/placed_feature/patch_feral_hemp.json index a2c5d26..63ed6cb 100644 --- a/common/src/main/resources/data/blissful/worldgen/placed_feature/patch_feral_hemp.json +++ b/common/src/main/resources/data/nirvana/worldgen/placed_feature/patch_feral_hemp.json @@ -1,5 +1,5 @@ { - "feature": "blissful:patch_feral_hemp", + "feature": "nirvana:patch_feral_hemp", "placement": [ { "type": "minecraft:rarity_filter", diff --git a/common/src/main/resources/blissful.mixins.json b/common/src/main/resources/nirvana.mixins.json similarity index 68% rename from common/src/main/resources/blissful.mixins.json rename to common/src/main/resources/nirvana.mixins.json index 68e8dcd..7fc5ac9 100644 --- a/common/src/main/resources/blissful.mixins.json +++ b/common/src/main/resources/nirvana.mixins.json @@ -1,10 +1,12 @@ { "required": true, "minVersion": "0.8", - "package": "galena.blissful.mixins", + "package": "galena.nirvana.mixins", "compatibilityLevel": "JAVA_17", "refmap": "${mod_id}.refmap.json", - "mixins": ["EntityMixin", "LivingEntityMixin", "MobMixin"], + "mixins": [ + "EntityMixin", "LivingEntityMixin", "MobMixin" + ], "client": ["ItemInHandRendererMixin", "PlayerItemInHandLayerMixin"], "injectors": { "defaultRequire": 1 diff --git a/fabric/src/main/java/galena/blissful/fabric/compat/BlissfulJeiFabricPlugin.java b/fabric/src/main/java/galena/blissful/fabric/compat/BlissfulJeiFabricPlugin.java deleted file mode 100644 index a2acf63..0000000 --- a/fabric/src/main/java/galena/blissful/fabric/compat/BlissfulJeiFabricPlugin.java +++ /dev/null @@ -1,29 +0,0 @@ -package galena.blissful.fabric.compat; - -import galena.blissful.compat.BlissfulJeiCompat; -import galena.blissful.index.BlissfulItems; -import galena.blissful.index.BlissfulRecipeTypes; -import mezz.jei.api.IModPlugin; -import mezz.jei.api.constants.RecipeTypes; -import mezz.jei.api.registration.IRecipeRegistration; -import mezz.jei.api.registration.ISubtypeRegistration; -import net.minecraft.resources.ResourceLocation; - -public class BlissfulJeiFabricPlugin implements IModPlugin { - - @Override - public void registerRecipes(IRecipeRegistration registration) { - registration.addRecipes(RecipeTypes.CRAFTING, BlissfulRecipeTypes.createSalveRecipes()); - } - - @Override - public ResourceLocation getPluginUid() { - return BlissfulJeiCompat.ID; - } - - @Override - public void registerItemSubtypes(ISubtypeRegistration registration) { - registration.registerSubtypeInterpreter(BlissfulItems.POTION_BONG.get(), BlissfulJeiCompat::interpretPotion); - } - -} diff --git a/fabric/src/main/java/galena/blissful/fabric/datagen/FabricDataGenerators.java b/fabric/src/main/java/galena/blissful/fabric/datagen/FabricDataGenerators.java deleted file mode 100644 index 2982715..0000000 --- a/fabric/src/main/java/galena/blissful/fabric/datagen/FabricDataGenerators.java +++ /dev/null @@ -1,46 +0,0 @@ -package galena.blissful.fabric.datagen; - -import com.tterrag.registrate.providers.RegistrateLangProvider; -import galena.blissful.BlissfulCommon; -import galena.blissful.index.BlissfulItems; -import galena.blissful.index.BlissfulEffects; -import io.github.fabricators_of_create.porting_lib.data.ExistingFileHelper; -import net.fabricmc.fabric.api.datagen.v1.DataGeneratorEntrypoint; -import net.fabricmc.fabric.api.datagen.v1.FabricDataGenerator; -import net.minecraft.core.registries.BuiltInRegistries; -import net.minecraft.world.item.alchemy.PotionUtils; - -import static galena.blissful.fabric.FabricEntrypoint.REGISTRATE; - -public class FabricDataGenerators implements DataGeneratorEntrypoint { - - @Override - public void onInitializeDataGenerator(FabricDataGenerator generator) { - BlissfulCommon.init(); - addDefaultTranslations(); - - var fileHelper = ExistingFileHelper.withResourcesFromArg(); - var pack = generator.createPack(); - REGISTRATE.setupDatagen(pack, fileHelper); - pack.addProvider(AdditionalBlissfulRecipes::new); - } - - private void addDefaultTranslations() { - var peaceId = BlissfulEffects.PEACE.getId(); - REGISTRATE.addLang("effect", peaceId, "Peace"); - REGISTRATE.addLang("effect", peaceId, "description", "A blissful aura befogs your brain"); - - REGISTRATE.addLang("item", BlissfulItems.POTION_BONG.getId(), "effect.empty", "Effect Bong"); - - BuiltInRegistries.POTION.forEach(potion -> { - var id = potion.getName(""); - var stack = PotionUtils.setPotion(BlissfulItems.POTION_BONG.asStack(), potion); - if (potion.getEffects().isEmpty()) { - REGISTRATE.addRawLang(stack.getDescriptionId(), RegistrateLangProvider.toEnglishName(id) + " Bong"); - } else { - REGISTRATE.addRawLang(stack.getDescriptionId(), "Bong of " + RegistrateLangProvider.toEnglishName(id)); - } - }); - } - -} diff --git a/fabric/src/main/java/galena/blissful/fabric/FabricEntrypoint.java b/fabric/src/main/java/galena/nirvana/fabric/FabricEntrypoint.java similarity index 69% rename from fabric/src/main/java/galena/blissful/fabric/FabricEntrypoint.java rename to fabric/src/main/java/galena/nirvana/fabric/FabricEntrypoint.java index 20d5972..cd51e1a 100644 --- a/fabric/src/main/java/galena/blissful/fabric/FabricEntrypoint.java +++ b/fabric/src/main/java/galena/nirvana/fabric/FabricEntrypoint.java @@ -1,10 +1,10 @@ -package galena.blissful.fabric; +package galena.nirvana.fabric; import com.tterrag.registrate.Registrate; -import galena.blissful.BlissfulCommon; -import galena.blissful.BlissfulConstants; -import galena.blissful.index.BlissfulBlocks; -import galena.blissful.index.BlissfulTags; +import galena.nirvana.NirvanaCommon; +import galena.nirvana.NirvanaConstants; +import galena.nirvana.index.NirvanaBlocks; +import galena.nirvana.index.NirvanaTags; import net.fabricmc.api.ModInitializer; import net.fabricmc.fabric.api.biome.v1.BiomeModifications; import net.fabricmc.fabric.api.biome.v1.BiomeSelectors; @@ -19,24 +19,24 @@ public class FabricEntrypoint implements ModInitializer { - public static final Registrate REGISTRATE = Registrate.create(BlissfulConstants.MOD_ID); + public static final Registrate REGISTRATE = Registrate.create(NirvanaConstants.MOD_ID); - private static final ResourceKey FERAL_HEMP_FEATURE = ResourceKey.create(Registries.PLACED_FEATURE, new ResourceLocation(BlissfulConstants.MOD_ID, "patch_feral_hemp")); + private static final ResourceKey FERAL_HEMP_FEATURE = ResourceKey.create(Registries.PLACED_FEATURE, new ResourceLocation(NirvanaConstants.MOD_ID, "patch_feral_hemp")); @Override public void onInitialize() { - BlissfulCommon.init(); + NirvanaCommon.init(); REGISTRATE.register(); LootTableEvents.MODIFY.register((resources, manager, id, table, source) -> { if (source.isBuiltin() && BuiltInLootTables.SNIFFER_DIGGING.equals(id)) { table.modifyPools(it -> { - it.add(LootItem.lootTableItem(BlissfulBlocks.BLISS_BLOOM)); + it.add(LootItem.lootTableItem(NirvanaBlocks.BLISS_BLOOM)); }); } }); - BiomeModifications.addFeature(BiomeSelectors.tag(BlissfulTags.GENERATES_FERAL_HEMP), GenerationStep.Decoration.VEGETAL_DECORATION, FERAL_HEMP_FEATURE); + BiomeModifications.addFeature(BiomeSelectors.tag(NirvanaTags.GENERATES_FERAL_HEMP), GenerationStep.Decoration.VEGETAL_DECORATION, FERAL_HEMP_FEATURE); } } diff --git a/fabric/src/main/java/galena/blissful/fabric/client/FabricClientEntrypoint.java b/fabric/src/main/java/galena/nirvana/fabric/client/FabricClientEntrypoint.java similarity index 66% rename from fabric/src/main/java/galena/blissful/fabric/client/FabricClientEntrypoint.java rename to fabric/src/main/java/galena/nirvana/fabric/client/FabricClientEntrypoint.java index ce18be1..47b46d0 100644 --- a/fabric/src/main/java/galena/blissful/fabric/client/FabricClientEntrypoint.java +++ b/fabric/src/main/java/galena/nirvana/fabric/client/FabricClientEntrypoint.java @@ -1,7 +1,7 @@ -package galena.blissful.fabric.client; +package galena.nirvana.fabric.client; -import galena.blissful.client.JointModels; -import galena.blissful.index.BlissfulItems; +import galena.nirvana.client.JointModels; +import galena.nirvana.index.NirvanaItems; import net.fabricmc.api.ClientModInitializer; import net.fabricmc.fabric.api.client.model.loading.v1.ModelLoadingPlugin; import net.fabricmc.fabric.api.client.rendering.v1.BuiltinItemRendererRegistry; @@ -10,7 +10,7 @@ public class FabricClientEntrypoint implements ClientModInitializer { @Override public void onInitializeClient() { - BuiltinItemRendererRegistry.INSTANCE.register(BlissfulItems.JOINT.get(), new JointRenderer()); + BuiltinItemRendererRegistry.INSTANCE.register(NirvanaItems.JOINT.get(), new JointRenderer()); ModelLoadingPlugin.register(context -> context.addModels(JointModels.FLAT_MODEL, JointModels.HAND_MODEL)); } diff --git a/fabric/src/main/java/galena/blissful/fabric/client/JointRenderer.java b/fabric/src/main/java/galena/nirvana/fabric/client/JointRenderer.java similarity index 90% rename from fabric/src/main/java/galena/blissful/fabric/client/JointRenderer.java rename to fabric/src/main/java/galena/nirvana/fabric/client/JointRenderer.java index 7edc7fe..60154a3 100644 --- a/fabric/src/main/java/galena/blissful/fabric/client/JointRenderer.java +++ b/fabric/src/main/java/galena/nirvana/fabric/client/JointRenderer.java @@ -1,7 +1,7 @@ -package galena.blissful.fabric.client; +package galena.nirvana.fabric.client; import com.mojang.blaze3d.vertex.PoseStack; -import galena.blissful.client.JointModels; +import galena.nirvana.client.JointModels; import net.fabricmc.fabric.api.client.rendering.v1.BuiltinItemRendererRegistry; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.world.item.ItemDisplayContext; diff --git a/fabric/src/main/java/galena/nirvana/fabric/compat/NirvanaJeiFabricPlugin.java b/fabric/src/main/java/galena/nirvana/fabric/compat/NirvanaJeiFabricPlugin.java new file mode 100644 index 0000000..dceb65d --- /dev/null +++ b/fabric/src/main/java/galena/nirvana/fabric/compat/NirvanaJeiFabricPlugin.java @@ -0,0 +1,29 @@ +package galena.nirvana.fabric.compat; + +import galena.nirvana.compat.NirvanaJeiCompat; +import galena.nirvana.index.NirvanaItems; +import galena.nirvana.index.NirvanaRecipeTypes; +import mezz.jei.api.IModPlugin; +import mezz.jei.api.constants.RecipeTypes; +import mezz.jei.api.registration.IRecipeRegistration; +import mezz.jei.api.registration.ISubtypeRegistration; +import net.minecraft.resources.ResourceLocation; + +public class NirvanaJeiFabricPlugin implements IModPlugin { + + @Override + public void registerRecipes(IRecipeRegistration registration) { + registration.addRecipes(RecipeTypes.CRAFTING, NirvanaRecipeTypes.createSalveRecipes()); + } + + @Override + public ResourceLocation getPluginUid() { + return NirvanaJeiCompat.ID; + } + + @Override + public void registerItemSubtypes(ISubtypeRegistration registration) { + registration.registerSubtypeInterpreter(NirvanaItems.POTION_BONG.get(), NirvanaJeiCompat::interpretPotion); + } + +} diff --git a/fabric/src/main/java/galena/blissful/fabric/datagen/AdditionalBlissfulRecipes.java b/fabric/src/main/java/galena/nirvana/fabric/datagen/AdditionalNirvanaRecipes.java similarity index 55% rename from fabric/src/main/java/galena/blissful/fabric/datagen/AdditionalBlissfulRecipes.java rename to fabric/src/main/java/galena/nirvana/fabric/datagen/AdditionalNirvanaRecipes.java index 754a681..b663f39 100644 --- a/fabric/src/main/java/galena/blissful/fabric/datagen/AdditionalBlissfulRecipes.java +++ b/fabric/src/main/java/galena/nirvana/fabric/datagen/AdditionalNirvanaRecipes.java @@ -1,7 +1,7 @@ -package galena.blissful.fabric.datagen; +package galena.nirvana.fabric.datagen; -import galena.blissful.BlissfulConstants; -import galena.blissful.index.BlissfulItems; +import galena.nirvana.NirvanaConstants; +import galena.nirvana.index.NirvanaItems; import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput; import net.fabricmc.fabric.api.datagen.v1.provider.FabricRecipeProvider; import net.minecraft.data.recipes.FinishedRecipe; @@ -12,9 +12,9 @@ import java.util.function.Consumer; -public class AdditionalBlissfulRecipes extends FabricRecipeProvider { +public class AdditionalNirvanaRecipes extends FabricRecipeProvider { - public AdditionalBlissfulRecipes(FabricDataOutput output) { + public AdditionalNirvanaRecipes(FabricDataOutput output) { super(output); } @@ -25,16 +25,16 @@ public void buildRecipes(Consumer exporter) { .pattern("hs ") .pattern(" s") .define('s', Items.STRING) - .define('h', BlissfulItems.HEMP.get()) - .unlockedBy("has_hemp", has(BlissfulItems.HEMP)) - .save(exporter, new ResourceLocation(BlissfulConstants.MOD_ID, "lead_from_hemp")); + .define('h', NirvanaItems.HEMP.get()) + .unlockedBy("has_hemp", has(NirvanaItems.HEMP)) + .save(exporter, new ResourceLocation(NirvanaConstants.MOD_ID, "lead_from_hemp")); ShapedRecipeBuilder.shaped(RecipeCategory.TOOLS, Items.LEATHER) .pattern("hh") .pattern("hh") - .define('h', BlissfulItems.HEMP.get()) - .unlockedBy("has_hemp", has(BlissfulItems.HEMP)) - .save(exporter, new ResourceLocation(BlissfulConstants.MOD_ID, "leather_from_hemp")); + .define('h', NirvanaItems.HEMP.get()) + .unlockedBy("has_hemp", has(NirvanaItems.HEMP)) + .save(exporter, new ResourceLocation(NirvanaConstants.MOD_ID, "leather_from_hemp")); } } diff --git a/fabric/src/main/java/galena/nirvana/fabric/datagen/FabricDataGenerators.java b/fabric/src/main/java/galena/nirvana/fabric/datagen/FabricDataGenerators.java new file mode 100644 index 0000000..4424f38 --- /dev/null +++ b/fabric/src/main/java/galena/nirvana/fabric/datagen/FabricDataGenerators.java @@ -0,0 +1,45 @@ +package galena.nirvana.fabric.datagen; + +import com.tterrag.registrate.providers.RegistrateLangProvider; +import galena.nirvana.NirvanaCommon; +import galena.nirvana.index.NirvanaItems; +import galena.nirvana.index.NirvanaEffects; +import galena.nirvana.fabric.FabricEntrypoint; +import io.github.fabricators_of_create.porting_lib.data.ExistingFileHelper; +import net.fabricmc.fabric.api.datagen.v1.DataGeneratorEntrypoint; +import net.fabricmc.fabric.api.datagen.v1.FabricDataGenerator; +import net.minecraft.core.registries.BuiltInRegistries; +import net.minecraft.world.item.alchemy.PotionUtils; + +public class FabricDataGenerators implements DataGeneratorEntrypoint { + + @Override + public void onInitializeDataGenerator(FabricDataGenerator generator) { + NirvanaCommon.init(); + addDefaultTranslations(); + + var fileHelper = ExistingFileHelper.withResourcesFromArg(); + var pack = generator.createPack(); + FabricEntrypoint.REGISTRATE.setupDatagen(pack, fileHelper); + pack.addProvider(AdditionalNirvanaRecipes::new); + } + + private void addDefaultTranslations() { + var peaceId = NirvanaEffects.PEACE.getId(); + FabricEntrypoint.REGISTRATE.addLang("effect", peaceId, "Peace"); + FabricEntrypoint.REGISTRATE.addLang("effect", peaceId, "description", "A blissful aura befogs your brain"); + + FabricEntrypoint.REGISTRATE.addLang("item", NirvanaItems.POTION_BONG.getId(), "effect.empty", "Effect Bong"); + + BuiltInRegistries.POTION.forEach(potion -> { + var id = potion.getName(""); + var stack = PotionUtils.setPotion(NirvanaItems.POTION_BONG.asStack(), potion); + if (potion.getEffects().isEmpty()) { + FabricEntrypoint.REGISTRATE.addRawLang(stack.getDescriptionId(), RegistrateLangProvider.toEnglishName(id) + " Bong"); + } else { + FabricEntrypoint.REGISTRATE.addRawLang(stack.getDescriptionId(), "Bong of " + RegistrateLangProvider.toEnglishName(id)); + } + }); + } + +} diff --git a/fabric/src/main/java/galena/blissful/fabric/mixins/PotionBrewingMixin.java b/fabric/src/main/java/galena/nirvana/fabric/mixins/PotionBrewingMixin.java similarity index 93% rename from fabric/src/main/java/galena/blissful/fabric/mixins/PotionBrewingMixin.java rename to fabric/src/main/java/galena/nirvana/fabric/mixins/PotionBrewingMixin.java index b21fcab..71bbde5 100644 --- a/fabric/src/main/java/galena/blissful/fabric/mixins/PotionBrewingMixin.java +++ b/fabric/src/main/java/galena/nirvana/fabric/mixins/PotionBrewingMixin.java @@ -1,6 +1,6 @@ -package galena.blissful.fabric.mixins; +package galena.nirvana.fabric.mixins; -import galena.blissful.fabric.services.FabricBrewingRegistry; +import galena.nirvana.fabric.services.FabricBrewingRegistry; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.alchemy.PotionBrewing; import org.spongepowered.asm.mixin.Mixin; diff --git a/fabric/src/main/java/galena/blissful/fabric/mixins/PotionSlotMixin.java b/fabric/src/main/java/galena/nirvana/fabric/mixins/PotionSlotMixin.java similarity index 87% rename from fabric/src/main/java/galena/blissful/fabric/mixins/PotionSlotMixin.java rename to fabric/src/main/java/galena/nirvana/fabric/mixins/PotionSlotMixin.java index 1bbf4d0..9c8546d 100644 --- a/fabric/src/main/java/galena/blissful/fabric/mixins/PotionSlotMixin.java +++ b/fabric/src/main/java/galena/nirvana/fabric/mixins/PotionSlotMixin.java @@ -1,6 +1,6 @@ -package galena.blissful.fabric.mixins; +package galena.nirvana.fabric.mixins; -import galena.blissful.fabric.services.FabricBrewingRegistry; +import galena.nirvana.fabric.services.FabricBrewingRegistry; import net.minecraft.world.inventory.BrewingStandMenu; import net.minecraft.world.item.ItemStack; import org.spongepowered.asm.mixin.Mixin; diff --git a/fabric/src/main/java/galena/blissful/fabric/services/FabricBrewingRegistry.java b/fabric/src/main/java/galena/nirvana/fabric/services/FabricBrewingRegistry.java similarity index 93% rename from fabric/src/main/java/galena/blissful/fabric/services/FabricBrewingRegistry.java rename to fabric/src/main/java/galena/nirvana/fabric/services/FabricBrewingRegistry.java index 663411d..596aea9 100644 --- a/fabric/src/main/java/galena/blissful/fabric/services/FabricBrewingRegistry.java +++ b/fabric/src/main/java/galena/nirvana/fabric/services/FabricBrewingRegistry.java @@ -1,6 +1,6 @@ -package galena.blissful.fabric.services; +package galena.nirvana.fabric.services; -import galena.blissful.platform.services.IBrewingRegistry; +import galena.nirvana.platform.services.IBrewingRegistry; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.alchemy.PotionBrewing; import net.minecraft.world.item.crafting.Ingredient; diff --git a/fabric/src/main/java/galena/blissful/fabric/services/FabricDataGenHelper.java b/fabric/src/main/java/galena/nirvana/fabric/services/FabricDataGenHelper.java similarity index 93% rename from fabric/src/main/java/galena/blissful/fabric/services/FabricDataGenHelper.java rename to fabric/src/main/java/galena/nirvana/fabric/services/FabricDataGenHelper.java index dfdc01a..32836dd 100644 --- a/fabric/src/main/java/galena/blissful/fabric/services/FabricDataGenHelper.java +++ b/fabric/src/main/java/galena/nirvana/fabric/services/FabricDataGenHelper.java @@ -1,14 +1,14 @@ -package galena.blissful.fabric.services; +package galena.nirvana.fabric.services; import com.tterrag.registrate.providers.DataGenContext; import com.tterrag.registrate.providers.RegistrateBlockstateProvider; import com.tterrag.registrate.providers.RegistrateItemModelProvider; import com.tterrag.registrate.providers.loot.RegistrateBlockLootTables; -import galena.blissful.BlissfulConstants; -import galena.blissful.index.BlissfulItems; -import galena.blissful.index.BlissfulTags; -import galena.blissful.platform.services.IDataGenHelper; -import galena.blissful.world.block.HempCropBlock; +import galena.nirvana.NirvanaConstants; +import galena.nirvana.index.NirvanaItems; +import galena.nirvana.index.NirvanaTags; +import galena.nirvana.platform.services.IDataGenHelper; +import galena.nirvana.world.block.HempCropBlock; import io.github.fabricators_of_create.porting_lib.models.generators.ConfiguredModel; import io.github.fabricators_of_create.porting_lib.models.generators.ModelFile; import net.minecraft.advancements.critereon.ItemPredicate; @@ -66,7 +66,7 @@ public void hempCrop(DataGenContext context, Registr var name = withSuffix(base, "_" + age); var model = age < 3 - ? provider.models().singleTexture(name.getPath(), new ResourceLocation(BlissfulConstants.MOD_ID, "block/crop_cross"), "cross", name) + ? provider.models().singleTexture(name.getPath(), new ResourceLocation(NirvanaConstants.MOD_ID, "block/crop_cross"), "cross", name) : provider.models().getExistingFile(name); return ConfiguredModel.builder() @@ -80,21 +80,21 @@ public void hempCrop(RegistrateBlockLootTables provider, CropBlock block) { provider.add(block, provider.applyExplosionDecay(block, LootTable.lootTable().withPool(LootPool.lootPool() .add(AlternativesEntry.alternatives( - LootItem.lootTableItem(BlissfulItems.HEMP) + LootItem.lootTableItem(NirvanaItems.HEMP) .when(maxAge(block)) .apply(ApplyBonusCount.addBonusBinomialDistributionCount(Enchantments.BLOCK_FORTUNE, 0.57F, 2)), - LootItem.lootTableItem(BlissfulItems.HEMP) + LootItem.lootTableItem(NirvanaItems.HEMP) .when(growthMissing(block, -1)) .apply(ApplyBonusCount.addBonusBinomialDistributionCount(Enchantments.BLOCK_FORTUNE, 0.62F, 1)), - LootItem.lootTableItem(BlissfulItems.HEMP_SEEDS) + LootItem.lootTableItem(NirvanaItems.HEMP_SEEDS) ) )) .withPool(LootPool.lootPool() .add(AlternativesEntry.alternatives( - LootItem.lootTableItem(BlissfulItems.HEMP_SEEDS) + LootItem.lootTableItem(NirvanaItems.HEMP_SEEDS) .when(maxAge(block)) .apply(ApplyBonusCount.addBonusBinomialDistributionCount(Enchantments.BLOCK_FORTUNE, 0.57F, 2)), - LootItem.lootTableItem(BlissfulItems.HEMP_SEEDS) + LootItem.lootTableItem(NirvanaItems.HEMP_SEEDS) .when(growthMissing(block, -1)) .apply(ApplyBonusCount.addBonusBinomialDistributionCount(Enchantments.BLOCK_FORTUNE, 0.57F, 1)) ) @@ -176,8 +176,8 @@ public void feralHemp(RegistrateBlockLootTables provider, Block block) { .when(ExplosionCondition.survivesExplosion()) .add(AlternativesEntry.alternatives( LootItem.lootTableItem(block) - .when(MatchTool.toolMatches(ItemPredicate.Builder.item().of(BlissfulTags.SHEARS))), - LootItem.lootTableItem(BlissfulItems.HEMP) + .when(MatchTool.toolMatches(ItemPredicate.Builder.item().of(NirvanaTags.SHEARS))), + LootItem.lootTableItem(NirvanaItems.HEMP) .apply(SetItemCountFunction.setCount(UniformGenerator.between(0F, 2F))) )) )); diff --git a/fabric/src/main/java/galena/blissful/fabric/services/FabricPlatformHelper.java b/fabric/src/main/java/galena/nirvana/fabric/services/FabricPlatformHelper.java similarity index 51% rename from fabric/src/main/java/galena/blissful/fabric/services/FabricPlatformHelper.java rename to fabric/src/main/java/galena/nirvana/fabric/services/FabricPlatformHelper.java index 8e19b81..092efad 100644 --- a/fabric/src/main/java/galena/blissful/fabric/services/FabricPlatformHelper.java +++ b/fabric/src/main/java/galena/nirvana/fabric/services/FabricPlatformHelper.java @@ -1,11 +1,8 @@ -package galena.blissful.fabric.services; +package galena.nirvana.fabric.services; import com.tterrag.registrate.AbstractRegistrate; -import galena.blissful.fabric.FabricEntrypoint; -import galena.blissful.platform.services.IPlatformHelper; -import net.minecraft.world.item.Item; - -import java.util.function.Consumer; +import galena.nirvana.fabric.FabricEntrypoint; +import galena.nirvana.platform.services.IPlatformHelper; public class FabricPlatformHelper implements IPlatformHelper { diff --git a/fabric/src/main/resources/META-INF/services/galena.blissful.platform.services.IBrewingRegistry b/fabric/src/main/resources/META-INF/services/galena.blissful.platform.services.IBrewingRegistry deleted file mode 100644 index d09deff..0000000 --- a/fabric/src/main/resources/META-INF/services/galena.blissful.platform.services.IBrewingRegistry +++ /dev/null @@ -1 +0,0 @@ -galena.blissful.fabric.services.FabricBrewingRegistry \ No newline at end of file diff --git a/fabric/src/main/resources/META-INF/services/galena.blissful.platform.services.IDataGenHelper b/fabric/src/main/resources/META-INF/services/galena.blissful.platform.services.IDataGenHelper deleted file mode 100644 index 8efd7e5..0000000 --- a/fabric/src/main/resources/META-INF/services/galena.blissful.platform.services.IDataGenHelper +++ /dev/null @@ -1 +0,0 @@ -galena.blissful.fabric.services.FabricDataGenHelper \ No newline at end of file diff --git a/fabric/src/main/resources/META-INF/services/galena.blissful.platform.services.IPlatformHelper b/fabric/src/main/resources/META-INF/services/galena.blissful.platform.services.IPlatformHelper deleted file mode 100644 index 0724371..0000000 --- a/fabric/src/main/resources/META-INF/services/galena.blissful.platform.services.IPlatformHelper +++ /dev/null @@ -1 +0,0 @@ -galena.blissful.fabric.services.FabricPlatformHelper \ No newline at end of file diff --git a/fabric/src/main/resources/META-INF/services/galena.nirvana.platform.services.IBrewingRegistry b/fabric/src/main/resources/META-INF/services/galena.nirvana.platform.services.IBrewingRegistry new file mode 100644 index 0000000..7193e52 --- /dev/null +++ b/fabric/src/main/resources/META-INF/services/galena.nirvana.platform.services.IBrewingRegistry @@ -0,0 +1 @@ +galena.nirvana.fabric.services.FabricBrewingRegistry \ No newline at end of file diff --git a/fabric/src/main/resources/META-INF/services/galena.nirvana.platform.services.IDataGenHelper b/fabric/src/main/resources/META-INF/services/galena.nirvana.platform.services.IDataGenHelper new file mode 100644 index 0000000..47a7d69 --- /dev/null +++ b/fabric/src/main/resources/META-INF/services/galena.nirvana.platform.services.IDataGenHelper @@ -0,0 +1 @@ +galena.nirvana.fabric.services.FabricDataGenHelper \ No newline at end of file diff --git a/fabric/src/main/resources/META-INF/services/galena.nirvana.platform.services.IPlatformHelper b/fabric/src/main/resources/META-INF/services/galena.nirvana.platform.services.IPlatformHelper new file mode 100644 index 0000000..30a87c2 --- /dev/null +++ b/fabric/src/main/resources/META-INF/services/galena.nirvana.platform.services.IPlatformHelper @@ -0,0 +1 @@ +galena.nirvana.fabric.services.FabricPlatformHelper \ No newline at end of file diff --git a/fabric/src/main/resources/data/blissful/recipes/fd_rope_from_help.json b/fabric/src/main/resources/data/nirvana/recipes/fd_rope_from_help.json similarity index 94% rename from fabric/src/main/resources/data/blissful/recipes/fd_rope_from_help.json rename to fabric/src/main/resources/data/nirvana/recipes/fd_rope_from_help.json index 28ee444..4280644 100644 --- a/fabric/src/main/resources/data/blissful/recipes/fd_rope_from_help.json +++ b/fabric/src/main/resources/data/nirvana/recipes/fd_rope_from_help.json @@ -3,7 +3,7 @@ "category": "misc", "key": { "X": { - "item": "blissful:hemp" + "item": "nirvana:hemp" } }, "pattern": [ diff --git a/fabric/src/main/resources/data/blissful/recipes/supplementaries_rope_from_hemp.json b/fabric/src/main/resources/data/nirvana/recipes/supplementaries_rope_from_hemp.json similarity index 92% rename from fabric/src/main/resources/data/blissful/recipes/supplementaries_rope_from_hemp.json rename to fabric/src/main/resources/data/nirvana/recipes/supplementaries_rope_from_hemp.json index 5717148..8eaf72d 100644 --- a/fabric/src/main/resources/data/blissful/recipes/supplementaries_rope_from_hemp.json +++ b/fabric/src/main/resources/data/nirvana/recipes/supplementaries_rope_from_hemp.json @@ -3,7 +3,7 @@ "category": "misc", "key": { "X": { - "item": "blissful:hemp" + "item": "nirvana:hemp" } }, "pattern": [ diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json index f643db4..5d0013a 100644 --- a/fabric/src/main/resources/fabric.mod.json +++ b/fabric/src/main/resources/fabric.mod.json @@ -12,10 +12,10 @@ "license": "https://github.com/${repository}/blob/1.20.x/LICENSE.txt", "environment": "*", "entrypoints": { - "main": ["galena.blissful.fabric.FabricEntrypoint"], - "client": ["galena.blissful.fabric.client.FabricClientEntrypoint"], - "fabric-datagen": ["galena.blissful.fabric.datagen.FabricDataGenerators"], - "jei_mod_plugin": ["galena.blissful.fabric.compat.BlissfulJeiFabricPlugin"] + "main": ["galena.nirvana.fabric.FabricEntrypoint"], + "client": ["galena.nirvana.fabric.client.FabricClientEntrypoint"], + "fabric-datagen": ["galena.nirvana.fabric.datagen.FabricDataGenerators"], + "jei_mod_plugin": ["galena.nirvana.fabric.compat.NirvanaJeiFabricPlugin"] }, "mixins": ["${mod_id}.mixins.json", "${mod_id}.fabric.mixins.json"], "depends": { diff --git a/fabric/src/main/resources/blissful.accesswidener b/fabric/src/main/resources/nirvana.accesswidener similarity index 100% rename from fabric/src/main/resources/blissful.accesswidener rename to fabric/src/main/resources/nirvana.accesswidener diff --git a/fabric/src/main/resources/blissful.fabric.mixins.json b/fabric/src/main/resources/nirvana.fabric.mixins.json similarity index 70% rename from fabric/src/main/resources/blissful.fabric.mixins.json rename to fabric/src/main/resources/nirvana.fabric.mixins.json index a320e80..936791c 100644 --- a/fabric/src/main/resources/blissful.fabric.mixins.json +++ b/fabric/src/main/resources/nirvana.fabric.mixins.json @@ -1,9 +1,9 @@ { "required": true, "minVersion": "0.8", - "package": "galena.blissful.fabric.mixins", + "package": "galena.nirvana.fabric.mixins", "compatibilityLevel": "JAVA_17", - "refmap": "blissful.refmap.json", + "refmap": "nirvana.refmap.json", "mixins": [ "PotionBrewingMixin", "PotionSlotMixin" diff --git a/forge/src/main/java/galena/blissful/forge/ForgeEntrypoint.java b/forge/src/main/java/galena/nirvana/forge/ForgeEntrypoint.java similarity index 71% rename from forge/src/main/java/galena/blissful/forge/ForgeEntrypoint.java rename to forge/src/main/java/galena/nirvana/forge/ForgeEntrypoint.java index 90316eb..9a94da2 100644 --- a/forge/src/main/java/galena/blissful/forge/ForgeEntrypoint.java +++ b/forge/src/main/java/galena/nirvana/forge/ForgeEntrypoint.java @@ -1,22 +1,22 @@ -package galena.blissful.forge; +package galena.nirvana.forge; import com.tterrag.registrate.Registrate; import com.tterrag.registrate.util.nullness.NonNullSupplier; -import galena.blissful.BlissfulCommon; -import galena.blissful.BlissfulConstants; -import galena.blissful.forge.client.ForgeClientEntrypoint; +import galena.nirvana.NirvanaCommon; +import galena.nirvana.NirvanaConstants; +import galena.nirvana.forge.client.ForgeClientEntrypoint; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.fml.DistExecutor; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.registries.ForgeRegistries; -@Mod(BlissfulConstants.MOD_ID) +@Mod(NirvanaConstants.MOD_ID) public class ForgeEntrypoint { - public static final NonNullSupplier REGISTRATE = NonNullSupplier.lazy(() -> Registrate.create(BlissfulConstants.MOD_ID)); + public static final NonNullSupplier REGISTRATE = NonNullSupplier.lazy(() -> Registrate.create(NirvanaConstants.MOD_ID)); public ForgeEntrypoint() { - BlissfulCommon.init(); + NirvanaCommon.init(); //noinspection Convert2MethodRef DistExecutor.unsafeRunWhenOn(Dist.CLIENT, () -> () -> ForgeClientEntrypoint.init()); diff --git a/forge/src/main/java/galena/blissful/forge/ReplaceItemLootModifier.java b/forge/src/main/java/galena/nirvana/forge/ReplaceItemLootModifier.java similarity index 98% rename from forge/src/main/java/galena/blissful/forge/ReplaceItemLootModifier.java rename to forge/src/main/java/galena/nirvana/forge/ReplaceItemLootModifier.java index f8ddf93..c47f692 100644 --- a/forge/src/main/java/galena/blissful/forge/ReplaceItemLootModifier.java +++ b/forge/src/main/java/galena/nirvana/forge/ReplaceItemLootModifier.java @@ -1,4 +1,4 @@ -package galena.blissful.forge; +package galena.nirvana.forge; import com.mojang.serialization.Codec; import com.mojang.serialization.codecs.RecordCodecBuilder; diff --git a/forge/src/main/java/galena/blissful/forge/client/ForgeClientEntrypoint.java b/forge/src/main/java/galena/nirvana/forge/client/ForgeClientEntrypoint.java similarity index 86% rename from forge/src/main/java/galena/blissful/forge/client/ForgeClientEntrypoint.java rename to forge/src/main/java/galena/nirvana/forge/client/ForgeClientEntrypoint.java index 9442751..a25f47a 100644 --- a/forge/src/main/java/galena/blissful/forge/client/ForgeClientEntrypoint.java +++ b/forge/src/main/java/galena/nirvana/forge/client/ForgeClientEntrypoint.java @@ -1,6 +1,6 @@ -package galena.blissful.forge.client; +package galena.nirvana.forge.client; -import galena.blissful.client.JointModels; +import galena.nirvana.client.JointModels; import net.minecraftforge.client.event.ModelEvent; import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; diff --git a/forge/src/main/java/galena/blissful/forge/client/JointClientExtensions.java b/forge/src/main/java/galena/nirvana/forge/client/JointClientExtensions.java similarity index 95% rename from forge/src/main/java/galena/blissful/forge/client/JointClientExtensions.java rename to forge/src/main/java/galena/nirvana/forge/client/JointClientExtensions.java index 66476ec..88a6ac6 100644 --- a/forge/src/main/java/galena/blissful/forge/client/JointClientExtensions.java +++ b/forge/src/main/java/galena/nirvana/forge/client/JointClientExtensions.java @@ -1,4 +1,4 @@ -package galena.blissful.forge.client; +package galena.nirvana.forge.client; import net.minecraft.client.model.HumanoidModel; import net.minecraft.client.renderer.BlockEntityWithoutLevelRenderer; diff --git a/forge/src/main/java/galena/blissful/forge/client/JointRenderer.java b/forge/src/main/java/galena/nirvana/forge/client/JointRenderer.java similarity index 90% rename from forge/src/main/java/galena/blissful/forge/client/JointRenderer.java rename to forge/src/main/java/galena/nirvana/forge/client/JointRenderer.java index aaf6a72..b90be32 100644 --- a/forge/src/main/java/galena/blissful/forge/client/JointRenderer.java +++ b/forge/src/main/java/galena/nirvana/forge/client/JointRenderer.java @@ -1,7 +1,7 @@ -package galena.blissful.forge.client; +package galena.nirvana.forge.client; import com.mojang.blaze3d.vertex.PoseStack; -import galena.blissful.client.JointModels; +import galena.nirvana.client.JointModels; import net.minecraft.client.renderer.BlockEntityWithoutLevelRenderer; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.world.item.ItemDisplayContext; diff --git a/forge/src/main/java/galena/blissful/forge/compat/CreateCompat.java b/forge/src/main/java/galena/nirvana/forge/compat/CreateCompat.java similarity index 82% rename from forge/src/main/java/galena/blissful/forge/compat/CreateCompat.java rename to forge/src/main/java/galena/nirvana/forge/compat/CreateCompat.java index 5f11b6f..706867e 100644 --- a/forge/src/main/java/galena/blissful/forge/compat/CreateCompat.java +++ b/forge/src/main/java/galena/nirvana/forge/compat/CreateCompat.java @@ -1,11 +1,11 @@ -package galena.blissful.forge.compat; +package galena.nirvana.forge.compat; import com.simibubi.create.content.fluids.potion.PotionFluidHandler; import com.simibubi.create.content.fluids.transfer.FillingRecipe; import com.simibubi.create.content.processing.recipe.ProcessingRecipeBuilder; import com.simibubi.create.foundation.fluid.FluidIngredient; -import galena.blissful.BlissfulConstants; -import galena.blissful.index.BlissfulItems; +import galena.nirvana.NirvanaConstants; +import galena.nirvana.index.NirvanaItems; import mezz.jei.api.constants.VanillaTypes; import mezz.jei.api.recipe.RecipeType; import mezz.jei.api.registration.IRecipeRegistration; @@ -19,11 +19,11 @@ public class CreateCompat { private static List getBongFillingRecipes(IIngredientManager ingredientManager) { var items = ingredientManager.getAllIngredients(VanillaTypes.ITEM_STACK); - var bongs = items.stream().filter(BlissfulItems.POTION_BONG::isIn); + var bongs = items.stream().filter(NirvanaItems.POTION_BONG::isIn); return bongs.map(stack -> { var potion = PotionFluidHandler.getFluidFromPotionItem(stack); - return new ProcessingRecipeBuilder<>(FillingRecipe::new, new ResourceLocation(BlissfulConstants.MOD_ID, "bong")) - .withItemIngredients(Ingredient.of(BlissfulItems.BONG)) + return new ProcessingRecipeBuilder<>(FillingRecipe::new, new ResourceLocation(NirvanaConstants.MOD_ID, "bong")) + .withItemIngredients(Ingredient.of(NirvanaItems.BONG)) .withFluidIngredients(FluidIngredient.fromFluidStack(potion)) .withSingleItemOutput(stack) .build(); diff --git a/forge/src/main/java/galena/blissful/forge/compat/BlissfulForgeJeiPlugin.java b/forge/src/main/java/galena/nirvana/forge/compat/NirvanaForgeJeiPlugin.java similarity index 58% rename from forge/src/main/java/galena/blissful/forge/compat/BlissfulForgeJeiPlugin.java rename to forge/src/main/java/galena/nirvana/forge/compat/NirvanaForgeJeiPlugin.java index 2c04e18..941bffe 100644 --- a/forge/src/main/java/galena/blissful/forge/compat/BlissfulForgeJeiPlugin.java +++ b/forge/src/main/java/galena/nirvana/forge/compat/NirvanaForgeJeiPlugin.java @@ -1,8 +1,8 @@ -package galena.blissful.forge.compat; +package galena.nirvana.forge.compat; -import galena.blissful.compat.BlissfulJeiCompat; -import galena.blissful.index.BlissfulItems; -import galena.blissful.index.BlissfulRecipeTypes; +import galena.nirvana.compat.NirvanaJeiCompat; +import galena.nirvana.index.NirvanaItems; +import galena.nirvana.index.NirvanaRecipeTypes; import mezz.jei.api.IModPlugin; import mezz.jei.api.JeiPlugin; import mezz.jei.api.constants.RecipeTypes; @@ -12,7 +12,7 @@ import net.minecraftforge.fml.ModList; @JeiPlugin -public class BlissfulForgeJeiPlugin implements IModPlugin { +public class NirvanaForgeJeiPlugin implements IModPlugin { @Override public void registerRecipes(IRecipeRegistration registration) { @@ -20,17 +20,17 @@ public void registerRecipes(IRecipeRegistration registration) { CreateCompat.addJeiRecipes(registration); } - registration.addRecipes(RecipeTypes.CRAFTING, BlissfulRecipeTypes.createSalveRecipes()); + registration.addRecipes(RecipeTypes.CRAFTING, NirvanaRecipeTypes.createSalveRecipes()); } @Override public ResourceLocation getPluginUid() { - return BlissfulJeiCompat.ID; + return NirvanaJeiCompat.ID; } @Override public void registerItemSubtypes(ISubtypeRegistration registration) { - registration.registerSubtypeInterpreter(BlissfulItems.POTION_BONG.get(), BlissfulJeiCompat::interpretPotion); + registration.registerSubtypeInterpreter(NirvanaItems.POTION_BONG.get(), NirvanaJeiCompat::interpretPotion); } } diff --git a/forge/src/main/java/galena/blissful/forge/mixins/GenericItemFillingMixin.java b/forge/src/main/java/galena/nirvana/forge/mixins/GenericItemFillingMixin.java similarity index 84% rename from forge/src/main/java/galena/blissful/forge/mixins/GenericItemFillingMixin.java rename to forge/src/main/java/galena/nirvana/forge/mixins/GenericItemFillingMixin.java index 52551d6..887630a 100644 --- a/forge/src/main/java/galena/blissful/forge/mixins/GenericItemFillingMixin.java +++ b/forge/src/main/java/galena/nirvana/forge/mixins/GenericItemFillingMixin.java @@ -1,11 +1,11 @@ -package galena.blissful.forge.mixins; +package galena.nirvana.forge.mixins; import com.simibubi.create.AllFluids; import com.simibubi.create.content.fluids.potion.PotionFluid; import com.simibubi.create.content.fluids.potion.PotionFluidHandler; import com.simibubi.create.content.fluids.transfer.GenericItemFilling; import com.simibubi.create.foundation.utility.NBTHelper; -import galena.blissful.index.BlissfulItems; +import galena.nirvana.index.NirvanaItems; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.alchemy.PotionUtils; import net.minecraft.world.level.Level; @@ -20,28 +20,28 @@ public class GenericItemFillingMixin { @Unique - private static boolean blissful$isValidPotion(FluidStack fluid) { + private static boolean nirvana$isValidPotion(FluidStack fluid) { return fluid.getFluid().isSame(AllFluids.POTION.get()) && NBTHelper.readEnum(fluid.getOrCreateTag(), "Bottle", PotionFluid.BottleType.class) == PotionFluid.BottleType.REGULAR; } @Inject(require = 0, cancellable = true, at = @At("HEAD"), method = "canItemBeFilled(Lnet/minecraft/world/level/Level;Lnet/minecraft/world/item/ItemStack;)Z") private static void canBongBeFilled(Level world, ItemStack stack, CallbackInfoReturnable cir) { - if (BlissfulItems.BONG.isIn(stack)) cir.setReturnValue(true); + if (NirvanaItems.BONG.isIn(stack)) cir.setReturnValue(true); } @Inject(require = 0, cancellable = true, at = @At("HEAD"), method = "getRequiredAmountForItem(Lnet/minecraft/world/level/Level;Lnet/minecraft/world/item/ItemStack;Lnet/minecraftforge/fluids/FluidStack;)I") private static void getRequiredAmountForBong(Level world, ItemStack stack, FluidStack availableFluid, CallbackInfoReturnable cir) { - if (BlissfulItems.BONG.isIn(stack) && blissful$isValidPotion(availableFluid)) { + if (NirvanaItems.BONG.isIn(stack) && nirvana$isValidPotion(availableFluid)) { cir.setReturnValue(PotionFluidHandler.getRequiredAmountForFilledBottle(stack, availableFluid)); } } @Inject(require = 0, cancellable = true, at = @At("HEAD"), method = "fillItem(Lnet/minecraft/world/level/Level;ILnet/minecraft/world/item/ItemStack;Lnet/minecraftforge/fluids/FluidStack;)Lnet/minecraft/world/item/ItemStack;") private static void fillBong(Level world, int requiredAmount, ItemStack stack, FluidStack availableFluid, CallbackInfoReturnable cir) { - if (BlissfulItems.BONG.isIn(stack) && blissful$isValidPotion(availableFluid)) { + if (NirvanaItems.BONG.isIn(stack) && nirvana$isValidPotion(availableFluid)) { var tag = availableFluid.getOrCreateTag(); - var bongStack = BlissfulItems.POTION_BONG.asStack(); + var bongStack = NirvanaItems.POTION_BONG.asStack(); PotionUtils.setPotion(bongStack, PotionUtils.getPotion(tag)); PotionUtils.setCustomEffects(bongStack, PotionUtils.getCustomEffects(tag)); stack.shrink(1); diff --git a/forge/src/main/java/galena/blissful/forge/services/ForgeBrewingRegistry.java b/forge/src/main/java/galena/nirvana/forge/services/ForgeBrewingRegistry.java similarity index 80% rename from forge/src/main/java/galena/blissful/forge/services/ForgeBrewingRegistry.java rename to forge/src/main/java/galena/nirvana/forge/services/ForgeBrewingRegistry.java index 506cb7b..7cb4224 100644 --- a/forge/src/main/java/galena/blissful/forge/services/ForgeBrewingRegistry.java +++ b/forge/src/main/java/galena/nirvana/forge/services/ForgeBrewingRegistry.java @@ -1,6 +1,6 @@ -package galena.blissful.forge.services; +package galena.nirvana.forge.services; -import galena.blissful.platform.services.IBrewingRegistry; +import galena.nirvana.platform.services.IBrewingRegistry; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.crafting.Ingredient; import net.minecraftforge.common.brewing.BrewingRecipeRegistry; diff --git a/forge/src/main/java/galena/blissful/forge/services/ForgeDataGenHelper.java b/forge/src/main/java/galena/nirvana/forge/services/ForgeDataGenHelper.java similarity index 94% rename from forge/src/main/java/galena/blissful/forge/services/ForgeDataGenHelper.java rename to forge/src/main/java/galena/nirvana/forge/services/ForgeDataGenHelper.java index c3d0400..a49c782 100644 --- a/forge/src/main/java/galena/blissful/forge/services/ForgeDataGenHelper.java +++ b/forge/src/main/java/galena/nirvana/forge/services/ForgeDataGenHelper.java @@ -1,10 +1,10 @@ -package galena.blissful.forge.services; +package galena.nirvana.forge.services; import com.tterrag.registrate.providers.DataGenContext; import com.tterrag.registrate.providers.RegistrateBlockstateProvider; import com.tterrag.registrate.providers.RegistrateItemModelProvider; import com.tterrag.registrate.providers.loot.RegistrateBlockLootTables; -import galena.blissful.platform.services.IDataGenHelper; +import galena.nirvana.platform.services.IDataGenHelper; import net.minecraft.world.item.Item; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.CropBlock; diff --git a/forge/src/main/java/galena/blissful/forge/services/ForgePlatformHelper.java b/forge/src/main/java/galena/nirvana/forge/services/ForgePlatformHelper.java similarity index 54% rename from forge/src/main/java/galena/blissful/forge/services/ForgePlatformHelper.java rename to forge/src/main/java/galena/nirvana/forge/services/ForgePlatformHelper.java index 6352f43..724c9e6 100644 --- a/forge/src/main/java/galena/blissful/forge/services/ForgePlatformHelper.java +++ b/forge/src/main/java/galena/nirvana/forge/services/ForgePlatformHelper.java @@ -1,15 +1,12 @@ -package galena.blissful.forge.services; +package galena.nirvana.forge.services; import com.tterrag.registrate.AbstractRegistrate; -import galena.blissful.forge.ForgeEntrypoint; -import galena.blissful.forge.client.JointClientExtensions; -import galena.blissful.forge.world.ForgeJointItem; -import galena.blissful.platform.services.IPlatformHelper; -import galena.blissful.world.item.JointItem; +import galena.nirvana.forge.ForgeEntrypoint; +import galena.nirvana.forge.world.ForgeJointItem; +import galena.nirvana.platform.services.IPlatformHelper; +import galena.nirvana.world.item.JointItem; import net.minecraft.world.item.Item; -import java.util.function.Consumer; - public class ForgePlatformHelper implements IPlatformHelper { @Override diff --git a/forge/src/main/java/galena/blissful/forge/world/ForgeJointItem.java b/forge/src/main/java/galena/nirvana/forge/world/ForgeJointItem.java similarity index 73% rename from forge/src/main/java/galena/blissful/forge/world/ForgeJointItem.java rename to forge/src/main/java/galena/nirvana/forge/world/ForgeJointItem.java index 45a0173..5835765 100644 --- a/forge/src/main/java/galena/blissful/forge/world/ForgeJointItem.java +++ b/forge/src/main/java/galena/nirvana/forge/world/ForgeJointItem.java @@ -1,7 +1,7 @@ -package galena.blissful.forge.world; +package galena.nirvana.forge.world; -import galena.blissful.forge.client.JointClientExtensions; -import galena.blissful.world.item.JointItem; +import galena.nirvana.forge.client.JointClientExtensions; +import galena.nirvana.world.item.JointItem; import net.minecraftforge.client.extensions.common.IClientItemExtensions; import java.util.function.Consumer; diff --git a/forge/src/main/resources/META-INF/services/galena.blissful.platform.services.IBrewingRegistry b/forge/src/main/resources/META-INF/services/galena.blissful.platform.services.IBrewingRegistry deleted file mode 100644 index 9a8903c..0000000 --- a/forge/src/main/resources/META-INF/services/galena.blissful.platform.services.IBrewingRegistry +++ /dev/null @@ -1 +0,0 @@ -galena.blissful.forge.services.ForgeBrewingRegistry \ No newline at end of file diff --git a/forge/src/main/resources/META-INF/services/galena.blissful.platform.services.IDataGenHelper b/forge/src/main/resources/META-INF/services/galena.blissful.platform.services.IDataGenHelper deleted file mode 100644 index 873cab5..0000000 --- a/forge/src/main/resources/META-INF/services/galena.blissful.platform.services.IDataGenHelper +++ /dev/null @@ -1 +0,0 @@ -galena.blissful.forge.services.ForgeDataGenHelper \ No newline at end of file diff --git a/forge/src/main/resources/META-INF/services/galena.blissful.platform.services.IPlatformHelper b/forge/src/main/resources/META-INF/services/galena.blissful.platform.services.IPlatformHelper deleted file mode 100644 index d8cf72d..0000000 --- a/forge/src/main/resources/META-INF/services/galena.blissful.platform.services.IPlatformHelper +++ /dev/null @@ -1 +0,0 @@ -galena.blissful.forge.services.ForgePlatformHelper \ No newline at end of file diff --git a/forge/src/main/resources/META-INF/services/galena.nirvana.platform.services.IBrewingRegistry b/forge/src/main/resources/META-INF/services/galena.nirvana.platform.services.IBrewingRegistry new file mode 100644 index 0000000..5199137 --- /dev/null +++ b/forge/src/main/resources/META-INF/services/galena.nirvana.platform.services.IBrewingRegistry @@ -0,0 +1 @@ +galena.nirvana.forge.services.ForgeBrewingRegistry \ No newline at end of file diff --git a/forge/src/main/resources/META-INF/services/galena.nirvana.platform.services.IDataGenHelper b/forge/src/main/resources/META-INF/services/galena.nirvana.platform.services.IDataGenHelper new file mode 100644 index 0000000..543fef5 --- /dev/null +++ b/forge/src/main/resources/META-INF/services/galena.nirvana.platform.services.IDataGenHelper @@ -0,0 +1 @@ +galena.nirvana.forge.services.ForgeDataGenHelper \ No newline at end of file diff --git a/forge/src/main/resources/META-INF/services/galena.nirvana.platform.services.IPlatformHelper b/forge/src/main/resources/META-INF/services/galena.nirvana.platform.services.IPlatformHelper new file mode 100644 index 0000000..3a7f204 --- /dev/null +++ b/forge/src/main/resources/META-INF/services/galena.nirvana.platform.services.IPlatformHelper @@ -0,0 +1 @@ +galena.nirvana.forge.services.ForgePlatformHelper \ No newline at end of file diff --git a/forge/src/main/resources/data/blissful/forge/biome_modifier/feral_hemp.json b/forge/src/main/resources/data/blissful/forge/biome_modifier/feral_hemp.json deleted file mode 100644 index ded42d8..0000000 --- a/forge/src/main/resources/data/blissful/forge/biome_modifier/feral_hemp.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "type": "forge:add_features", - "biomes": "#blissful:has_feature/feral_hemp", - "features": "blissful:patch_feral_hemp", - "step": "vegetal_decoration" -} \ No newline at end of file diff --git a/forge/src/main/resources/data/forge/loot_modifiers/global_loot_modifiers.json b/forge/src/main/resources/data/forge/loot_modifiers/global_loot_modifiers.json index 78561ec..55d3285 100644 --- a/forge/src/main/resources/data/forge/loot_modifiers/global_loot_modifiers.json +++ b/forge/src/main/resources/data/forge/loot_modifiers/global_loot_modifiers.json @@ -1,6 +1,6 @@ { "replace": false, "entries": [ - "blissful:sniffer_digging" + "nirvana:sniffer_digging" ] } \ No newline at end of file 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 new file mode 100644 index 0000000..ace377a --- /dev/null +++ b/forge/src/main/resources/data/nirvana/forge/biome_modifier/feral_hemp.json @@ -0,0 +1,6 @@ +{ + "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/blissful/loot_modifiers/sniffer_digging.json b/forge/src/main/resources/data/nirvana/loot_modifiers/sniffer_digging.json similarity index 79% rename from forge/src/main/resources/data/blissful/loot_modifiers/sniffer_digging.json rename to forge/src/main/resources/data/nirvana/loot_modifiers/sniffer_digging.json index c3058b8..1fcc42e 100644 --- a/forge/src/main/resources/data/blissful/loot_modifiers/sniffer_digging.json +++ b/forge/src/main/resources/data/nirvana/loot_modifiers/sniffer_digging.json @@ -1,5 +1,5 @@ { - "type": "blissful:replace_item", + "type": "nirvana:replace_item", "conditions": [ { "condition": "forge:loot_table_id", @@ -10,6 +10,6 @@ } ], "items": [ - "blissful:bliss_bloom" + "nirvana:bliss_bloom" ] } \ No newline at end of file diff --git a/forge/src/main/resources/data/blissful/recipes/fd_rope_from_hemp.json b/forge/src/main/resources/data/nirvana/recipes/fd_rope_from_hemp.json similarity index 93% rename from forge/src/main/resources/data/blissful/recipes/fd_rope_from_hemp.json rename to forge/src/main/resources/data/nirvana/recipes/fd_rope_from_hemp.json index 10a0506..c1b8487 100644 --- a/forge/src/main/resources/data/blissful/recipes/fd_rope_from_hemp.json +++ b/forge/src/main/resources/data/nirvana/recipes/fd_rope_from_hemp.json @@ -3,7 +3,7 @@ "category": "misc", "key": { "X": { - "item": "blissful:hemp" + "item": "nirvana:hemp" } }, "pattern": [ diff --git a/forge/src/main/resources/data/blissful/recipes/supplementaries_rope_from_hemp.json b/forge/src/main/resources/data/nirvana/recipes/supplementaries_rope_from_hemp.json similarity index 91% rename from forge/src/main/resources/data/blissful/recipes/supplementaries_rope_from_hemp.json rename to forge/src/main/resources/data/nirvana/recipes/supplementaries_rope_from_hemp.json index d6da6c1..bbc7e48 100644 --- a/forge/src/main/resources/data/blissful/recipes/supplementaries_rope_from_hemp.json +++ b/forge/src/main/resources/data/nirvana/recipes/supplementaries_rope_from_hemp.json @@ -3,7 +3,7 @@ "category": "misc", "key": { "X": { - "item": "blissful:hemp" + "item": "nirvana:hemp" } }, "pattern": [ diff --git a/forge/src/main/resources/blissful.forge.mixins.json b/forge/src/main/resources/nirvana.forge.mixins.json similarity index 68% rename from forge/src/main/resources/blissful.forge.mixins.json rename to forge/src/main/resources/nirvana.forge.mixins.json index 6c437a3..5a18977 100644 --- a/forge/src/main/resources/blissful.forge.mixins.json +++ b/forge/src/main/resources/nirvana.forge.mixins.json @@ -1,9 +1,9 @@ { "required": true, "minVersion": "0.8", - "package": "galena.blissful.forge.mixins", + "package": "galena.nirvana.forge.mixins", "compatibilityLevel": "JAVA_17", - "refmap": "blissful.refmap.json", + "refmap": "nirvana.refmap.json", "mixins": [ "GenericItemFillingMixin" ], diff --git a/gradle.properties b/gradle.properties index ce1aeef..755f369 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,8 +3,8 @@ org.gradle.jvmargs=-Xmx3G org.gradle.daemon=false # Project -mod_id=blissful -mod_name=Blissful +mod_id=nirvana +mod_name=Nirvana mod_author=possible_triangle mod_version=0.0.0-dev release_type=alpha @@ -27,11 +27,12 @@ registrate_forge_version=MC1.20-1.3.3 jei_version=15.2.0.25 jeed_version=1.20-2.1.4 fd_forge_version=1.20.1-1.2.3 -create_forge_version=0.5.1.e-15 +create_forge_version=0.5.1.f-26 flywheel_forge_version=0.6.10-6 freecam_forge_version=j1bCo8QB +create_fabric_version=0.5.1-f-build.1335+mc1.20.1 # Publishing -repository=pssbletrngle/blissful +repository=pssbletrngle/nirvana curseforge_project_id=905156 modrinth_project_id=7vLeZs9H \ No newline at end of file