Skip to content

Commit

Permalink
Merge pull request #121 from Ferdzz/copper-ingot
Browse files Browse the repository at this point in the history 
Add copper ingot models & texture
  • Loading branch information
@Ferdzz
Ferdzz committed Oct 5, 2023
2 parents 96d6d5c + ab7ac70 commit be70924
Show file tree
Hide file tree
Showing 10 changed files with 357 additions and 1 deletion.
7 changes: 7 additions & 0 deletions Forge/src/main/java/me/ferdz/placeableitems/init/PlaceableItemsBlockRegistry.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,8 @@ public final class PlaceableItemsBlockRegistry {
public static PlaceableItemsBlock COOKED_RABBIT;
@WikiDefinition(model = "cookie/cookie_4")
public static PlaceableItemsBlock COOKIE;
@WikiDefinition(model = "ingot/copper_ingot_6")
public static PlaceableItemsBlock COPPER_INGOT;
@WikiDefinition public static PlaceableItemsBlock DIAMOND;
@WikiDefinition(model = "axe/wooden_axe", textures = {
@WikiDefinition.Texture(name = "wooden_axe", texture = "axe/diamond_axxe")
Expand Down Expand Up @@ -437,6 +439,11 @@ public static void onBlocksRegistry(final RegistryEvent.Register<Block> event) {
.build()
.setShape(VoxelShapesUtil.create(12, 6, 12))
.register("cookie_block", Items.COOKIE, registry);
COPPER_INGOT = new PlaceableItemsBlockBuilder()
.addComponent(new StackableBlockComponent(6))
.build()
.setShape(VoxelShapesUtil.create(16, 6, 16))
.register("copper_ingot_block", Items.COPPER_INGOT, registry);
DIAMOND = new PlaceableItemsBlockBuilder()
.build()
.setShape(VoxelShapesUtil.create(7, 7, 7))
Expand Down
10 changes: 10 additions & 0 deletions Forge/src/main/resources/assets/placeableitems/blockstates/copper_ingot_block.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"variants": {
"count=1": { "model": "placeableitems:block/ingot/copper_ingot_1" },
"count=2": { "model": "placeableitems:block/ingot/copper_ingot_2" },
"count=3": { "model": "placeableitems:block/ingot/copper_ingot_3" },
"count=4": { "model": "placeableitems:block/ingot/copper_ingot_4" },
"count=5": { "model": "placeableitems:block/ingot/copper_ingot_5" },
"count=6": { "model": "placeableitems:block/ingot/copper_ingot_6" }
}
}
24 changes: 24 additions & 0 deletions Forge/src/main/resources/assets/placeableitems/models/block/ingot/copper_ingot_1.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
{
"credit": "Designed by MasterianoX",
"texture_size": [32, 32],
"loader": "placeableitems:rotation",
"textures": {
"0": "placeableitems:block/copper_ingot",
"particle": "placeableitems:block/copper_ingot"
},
"elements": [
{
"from": [5.5, 0, 4],
"to": [10.5, 3, 12],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]},
"faces": {
"north": {"uv": [4, 4, 6.5, 5.5], "texture": "#0"},
"east": {"uv": [0, 4, 4, 5.5], "texture": "#0"},
"south": {"uv": [10.5, 4, 13, 5.5], "texture": "#0"},
"west": {"uv": [6.5, 4, 10.5, 5.5], "texture": "#0"},
"up": {"uv": [6.5, 4, 4, 0], "texture": "#0"},
"down": {"uv": [9, 0, 6.5, 4], "texture": "#0"}
}
}
]
}
37 changes: 37 additions & 0 deletions Forge/src/main/resources/assets/placeableitems/models/block/ingot/copper_ingot_2.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
{
"credit": "Designed by MasterianoX",
"texture_size": [32, 32],
"loader": "placeableitems:rotation",
"textures": {
"0": "placeableitems:block/copper_ingot",
"particle": "placeableitems:block/copper_ingot"
},
"elements": [
{
"from": [8, 0, 4],
"to": [13, 3, 12],
"rotation": {"angle": 0, "axis": "y", "origin": [10.5, 0, 8]},
"faces": {
"north": {"uv": [4, 4, 6.5, 5.5], "texture": "#0"},
"east": {"uv": [0, 4, 4, 5.5], "texture": "#0"},
"south": {"uv": [10.5, 4, 13, 5.5], "texture": "#0"},
"west": {"uv": [6.5, 4, 10.5, 5.5], "texture": "#0"},
"up": {"uv": [6.5, 4, 4, 0], "texture": "#0"},
"down": {"uv": [9, 0, 6.5, 4], "texture": "#0"}
}
},
{
"from": [3, 0, 4],
"to": [8, 3, 12],
"rotation": {"angle": 0, "axis": "y", "origin": [5.5, 0, 8]},
"faces": {
"north": {"uv": [4, 4, 6.5, 5.5], "texture": "#0"},
"east": {"uv": [0, 4, 4, 5.5], "texture": "#0"},
"south": {"uv": [10.5, 4, 13, 5.5], "texture": "#0"},
"west": {"uv": [6.5, 4, 10.5, 5.5], "texture": "#0"},
"up": {"uv": [6.5, 4, 4, 0], "texture": "#0"},
"down": {"uv": [9, 0, 6.5, 4], "texture": "#0"}
}
}
]
}
50 changes: 50 additions & 0 deletions Forge/src/main/resources/assets/placeableitems/models/block/ingot/copper_ingot_3.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
{
"credit": "Designed by MasterianoX",
"texture_size": [32, 32],
"loader": "placeableitems:rotation",
"textures": {
"0": "placeableitems:block/copper_ingot",
"particle": "placeableitems:block/copper_ingot"
},
"elements": [
{
"from": [5.5, 0, 4],
"to": [10.5, 3, 12],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]},
"faces": {
"north": {"uv": [4, 4, 6.5, 5.5], "texture": "#0"},
"east": {"uv": [0, 4, 4, 5.5], "texture": "#0"},
"south": {"uv": [10.5, 4, 13, 5.5], "texture": "#0"},
"west": {"uv": [6.5, 4, 10.5, 5.5], "texture": "#0"},
"up": {"uv": [6.5, 4, 4, 0], "texture": "#0"},
"down": {"uv": [9, 0, 6.5, 4], "texture": "#0"}
}
},
{
"from": [10.5, 0, 4],
"to": [15.5, 3, 12],
"rotation": {"angle": 0, "axis": "y", "origin": [13, 0, 8]},
"faces": {
"north": {"uv": [4, 4, 6.5, 5.5], "texture": "#0"},
"east": {"uv": [0, 4, 4, 5.5], "texture": "#0"},
"south": {"uv": [10.5, 4, 13, 5.5], "texture": "#0"},
"west": {"uv": [6.5, 4, 10.5, 5.5], "texture": "#0"},
"up": {"uv": [6.5, 4, 4, 0], "texture": "#0"},
"down": {"uv": [9, 0, 6.5, 4], "texture": "#0"}
}
},
{
"from": [0.5, 0, 4],
"to": [5.5, 3, 12],
"rotation": {"angle": 0, "axis": "y", "origin": [3, 0, 8]},
"faces": {
"north": {"uv": [4, 4, 6.5, 5.5], "texture": "#0"},
"east": {"uv": [0, 4, 4, 5.5], "texture": "#0"},
"south": {"uv": [10.5, 4, 13, 5.5], "texture": "#0"},
"west": {"uv": [6.5, 4, 10.5, 5.5], "texture": "#0"},
"up": {"uv": [6.5, 4, 4, 0], "texture": "#0"},
"down": {"uv": [9, 0, 6.5, 4], "texture": "#0"}
}
}
]
}
63 changes: 63 additions & 0 deletions Forge/src/main/resources/assets/placeableitems/models/block/ingot/copper_ingot_4.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
{
"credit": "Designed by MasterianoX",
"texture_size": [32, 32],
"loader": "placeableitems:rotation",
"textures": {
"0": "placeableitems:block/copper_ingot",
"particle": "placeableitems:block/copper_ingot"
},
"elements": [
{
"from": [5.5, 0, 4],
"to": [10.5, 3, 12],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]},
"faces": {
"north": {"uv": [4, 4, 6.5, 5.5], "texture": "#0"},
"east": {"uv": [0, 4, 4, 5.5], "texture": "#0"},
"south": {"uv": [10.5, 4, 13, 5.5], "texture": "#0"},
"west": {"uv": [6.5, 4, 10.5, 5.5], "texture": "#0"},
"up": {"uv": [6.5, 4, 4, 0], "texture": "#0"},
"down": {"uv": [9, 0, 6.5, 4], "texture": "#0"}
}
},
{
"from": [5.5, 3, 4],
"to": [10.5, 6, 12],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 3, 8]},
"faces": {
"north": {"uv": [4, 4, 6.5, 5.5], "texture": "#0"},
"east": {"uv": [0, 4, 4, 5.5], "texture": "#0"},
"south": {"uv": [10.5, 4, 13, 5.5], "texture": "#0"},
"west": {"uv": [6.5, 4, 10.5, 5.5], "texture": "#0"},
"up": {"uv": [6.5, 4, 4, 0], "texture": "#0"},
"down": {"uv": [9, 0, 6.5, 4], "texture": "#0"}
}
},
{
"from": [10.5, 0, 4],
"to": [15.5, 3, 12],
"rotation": {"angle": 0, "axis": "y", "origin": [13, 0, 8]},
"faces": {
"north": {"uv": [4, 4, 6.5, 5.5], "texture": "#0"},
"east": {"uv": [0, 4, 4, 5.5], "texture": "#0"},
"south": {"uv": [10.5, 4, 13, 5.5], "texture": "#0"},
"west": {"uv": [6.5, 4, 10.5, 5.5], "texture": "#0"},
"up": {"uv": [6.5, 4, 4, 0], "texture": "#0"},
"down": {"uv": [9, 0, 6.5, 4], "texture": "#0"}
}
},
{
"from": [0.5, 0, 4],
"to": [5.5, 3, 12],
"rotation": {"angle": 0, "axis": "y", "origin": [3, 0, 8]},
"faces": {
"north": {"uv": [4, 4, 6.5, 5.5], "texture": "#0"},
"east": {"uv": [0, 4, 4, 5.5], "texture": "#0"},
"south": {"uv": [10.5, 4, 13, 5.5], "texture": "#0"},
"west": {"uv": [6.5, 4, 10.5, 5.5], "texture": "#0"},
"up": {"uv": [6.5, 4, 4, 0], "texture": "#0"},
"down": {"uv": [9, 0, 6.5, 4], "texture": "#0"}
}
}
]
}
76 changes: 76 additions & 0 deletions Forge/src/main/resources/assets/placeableitems/models/block/ingot/copper_ingot_5.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
{
"credit": "Designed by MasterianoX",
"texture_size": [32, 32],
"loader": "placeableitems:rotation",
"textures": {
"0": "placeableitems:block/copper_ingot",
"particle": "placeableitems:block/copper_ingot"
},
"elements": [
{
"from": [5.5, 0, 4],
"to": [10.5, 3, 12],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]},
"faces": {
"north": {"uv": [4, 4, 6.5, 5.5], "texture": "#0"},
"east": {"uv": [0, 4, 4, 5.5], "texture": "#0"},
"south": {"uv": [10.5, 4, 13, 5.5], "texture": "#0"},
"west": {"uv": [6.5, 4, 10.5, 5.5], "texture": "#0"},
"up": {"uv": [6.5, 4, 4, 0], "texture": "#0"},
"down": {"uv": [9, 0, 6.5, 4], "texture": "#0"}
}
},
{
"from": [8, 3, 4],
"to": [13, 6, 12],
"rotation": {"angle": 0, "axis": "y", "origin": [10.5, 3, 8]},
"faces": {
"north": {"uv": [4, 4, 6.5, 5.5], "texture": "#0"},
"east": {"uv": [0, 4, 4, 5.5], "texture": "#0"},
"south": {"uv": [10.5, 4, 13, 5.5], "texture": "#0"},
"west": {"uv": [6.5, 4, 10.5, 5.5], "texture": "#0"},
"up": {"uv": [6.5, 4, 4, 0], "texture": "#0"},
"down": {"uv": [9, 0, 6.5, 4], "texture": "#0"}
}
},
{
"from": [3, 3, 4],
"to": [8, 6, 12],
"rotation": {"angle": 0, "axis": "y", "origin": [5.5, 3, 8]},
"faces": {
"north": {"uv": [4, 4, 6.5, 5.5], "texture": "#0"},
"east": {"uv": [0, 4, 4, 5.5], "texture": "#0"},
"south": {"uv": [10.5, 4, 13, 5.5], "texture": "#0"},
"west": {"uv": [6.5, 4, 10.5, 5.5], "texture": "#0"},
"up": {"uv": [6.5, 4, 4, 0], "texture": "#0"},
"down": {"uv": [9, 0, 6.5, 4], "texture": "#0"}
}
},
{
"from": [10.5, 0, 4],
"to": [15.5, 3, 12],
"rotation": {"angle": 0, "axis": "y", "origin": [13, 0, 8]},
"faces": {
"north": {"uv": [4, 4, 6.5, 5.5], "texture": "#0"},
"east": {"uv": [0, 4, 4, 5.5], "texture": "#0"},
"south": {"uv": [10.5, 4, 13, 5.5], "texture": "#0"},
"west": {"uv": [6.5, 4, 10.5, 5.5], "texture": "#0"},
"up": {"uv": [6.5, 4, 4, 0], "texture": "#0"},
"down": {"uv": [9, 0, 6.5, 4], "texture": "#0"}
}
},
{
"from": [0.5, 0, 4],
"to": [5.5, 3, 12],
"rotation": {"angle": 0, "axis": "y", "origin": [3, 0, 8]},
"faces": {
"north": {"uv": [4, 4, 6.5, 5.5], "texture": "#0"},
"east": {"uv": [0, 4, 4, 5.5], "texture": "#0"},
"south": {"uv": [10.5, 4, 13, 5.5], "texture": "#0"},
"west": {"uv": [6.5, 4, 10.5, 5.5], "texture": "#0"},
"up": {"uv": [6.5, 4, 4, 0], "texture": "#0"},
"down": {"uv": [9, 0, 6.5, 4], "texture": "#0"}
}
}
]
}
89 changes: 89 additions & 0 deletions Forge/src/main/resources/assets/placeableitems/models/block/ingot/copper_ingot_6.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,89 @@
{
"credit": "Designed by MasterianoX",
"texture_size": [32, 32],
"loader": "placeableitems:rotation",
"textures": {
"0": "placeableitems:block/copper_ingot",
"particle": "placeableitems:block/copper_ingot"
},
"elements": [
{
"from": [5.5, 0, 4],
"to": [10.5, 3, 12],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]},
"faces": {
"north": {"uv": [4, 4, 6.5, 5.5], "texture": "#0"},
"east": {"uv": [0, 4, 4, 5.5], "texture": "#0"},
"south": {"uv": [10.5, 4, 13, 5.5], "texture": "#0"},
"west": {"uv": [6.5, 4, 10.5, 5.5], "texture": "#0"},
"up": {"uv": [6.5, 4, 4, 0], "texture": "#0"},
"down": {"uv": [9, 0, 6.5, 4], "texture": "#0"}
}
},
{
"from": [5.5, 6, 4],
"to": [10.5, 9, 12],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 6, 8]},
"faces": {
"north": {"uv": [4, 4, 6.5, 5.5], "texture": "#0"},
"east": {"uv": [0, 4, 4, 5.5], "texture": "#0"},
"south": {"uv": [10.5, 4, 13, 5.5], "texture": "#0"},
"west": {"uv": [6.5, 4, 10.5, 5.5], "texture": "#0"},
"up": {"uv": [6.5, 4, 4, 0], "texture": "#0"},
"down": {"uv": [9, 0, 6.5, 4], "texture": "#0"}
}
},
{
"from": [8, 3, 4],
"to": [13, 6, 12],
"rotation": {"angle": 0, "axis": "y", "origin": [10.5, 3, 8]},
"faces": {
"north": {"uv": [4, 4, 6.5, 5.5], "texture": "#0"},
"east": {"uv": [0, 4, 4, 5.5], "texture": "#0"},
"south": {"uv": [10.5, 4, 13, 5.5], "texture": "#0"},
"west": {"uv": [6.5, 4, 10.5, 5.5], "texture": "#0"},
"up": {"uv": [6.5, 4, 4, 0], "texture": "#0"},
"down": {"uv": [9, 0, 6.5, 4], "texture": "#0"}
}
},
{
"from": [3, 3, 4],
"to": [8, 6, 12],
"rotation": {"angle": 0, "axis": "y", "origin": [5.5, 3, 8]},
"faces": {
"north": {"uv": [4, 4, 6.5, 5.5], "texture": "#0"},
"east": {"uv": [0, 4, 4, 5.5], "texture": "#0"},
"south": {"uv": [10.5, 4, 13, 5.5], "texture": "#0"},
"west": {"uv": [6.5, 4, 10.5, 5.5], "texture": "#0"},
"up": {"uv": [6.5, 4, 4, 0], "texture": "#0"},
"down": {"uv": [9, 0, 6.5, 4], "texture": "#0"}
}
},
{
"from": [10.5, 0, 4],
"to": [15.5, 3, 12],
"rotation": {"angle": 0, "axis": "y", "origin": [13, 0, 8]},
"faces": {
"north": {"uv": [4, 4, 6.5, 5.5], "texture": "#0"},
"east": {"uv": [0, 4, 4, 5.5], "texture": "#0"},
"south": {"uv": [10.5, 4, 13, 5.5], "texture": "#0"},
"west": {"uv": [6.5, 4, 10.5, 5.5], "texture": "#0"},
"up": {"uv": [6.5, 4, 4, 0], "texture": "#0"},
"down": {"uv": [9, 0, 6.5, 4], "texture": "#0"}
}
},
{
"from": [0.5, 0, 4],
"to": [5.5, 3, 12],
"rotation": {"angle": 0, "axis": "y", "origin": [3, 0, 8]},
"faces": {
"north": {"uv": [4, 4, 6.5, 5.5], "texture": "#0"},
"east": {"uv": [0, 4, 4, 5.5], "texture": "#0"},
"south": {"uv": [10.5, 4, 13, 5.5], "texture": "#0"},
"west": {"uv": [6.5, 4, 10.5, 5.5], "texture": "#0"},
"up": {"uv": [6.5, 4, 4, 0], "texture": "#0"},
"down": {"uv": [9, 0, 6.5, 4], "texture": "#0"}
}
}
]
}
Binary file added Forge/src/main/resources/assets/placeableitems/textures/block/copper_ingot.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion wiki/data.json
View file

Large diffs are not rendered by default.

0 comments on commit be70924

Please sign in to comment.