Skip to content

Commit

Permalink
Add inventory proxy addon model
Browse files Browse the repository at this point in the history
  • Loading branch information
@Rearth
Rearth committed Feb 22, 2024
1 parent 4e49950 commit 2b59c89
Show file tree
Hide file tree
Showing 9 changed files with 321 additions and 18 deletions.
7 changes: 0 additions & 7 deletions src/main/generated/assets/oritech/blockstates/machine_inventory_proxy_addon.json
View file

This file was deleted.

6 changes: 0 additions & 6 deletions src/main/generated/assets/oritech/models/block/machine_inventory_proxy_addon.json
View file

This file was deleted.

3 changes: 0 additions & 3 deletions src/main/generated/assets/oritech/models/item/machine_inventory_proxy_addon.json
View file

This file was deleted.

2 changes: 1 addition & 1 deletion src/main/java/rearth/oritech/client/ui/InventoryProxyScreen.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ protected void build(FlowLayout rootComponent) {
});
buttons.add(button);
overlay.child(getItemFrame(slot.x(), slot.y()));
overlay.child(button.sizing(Sizing.fixed(8)).positioning(Positioning.absolute(slot.x() + 3, slot.y() + 3)));
overlay.child(button.sizing(Sizing.fixed(10)).positioning(Positioning.absolute(slot.x() + 2, slot.y() + 2)));
}

