mirrors/Create
0
0
Fork 0
mirror of https://github.com/Creators-of-Create/Create.git synced 2025-03-04 14:54:42 +01:00
Code Issues Projects Releases Packages Wiki Activity

Consistent Consistency

Browse source 
- Make bar and window models consistent with vanilla's models
This commit is contained in:
IThundxr 2025-01-13 09:49:41 -05:00
parent 56faba5fea
commit 4b69bfc0dc
No known key found for this signature in database
22 changed files with 455 additions and 1116 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1347
src/generated/resources/.cache/2d64935085b86659cb7857bad9701dbf9bab6e4c
View file

File diff suppressed because it is too large Load diff

5
src/generated/resources/assets/create/models/item/acacia_window_pane.json
View file

@ -1,7 +1,6 @@
{
"parent": "create:item/pane",
"parent": "minecraft:item/generated",
"textures": {
"edge": "minecraft:block/acacia_planks",
"pane": "create:block/palettes/acacia_window"
"layer0": "create:block/palettes/acacia_window"
}
}

5
src/generated/resources/assets/create/models/item/andesite_bars.json
View file

@ -1,7 +1,6 @@
{
"parent": "create:item/bars",
"parent": "minecraft:item/generated",
"textures": {
"bars": "create:block/bars/andesite_bars",
"edge": "create:block/bars/andesite_bars_edge"
"layer0": "create:block/bars/andesite_bars"
}
}

5
src/generated/resources/assets/create/models/item/birch_window_pane.json
View file

@ -1,7 +1,6 @@
{
"parent": "create:item/pane",
"parent": "minecraft:item/generated",
"textures": {
"edge": "minecraft:block/birch_planks",
"pane": "create:block/palettes/birch_window"
"layer0": "create:block/palettes/birch_window"
}
}

5
src/generated/resources/assets/create/models/item/brass_bars.json
View file

@ -1,7 +1,6 @@
{
"parent": "create:item/bars",
"parent": "minecraft:item/generated",
"textures": {
"bars": "create:block/bars/brass_bars",
"edge": "create:block/bars/brass_bars_edge"
"layer0": "create:block/bars/brass_bars"
}
}

5
src/generated/resources/assets/create/models/item/copper_bars.json
View file

@ -1,7 +1,6 @@
{
"parent": "create:item/bars",
"parent": "minecraft:item/generated",
"textures": {
"bars": "create:block/bars/copper_bars",
"edge": "create:block/bars/copper_bars_edge"
"layer0": "create:block/bars/copper_bars"
}
}

5
src/generated/resources/assets/create/models/item/crimson_window_pane.json
View file

@ -1,7 +1,6 @@
{
"parent": "create:item/pane",
"parent": "minecraft:item/generated",
"textures": {
"edge": "minecraft:block/crimson_planks",
"pane": "create:block/palettes/crimson_window"
"layer0": "create:block/palettes/crimson_window"
}
}

5
src/generated/resources/assets/create/models/item/dark_oak_window_pane.json
View file

@ -1,7 +1,6 @@
{
"parent": "create:item/pane",
"parent": "minecraft:item/generated",
"textures": {
"edge": "minecraft:block/dark_oak_planks",
"pane": "create:block/palettes/dark_oak_window"
"layer0": "create:block/palettes/dark_oak_window"
}
}

5
src/generated/resources/assets/create/models/item/framed_glass_pane.json
View file

@ -1,7 +1,6 @@
{
"parent": "create:item/pane",
"parent": "minecraft:item/generated",
"textures": {
"edge": "create:block/palettes/framed_glass_pane_top",
"pane": "create:block/palettes/framed_glass"
"layer0": "create:block/palettes/framed_glass"
}
}

5
src/generated/resources/assets/create/models/item/horizontal_framed_glass_pane.json
View file

@ -1,7 +1,6 @@
{
"parent": "create:item/pane",
"parent": "minecraft:item/generated",
"textures": {
"edge": "create:block/palettes/framed_glass_pane_top",
"pane": "create:block/palettes/horizontal_framed_glass"
"layer0": "create:block/palettes/horizontal_framed_glass"
}
}

5
src/generated/resources/assets/create/models/item/jungle_window_pane.json
View file

@ -1,7 +1,6 @@
{
"parent": "create:item/pane",
"parent": "minecraft:item/generated",
"textures": {
"edge": "minecraft:block/jungle_planks",
"pane": "create:block/palettes/jungle_window"
"layer0": "create:block/palettes/jungle_window"
}
}

5
src/generated/resources/assets/create/models/item/mangrove_window_pane.json
View file

