From 8b525ca49429d25d3291ecf7bcbbc9c5f049c54f Mon Sep 17 00:00:00 2001 From: Micle Date: Mon, 9 Jun 2025 17:55:34 +0100 Subject: [PATCH 1/4] Moved to our own namespace. Reformatted the file a bit. --- .../models/block/cross_emissive.json | 94 +++++++++++++++++++ .../models/block/cross_emissive.json | 46 --------- 2 files changed, 94 insertions(+), 46 deletions(-) create mode 100644 src/main/resources/assets/firefly_bush_backport/models/block/cross_emissive.json delete mode 100644 src/main/resources/assets/minecraft/models/block/cross_emissive.json diff --git a/src/main/resources/assets/firefly_bush_backport/models/block/cross_emissive.json b/src/main/resources/assets/firefly_bush_backport/models/block/cross_emissive.json new file mode 100644 index 0000000..22b84e5 --- /dev/null +++ b/src/main/resources/assets/firefly_bush_backport/models/block/cross_emissive.json @@ -0,0 +1,94 @@ +{ + "ambientocclusion": false, + "textures": { + "particle": "#cross" + }, + "elements": [ + { + "from": [0.8, 0, 8], + "to": [15.2, 16, 8], + "rotation": { + "origin": [8, 8, 8], + "axis": "y", + "angle": 45, + "rescale": true + }, + "shade": false, + "faces": { + "north": { + "uv": [0, 0, 16, 16], + "texture": "#cross" + }, + "south": { + "uv": [0, 0, 16, 16], + "texture": "#cross" + } + } + }, + { + "from": [8, 0, 0.8], + "to": [8, 16, 15.2], + "rotation": { + "origin": [8, 8, 8], + "axis": "y", + "angle": 45, + "rescale": true + }, + "shade": false, + "faces": { + "west": { + "uv": [0, 0, 16, 16], + "texture": "#cross" + }, + "east": { + "uv": [0, 0, 16, 16], + "texture": "#cross" + } + } + }, + { + "from": [0.8, 0, 8], + "to": [15.2, 16, 8], + "rotation": { + "origin": [8, 8, 8], + "axis": "y", + "angle": 45, + "rescale": true + }, + "shade": false, + "light_emission": 15, + "faces": { + "north": { + "uv": [0, 0, 16, 16], + "texture": "#cross_emissive" + }, + "south": { + "uv": [0, 0, 16, 16], + "texture": "#cross_emissive" + } + } + }, + { + "from": [8, 0, 0.8], + "to": [8, 16, 15.2], + "rotation": { + "origin": [8, 8, 8], + "axis": "y", + "angle": 45, + "rescale": true + }, + "shade": false, + "light_emission": 15, + "faces": { + "west": { + "uv": [0, 0, 16, 16], + "texture": "#cross_emissive" + }, + "east": { + "uv": [0, 0, 16, 16], + "texture": "#cross_emissive" + } + } + } + ] +} diff --git a/src/main/resources/assets/minecraft/models/block/cross_emissive.json b/src/main/resources/assets/minecraft/models/block/cross_emissive.json deleted file mode 100644 index 5882091..0000000 --- a/src/main/resources/assets/minecraft/models/block/cross_emissive.json +++ /dev/null @@ -1,46 +0,0 @@ -{ - "ambientocclusion": false, - "textures": { - "particle": "#cross" - }, - "elements": [ - { "from": [ 0.8, 0, 8 ], - "to": [ 15.2, 16, 8 ], - "rotation": { "origin": [ 8, 8, 8 ], "axis": "y", "angle": 45, "rescale": true }, - "shade": false, - "faces": { - "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#cross" }, - "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#cross" } - } - }, - { "from": [ 8, 0, 0.8 ], - "to": [ 8, 16, 15.2 ], - "rotation": { "origin": [ 8, 8, 8 ], "axis": "y", "angle": 45, "rescale": true }, - "shade": false, - "faces": { - "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#cross" }, - "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#cross" } - } - }, - { "from": [ 0.8, 0, 8 ], - "to": [ 15.2, 16, 8 ], - "rotation": { "origin": [ 8, 8, 8 ], "axis": "y", "angle": 45, "rescale": true }, - "shade": false, - "light_emission": 15, - "faces": { - "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#cross_emissive" }, - "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#cross_emissive" } - } - }, - { "from": [ 8, 0, 0.8 ], - "to": [ 8, 16, 15.2 ], - "rotation": { "origin": [ 8, 8, 8 ], "axis": "y", "angle": 45, "rescale": true }, - "shade": false, - "light_emission": 15, - "faces": { - "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#cross_emissive" }, - "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#cross_emissive" } - } - } - ] -} From 9201d0a7363ebfbb8d53a1cbefbcf008bb187c75 Mon Sep 17 00:00:00 2001 From: Micle Date: Mon, 9 Jun 2025 17:56:40 +0100 Subject: [PATCH 2/4] Updated reference to the block model. --- .../data/client/ModBlockStateProvider.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/dev/micle/firefly_bush_backport/data/client/ModBlockStateProvider.java b/src/main/java/dev/micle/firefly_bush_backport/data/client/ModBlockStateProvider.java index f0c2a38..d1e883c 100644 --- a/src/main/java/dev/micle/firefly_bush_backport/data/client/ModBlockStateProvider.java +++ b/src/main/java/dev/micle/firefly_bush_backport/data/client/ModBlockStateProvider.java @@ -3,6 +3,7 @@ package dev.micle.firefly_bush_backport.data.client; import dev.micle.firefly_bush_backport.FireflyBushBackport; import dev.micle.firefly_bush_backport.block.ModBlocks; import net.minecraft.data.DataGenerator; +import net.minecraft.resources.ResourceLocation; import net.minecraft.world.level.block.Block; import net.minecraftforge.client.model.generators.BlockStateProvider; import net.minecraftforge.common.data.ExistingFileHelper; @@ -23,7 +24,7 @@ public class ModBlockStateProvider extends BlockStateProvider { private void crossEmissiveBlock(RegistryObject block) { String name = Objects.requireNonNull(block.getId()).getPath(); simpleBlock(block.get(), models() - .withExistingParent(name, "block/cross_emissive") + .withExistingParent(name, ResourceLocation.fromNamespaceAndPath(FireflyBushBackport.MOD_ID, "block/cross_emissive")) .texture("cross", "block/" + name) .texture("cross_emissive", "block/" + name + "_emissive") .renderType("cutout") From 0f2503127711e3cfc3509b309024e81b24dea9d4 Mon Sep 17 00:00:00 2001 From: Micle Date: Mon, 9 Jun 2025 17:56:48 +0100 Subject: [PATCH 3/4] Regenerated data. --- .../assets/firefly_bush_backport/models/block/firefly_bush.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/generated/resources/assets/firefly_bush_backport/models/block/firefly_bush.json b/src/generated/resources/assets/firefly_bush_backport/models/block/firefly_bush.json index 253a2d4..dd6b37f 100644 --- a/src/generated/resources/assets/firefly_bush_backport/models/block/firefly_bush.json +++ b/src/generated/resources/assets/firefly_bush_backport/models/block/firefly_bush.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/cross_emissive", + "parent": "firefly_bush_backport:block/cross_emissive", "render_type": "minecraft:cutout", "textures": { "cross": "firefly_bush_backport:block/firefly_bush", From 05c9bcbfe62ed44faf20fd7482c80e5cba8f33d5 Mon Sep 17 00:00:00 2001 From: Micle Date: Mon, 9 Jun 2025 17:57:36 +0100 Subject: [PATCH 4/4] Updated package name. --- src/main/java/dev/micle/firefly_bush_backport/proxy/Proxy.java | 2 +- .../{creative_mode_tab => tab}/ModCreativeModeTabs.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename src/main/java/dev/micle/firefly_bush_backport/{creative_mode_tab => tab}/ModCreativeModeTabs.java (95%) diff --git a/src/main/java/dev/micle/firefly_bush_backport/proxy/Proxy.java b/src/main/java/dev/micle/firefly_bush_backport/proxy/Proxy.java index 91bea34..b2a190d 100644 --- a/src/main/java/dev/micle/firefly_bush_backport/proxy/Proxy.java +++ b/src/main/java/dev/micle/firefly_bush_backport/proxy/Proxy.java @@ -3,7 +3,7 @@ package dev.micle.firefly_bush_backport.proxy; import dev.micle.firefly_bush_backport.FireflyBushBackport; import dev.micle.firefly_bush_backport.block.ModBlocks; import dev.micle.firefly_bush_backport.config.Config; -import dev.micle.firefly_bush_backport.creative_mode_tab.ModCreativeModeTabs; +import dev.micle.firefly_bush_backport.tab.ModCreativeModeTabs; import dev.micle.firefly_bush_backport.item.ModItems; import dev.micle.firefly_bush_backport.particle.FireflyParticle; import dev.micle.firefly_bush_backport.particle.ModParticles; diff --git a/src/main/java/dev/micle/firefly_bush_backport/creative_mode_tab/ModCreativeModeTabs.java b/src/main/java/dev/micle/firefly_bush_backport/tab/ModCreativeModeTabs.java similarity index 95% rename from src/main/java/dev/micle/firefly_bush_backport/creative_mode_tab/ModCreativeModeTabs.java rename to src/main/java/dev/micle/firefly_bush_backport/tab/ModCreativeModeTabs.java index 0b126a0..5fdccb9 100644 --- a/src/main/java/dev/micle/firefly_bush_backport/creative_mode_tab/ModCreativeModeTabs.java +++ b/src/main/java/dev/micle/firefly_bush_backport/tab/ModCreativeModeTabs.java @@ -1,4 +1,4 @@ -package dev.micle.firefly_bush_backport.creative_mode_tab; +package dev.micle.firefly_bush_backport.tab; import dev.micle.firefly_bush_backport.FireflyBushBackport; import dev.micle.firefly_bush_backport.block.ModBlocks;