for (int i = 0; i < buttons.size(); i++) {
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/rearth/oritech/init/datagen/ModelGenerator.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public void generateBlockStateModels(BlockStateModelGenerator blockStateModelGen

// blockStateModelGenerator.registerSimpleCubeAll(BlockContent.MACHINE_SPEED_ADDON);
blockStateModelGenerator.registerSimpleCubeAll(BlockContent.MACHINE_EFFICIENCY_ADDON);
blockStateModelGenerator.registerSimpleCubeAll(BlockContent.MACHINE_INVENTORY_PROXY_ADDON);
// blockStateModelGenerator.registerSimpleCubeAll(BlockContent.MACHINE_INVENTORY_PROXY_ADDON);

blockStateModelGenerator.registerSimpleCubeAll(BlockContent.MACHINE_EXTENDER);

Expand Down
58 changes: 58 additions & 0 deletions src/main/resources/assets/oritech/blockstates/machine_inventory_proxy_addon.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
{
"variants": {
"face=wall,facing=north": {
"model": "oritech:block/machine_inventory_proxy_addon",
"x": 90,
"y": 0
},
"face=wall,facing=south": {
"model": "oritech:block/machine_inventory_proxy_addon",
"x": 90,
"y": 180
},
"face=wall,facing=west": {
"model": "oritech:block/machine_inventory_proxy_addon",
"x": 90,
"y": 270
},
"face=wall,facing=east": {
"model": "oritech:block/machine_inventory_proxy_addon",
"x": 90,
"y": 90
},
"face=floor,facing=north": {
"model": "oritech:block/machine_inventory_proxy_addon"
},
"face=floor,facing=south": {
"model": "oritech:block/machine_inventory_proxy_addon",
"y": 180
},
"face=floor,facing=west": {
"model": "oritech:block/machine_inventory_proxy_addon",
"y": 270
},
"face=floor,facing=east": {
"model": "oritech:block/machine_inventory_proxy_addon",
"y": 90
},
"face=ceiling,facing=north": {
"model": "oritech:block/machine_inventory_proxy_addon",
"x": 180,
"y": 180
},
"face=ceiling,facing=south": {
"model": "oritech:block/machine_inventory_proxy_addon",
"x": 0
},
"face=ceiling,facing=west": {
"model": "oritech:block/machine_inventory_proxy_addon",
"x": 180,
"y": 90
},
"face=ceiling,facing=east": {
"model": "oritech:block/machine_inventory_proxy_addon",
"x": 180,
"y": 270
}
}
}
170 changes: 170 additions & 0 deletions src/main/resources/assets/oritech/models/block/machine_inventory_proxy_addon.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,170 @@
{
"credit": "Made with Blockbench",
"texture_size": [128, 128],
"textures": {
"0": "oritech:block/machine_inventory_proxy_addon",
"particle": "oritech:block/machine_inventory_proxy_addon"
},
"elements": [
{
"name": "base",
"from": [1, 0, 1],
"to": [15, 2, 15],
"faces": {
"north": {"uv": [6, 3, 7.75, 3.25], "texture": "#0"},
"east": {"uv": [6, 3.25, 7.75, 3.5], "texture": "#0"},
"south": {"uv": [6, 3.5, 7.75, 3.75], "texture": "#0"},
"west": {"uv": [5.75, 6.75, 7.5, 7], "texture": "#0"},
"up": {"uv": [5.75, 5.5, 4, 3.75], "texture": "#0"},
"down": {"uv": [5.75, 5.5, 4, 7.25], "texture": "#0"}
}
},
{
"name": "chest_like",
"from": [2, 2, 2],
"to": [14, 14, 14],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 2, 7]},
"faces": {
"north": {"uv": [0, 5.625, 1.5, 7.125], "texture": "#0"},
"east": {"uv": [1.5, 5.625, 3, 7.125], "texture": "#0"},
"south": {"uv": [5.75, 3.75, 7.25, 5.25], "texture": "#0"},
"west": {"uv": [5.75, 5.25, 7.25, 6.75], "texture": "#0"},
"up": {"uv": [7.5, 1.5, 6, 0], "texture": "#0"},
"down": {"uv": [7.5, 1.5, 6, 3], "texture": "#0"}
}
},
{
"from": [14, 6, 6],
"to": [16, 10, 10],
"rotation": {"angle": 0, "axis": "y", "origin": [16, 7, 6]},
"faces": {
"north": {"uv": [1.5, 7.375, 1.75, 7.875], "texture": "#0"},
"east": {"uv": [3, 5.625, 3.5, 6.125], "texture": "#0"},
"south": {"uv": [1.75, 7.375, 2, 7.875], "texture": "#0"},
"west": {"uv": [3.5, 5.625, 4, 6.125], "texture": "#0"},
"up": {"uv": [2.25, 7.875, 2, 7.375], "texture": "#0"},
"down": {"uv": [2.5, 7.375, 2.25, 7.875], "texture": "#0"}
}
},
{
"from": [0, 6, 6],
"to": [2, 10, 10],
"rotation": {"angle": 0, "axis": "y", "origin": [2, 7, 6]},
"faces": {
"north": {"uv": [2.5, 7.375, 2.75, 7.875], "texture": "#0"},
"east": {"uv": [3, 6.125, 3.5, 6.625], "texture": "#0"},
"south": {"uv": [2.75, 7.375, 3, 7.875], "texture": "#0"},
"west": {"uv": [3.5, 6.125, 4, 6.625], "texture": "#0"},
"up": {"uv": [3.25, 7.875, 3, 7.375], "texture": "#0"},
"down": {"uv": [3.5, 7.375, 3.25, 7.875], "texture": "#0"}
}
},
{
"from": [6, 6, 0],
"to": [10, 10, 2],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 7, -2]},
"faces": {
"north": {"uv": [3, 6.625, 3.5, 7.125], "texture": "#0"},
"east": {"uv": [3.5, 7.375, 3.75, 7.875], "texture": "#0"},
"south": {"uv": [3.5, 6.625, 4, 7.125], "texture": "#0"},
"west": {"uv": [3.75, 7.375, 4, 7.875], "texture": "#0"},
"up": {"uv": [7.875, 4.125, 7.375, 3.875], "texture": "#0"},
"down": {"uv": [4.5, 7.375, 4, 7.625], "texture": "#0"}
}
},
{
"from": [6, 6, 14],
"to": [10, 10, 16],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 7, 12]},
"faces": {
"north": {"uv": [5.75, 7, 6.25, 7.5], "texture": "#0"},
"east": {"uv": [7.375, 4.125, 7.625, 4.625], "texture": "#0"},
"south": {"uv": [6.25, 7, 6.75, 7.5], "texture": "#0"},
"west": {"uv": [7.375, 4.625, 7.625, 5.125], "texture": "#0"},
"up": {"uv": [7.875, 5.375, 7.375, 5.125], "texture": "#0"},
"down": {"uv": [7.875, 5.375, 7.375, 5.625], "texture": "#0"}
}
},
{
"from": [6, 13, 6],
"to": [10, 16, 10],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 14, 5]},
"faces": {
"north": {"uv": [7.25, 5.875, 7.75, 6.25], "texture": "#0"},
"east": {"uv": [7.25, 6.25, 7.75, 6.625], "texture": "#0"},
"south": {"uv": [0.5, 7.375, 1, 7.75], "texture": "#0"},
"west": {"uv": [1, 7.375, 1.5, 7.75], "texture": "#0"},
"up": {"uv": [7.25, 7.5, 6.75, 7], "texture": "#0"},
"down": {"uv": [0.5, 7.125, 0, 7.625], "texture": "#0"}
}
},
{
"from": [0, 0.02, 5],
"to": [16, 15.02, 6],
"rotation": {"angle": 0, "axis": "y", "origin": [0, 0, 4]},
"faces": {
"north": {"uv": [2, 0, 4, 1.875], "texture": "#0"},
"east": {"uv": [5.125, 7.25, 5.25, 9.125], "texture": "#0"},
"south": {"uv": [2, 1.875, 4, 3.75], "texture": "#0"},
"west": {"uv": [5.25, 7.25, 5.375, 9.125], "texture": "#0"},
"up": {"uv": [4.5, 7.375, 2.5, 7.25], "texture": "#0"},
"down": {"uv": [9.25, 3.75, 7.25, 3.875], "texture": "#0"}
}
},
{
"from": [0, 0.02, 10],
"to": [16, 15.02, 11],
"rotation": {"angle": 0, "axis": "y", "origin": [0, 0, 9]},
"faces": {
"north": {"uv": [0, 0, 2, 1.875], "texture": "#0"},
"east": {"uv": [4.875, 7.25, 5, 9.125], "texture": "#0"},
"south": {"uv": [0, 1.875, 2, 3.75], "texture": "#0"},
"west": {"uv": [5, 7.25, 5.125, 9.125], "texture": "#0"},
"up": {"uv": [2.5, 7.25, 0.5, 7.125], "texture": "#0"},
"down": {"uv": [2.5, 7.25, 0.5, 7.375], "texture": "#0"}
}
},
{
"from": [5, 0.01, 0],
"to": [6, 15.01, 16],
"rotation": {"angle": 0, "axis": "y", "origin": [13, 8, 10.5]},
"faces": {
"north": {"uv": [5.375, 7.25, 5.5, 9.125], "texture": "#0"},
"east": {"uv": [0, 3.75, 2, 5.625], "texture": "#0"},
"south": {"uv": [5.5, 7.25, 5.625, 9.125], "texture": "#0"},
"west": {"uv": [2, 3.75, 4, 5.625], "texture": "#0"},
"up": {"uv": [7.375, 5.875, 7.25, 3.875], "texture": "#0"},
"down": {"uv": [4.625, 7.25, 4.5, 9.25], "texture": "#0"}
}
},
{
"from": [10, 0.01, 0],
"to": [11, 15.01, 16],
"rotation": {"angle": 0, "axis": "y", "origin": [18, 8, 10.5]},
"faces": {
"north": {"uv": [5.625, 7.25, 5.75, 9.125], "texture": "#0"},
"east": {"uv": [4, 0, 6, 1.875], "texture": "#0"},
"south": {"uv": [7.25, 7, 7.375, 8.875], "texture": "#0"},
"west": {"uv": [4, 1.875, 6, 3.75], "texture": "#0"},
"up": {"uv": [4.75, 9.25, 4.625, 7.25], "texture": "#0"},
"down": {"uv": [4.875, 7.25, 4.75, 9.25], "texture": "#0"}
}
}
],
"groups": [
0,
1,
{
"name": "ports",
"origin": [8, 14, 5],
"color": 0,
"children": [2, 3, 4, 5, 6]
},
{
"name": "side_bars",
"origin": [18, 8, 10.5],
"color": 0,
"children": [7, 8, 9, 10]
}
]
}
91 changes: 91 additions & 0 deletions src/main/resources/assets/oritech/models/item/machine_inventory_proxy_addon.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,91 @@
{
"parent": "oritech:block/machine_inventory_proxy_addon",
"display": {
"thirdperson_righthand": {
"translation": [
-2,
0,
0
],
"scale": [
0.4,
0.4,
0.4
]
},
"thirdperson_lefthand": {
"translation": [
2,
0,
0
],
"scale": [
0.4,
0.4,
0.4
]
},
"firstperson_righthand": {
"scale": [
0.4,
0.4,
0.4
]
},
"firstperson_lefthand": {
"scale": [
0.4,
0.4,
0.4
]
},
"ground": {
"translation": [
-4,
0,
0
],
"scale": [
0.3,
0.3,
0.3
]
},
"gui": {
"rotation": [
30,
140,
0
],
"translation": [
0,
0,
0
],
"scale": [
0.6,
0.6,
0.6
]
},
"head": {
"translation": [
-8,
-6.5,
0
]
},
"fixed": {
"translation": [
-4,
-4,
0
],
"scale": [
0.8,
0.8,
0.8
]
}
}
}
Binary file modified src/main/resources/assets/oritech/textures/block/machine_inventory_proxy_addon.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 2b59c89

Please sign in to comment.