@ -1,7 +1,6 @@
{
"parent": "create:item/pane",
"parent": "minecraft:item/generated",
"textures": {
"edge": "minecraft:block/mangrove_planks",
"pane": "create:block/palettes/mangrove_window"
"layer0": "create:block/palettes/mangrove_window"
}
}

5
src/generated/resources/assets/create/models/item/oak_window_pane.json
View file

@ -1,7 +1,6 @@
{
"parent": "create:item/pane",
"parent": "minecraft:item/generated",
"textures": {
"edge": "minecraft:block/oak_planks",
"pane": "create:block/palettes/oak_window"
"layer0": "create:block/palettes/oak_window"
}
}

5
src/generated/resources/assets/create/models/item/ornate_iron_window_pane.json
View file

@ -1,7 +1,6 @@
{
"parent": "create:item/pane",
"parent": "minecraft:item/generated",
"textures": {
"edge": "create:block/palettes/ornate_iron_window_pane_top",
"pane": "create:block/palettes/ornate_iron_window"
"layer0": "create:block/palettes/ornate_iron_window"
}
}

5
src/generated/resources/assets/create/models/item/spruce_window_pane.json
View file

@ -1,7 +1,6 @@
{
"parent": "create:item/pane",
"parent": "minecraft:item/generated",
"textures": {
"edge": "minecraft:block/spruce_planks",
"pane": "create:block/palettes/spruce_window"
"layer0": "create:block/palettes/spruce_window"
}
}

5
src/generated/resources/assets/create/models/item/tiled_glass_pane.json
View file

@ -1,7 +1,6 @@
{
"parent": "create:item/pane",
"parent": "minecraft:item/generated",
"textures": {
"edge": "minecraft:block/glass_pane_top",
"pane": "create:block/palettes/tiled_glass"
"layer0": "create:block/palettes/tiled_glass"
}
}

5
src/generated/resources/assets/create/models/item/vertical_framed_glass_pane.json
View file

@ -1,7 +1,6 @@
{
"parent": "create:item/pane",
"parent": "minecraft:item/generated",
"textures": {
"edge": "create:block/palettes/framed_glass_pane_top",
"pane": "create:block/palettes/vertical_framed_glass"
"layer0": "create:block/palettes/vertical_framed_glass"
}
}

5
src/generated/resources/assets/create/models/item/warped_window_pane.json
View file

@ -1,7 +1,6 @@
{
"parent": "create:item/pane",
"parent": "minecraft:item/generated",
"textures": {
"edge": "minecraft:block/warped_planks",
"pane": "create:block/palettes/warped_window"
"layer0": "create:block/palettes/warped_window"
}
}

4
src/main/java/com/simibubi/create/foundation/data/MetalBarsGen.java
View file

