minecraft-mods/firefly_bush_backport
Private
Public Access
1
0
Fork 0
Code Issues Projects Releases 1 Wiki Activity

Merge pull request 'feat/20-slight_cleanup' (#21) from feat/20-slight_cleanup into 1.20.1

Browse Source 
Reviewed-on: #21
This commit is contained in:
micle
2025-06-09 16:59:58 +00:00
parent 5f58f685fb a62bfe3209
commit 62c0bb4887
6 changed files with 99 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/generated/resources/assets/firefly_bush_backport/models/block/firefly_bush.json
View File

@ -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",

3
src/main/java/dev/micle/firefly_bush_backport/data/client/ModBlockStateProvider.java
View File

@ -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> 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")

2
src/main/java/dev/micle/firefly_bush_backport/proxy/Proxy.java
View File

@ -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;

2
src/main/java/dev/micle/firefly_bush_backport/creative_mode_tab/ModCreativeModeTabs.java → src/main/java/dev/micle/firefly_bush_backport/tab/ModCreativeModeTabs.java
View File

@ -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;

94
src/main/resources/assets/firefly_bush_backport/models/block/cross_emissive.json Normal file
View File

@ -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"
}
}
}
]
}

46
src/main/resources/assets/minecraft/models/block/cross_emissive.json
View File

@ -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" }
}
}
]
}