@ -136,9 +136,7 @@ public class MetalBarsGen {
.item()
.model((c, p) -> {
ResourceLocation barsTexture = p.modLoc("block/bars/" + name + "_bars");
p.withExistingParent(c.getName(), Create.asResource("item/bars"))
.texture("bars", barsTexture)
.texture("edge", specialEdge ? p.modLoc("block/bars/" + name + "_bars_edge") : barsTexture);
p.generated(c, barsTexture);
})
.recipe((c, p) -> p.stonecutting(ingredient.get(), RecipeCategory.DECORATIONS, c::get, 4))
.build()

9
src/main/java/com/simibubi/create/foundation/data/WindowGen.java
View file

@ -41,6 +41,7 @@ import net.minecraft.world.level.block.state.BlockBehaviour.Properties;
import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.level.block.state.properties.WoodType;
import net.minecraft.world.level.material.MapColor;
import net.minecraftforge.client.model.generators.ConfiguredModel;
import net.minecraftforge.client.model.generators.ModelFile;
import net.minecraftforge.common.Tags;
@ -68,8 +69,8 @@ public class WindowGen {
}
public static BlockBuilder<WindowBlock, CreateRegistrate> randomisedWindowBlock(String name,
Supplier<? extends ItemLike> ingredient, Supplier<Supplier<RenderType>> renderType, boolean translucent,
Supplier<MapColor> color) {
Supplier<? extends ItemLike> ingredient, Supplier<Supplier<RenderType>> renderType, boolean translucent,
Supplier<MapColor> color) {
ResourceLocation end_texture = Create.asResource(palettesDir() + name + "_end");
ResourceLocation side_texture = Create.asResource(palettesDir() + name);
Function<Integer, ResourceLocation> ends = i -> Create.asResource(palettesDir() + name + "_" + i + "_end");
@ -253,9 +254,7 @@ public class WindowGen {
.loot((t, g) -> t.dropWhenSilkTouch(g))
.item()
.tag(Tags.Items.GLASS_PANES)
.model((c, p) -> p.withExistingParent(c.getName(), Create.asResource("item/pane"))
.texture("pane", sideTexture)
.texture("edge", topTexture))
.model((c, p) -> p.generated(c, sideTexture))
.build();
}

77
src/main/resources/assets/create/models/item/bars.json
View file

@ -1,77 +0,0 @@
{
"credit": "Made with Blockbench",
"elements": [
{
"from": [8, 0, 0],
"to": [8, 16, 16],
"faces": {
"east": {"uv": [16, 0, 0, 16], "texture": "#bars"},
"west": {"uv": [0, 0, 16, 16], "texture": "#bars"}
}
},
{
"from": [7, 0, 15.95],
"to": [9, 16, 16],
"faces": {
"north": {"uv": [9, 16, 7, 0], "texture": "#bars"},
"south": {"uv": [7, 16, 9, 0], "texture": "#bars"}
}
},
{
"from": [7, 0, 0],
"to": [9, 16, 0.05],
"faces": {
"north": {"uv": [7, 16, 9, 0], "texture": "#bars"},
"south": {"uv": [9, 16, 7, 0], "texture": "#bars"}
}
},
{
"from": [7, 15.95, 0],
"to": [9, 16, 16],
"faces": {
"up": {"uv": [7, 0, 9, 16], "rotation": 180, "texture": "#edge"},
"down": {"uv": [7, 16, 9, 0], "rotation": 180, "texture": "#edge"}
}
},
{
"from": [7, 0, 0],
"to": [9, 0.05, 16],
"faces": {
"up": {"uv": [7, 16, 9, 0], "rotation": 180, "texture": "#edge"},
"down": {"uv": [7, 0, 9, 16], "rotation": 180, "texture": "#edge"}
}
}
],
"display": {
"thirdperson_righthand": {
"rotation": [75, 45, 0],
"translation": [0, 2.5, 0],
"scale": [0.375, 0.375, 0.375]
},
"thirdperson_lefthand": {
"rotation": [75, 45, 0],
"translation": [0, 2.5, 0],
"scale": [0.375, 0.375, 0.375]
},
"firstperson_righthand": {
"rotation": [0, 45, 0],
"scale": [0.4, 0.4, 0.4]
},
"firstperson_lefthand": {
"rotation": [0, 225, 0],
"scale": [0.4, 0.4, 0.4]
},
"ground": {
"translation": [0, 3, 0],
"scale": [0.25, 0.25, 0.25]
},
"gui": {
"rotation": [30, 45, 0],
"scale": [0.625, 0.625, 0.625]
},
"fixed": {
"rotation": [ 0, 270, 0 ],
"scale": [0.5, 0.5, 0.5]
}
}
}

49
src/main/resources/assets/create/models/item/pane.json
View file

@ -1,49 +0,0 @@
{
"credit": "Made with Blockbench",
"elements": [
{
"from": [7, 0, 0],
"to": [9, 16, 16],
"faces": {
"north": {"uv": [7, 0, 9, 16], "texture": "#edge"},
"east": {"uv": [16, 0, 0, 16], "texture": "#pane"},
"south": {"uv": [7, 0, 9, 16], "texture": "#edge"},
"west": {"uv": [0, 0, 16, 16], "texture": "#pane"},
"up": {"uv": [7, 0, 9, 16], "rotation": 180, "texture": "#edge"},
"down": {"uv": [7, 0, 9, 16], "rotation": 180, "texture": "#edge"}
}
}
],
"display": {
"thirdperson_righthand": {
"rotation": [75, 45, 0],
"translation": [0, 2.5, 0],
"scale": [0.375, 0.375, 0.375]
},
"thirdperson_lefthand": {
"rotation": [75, 45, 0],
"translation": [0, 2.5, 0],
"scale": [0.375, 0.375, 0.375]
},
"firstperson_righthand": {
"rotation": [0, 45, 0],
"scale": [0.4, 0.4, 0.4]
},
"firstperson_lefthand": {
"rotation": [0, 225, 0],
"scale": [0.4, 0.4, 0.4]
},
"ground": {
"translation": [0, 3, 0],
"scale": [0.25, 0.25, 0.25]
},
"gui": {
"rotation": [30, 45, 0],
"scale": [0.625, 0.625, 0.625]
},
"fixed": {
"rotation": [ 0, 270, 0 ],
"scale": [0.5, 0.5, 0.5]
}
}
}