Skip to content

Commit

Permalink
Add efficiency addon model
Browse files Browse the repository at this point in the history
  • Loading branch information
@Rearth
Rearth committed Feb 23, 2024
1 parent 2b59c89 commit 139f6c5
Show file tree
Hide file tree
Showing 10 changed files with 329 additions and 20 deletions.
7 changes: 0 additions & 7 deletions src/main/generated/assets/oritech/blockstates/machine_efficiency_addon.json
View file

This file was deleted.

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

This file was deleted.

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

This file was deleted.

4 changes: 0 additions & 4 deletions src/main/java/rearth/oritech/init/datagen/ModelGenerator.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,6 @@ public void generateBlockStateModels(BlockStateModelGenerator blockStateModelGen
blockStateModelGenerator.registerSimpleCubeAll(BlockContent.MACHINE_CORE_BASIC);
blockStateModelGenerator.registerSimpleCubeAll(BlockContent.MACHINE_CORE_GOOD);

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

blockStateModelGenerator.registerSimpleCubeAll(BlockContent.MACHINE_EXTENDER);

}
Expand Down
112 changes: 112 additions & 0 deletions src/main/resources/assets/oritech/blockstates/machine_efficiency_addon.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,112 @@
{
"variants": {
"face=wall,facing=north,addon_used=true": {
"model": "oritech:block/machine_efficiency_addon_on",
"x": 90,
"y": 0
},
"face=wall,facing=north,addon_used=false": {
"model": "oritech:block/machine_efficiency_addon",
"x": 90,
"y": 0
},
"face=wall,facing=south,addon_used=true": {
"model": "oritech:block/machine_efficiency_addon_on",
"x": 90,
"y": 180
},
"face=wall,facing=south,addon_used=false": {
"model": "oritech:block/machine_efficiency_addon",
"x": 90,
"y": 180
},
"face=wall,facing=west,addon_used=true": {
"model": "oritech:block/machine_efficiency_addon_on",
"x": 90,
"y": 270
},
"face=wall,facing=west,addon_used=false": {
"model": "oritech:block/machine_efficiency_addon",
"x": 90,
"y": 270
},
"face=wall,facing=east,addon_used=true": {
"model": "oritech:block/machine_efficiency_addon_on",
"x": 90,
"y": 90
},
"face=wall,facing=east,addon_used=false": {
"model": "oritech:block/machine_efficiency_addon",
"x": 90,
"y": 90
},
"face=floor,facing=north,addon_used=true": {
"model": "oritech:block/machine_efficiency_addon_on"
},
"face=floor,facing=north,addon_used=false": {
"model": "oritech:block/machine_efficiency_addon"
},
"face=floor,facing=south,addon_used=true": {
"model": "oritech:block/machine_efficiency_addon_on",
"y": 180
},
"face=floor,facing=south,addon_used=false": {
"model": "oritech:block/machine_efficiency_addon",
"y": 180
},
"face=floor,facing=west,addon_used=true": {
"model": "oritech:block/machine_efficiency_addon_on",
"y": 270
},
"face=floor,facing=west,addon_used=false": {
"model": "oritech:block/machine_efficiency_addon",
"y": 270
},
"face=floor,facing=east,addon_used=true": {
"model": "oritech:block/machine_efficiency_addon_on",
"y": 90
},
"face=floor,facing=east,addon_used=false": {
"model": "oritech:block/machine_efficiency_addon",
"y": 90
},
"face=ceiling,facing=north,addon_used=true": {
"model": "oritech:block/machine_efficiency_addon_on",
"x": 180,
"y": 180
},
"face=ceiling,facing=north,addon_used=false": {
"model": "oritech:block/machine_efficiency_addon",
"x": 180,
"y": 180
},
"face=ceiling,facing=south,addon_used=true": {
"model": "oritech:block/machine_efficiency_addon_on",
"x": 0
},
"face=ceiling,facing=south,addon_used=false": {
"model": "oritech:block/machine_efficiency_addon",
"x": 0
},
"face=ceiling,facing=west,addon_used=true": {
"model": "oritech:block/machine_efficiency_addon_on",
"x": 180,
"y": 90
},
"face=ceiling,facing=west,addon_used=false": {
"model": "oritech:block/machine_efficiency_addon",
"x": 180,
"y": 90
},
"face=ceiling,facing=east,addon_used=true": {
"model": "oritech:block/machine_efficiency_addon_on",
"x": 180,
"y": 270
},
"face=ceiling,facing=east,addon_used=false": {
"model": "oritech:block/machine_efficiency_addon",
"x": 180,
"y": 270
}
}
}
63 changes: 63 additions & 0 deletions src/main/resources/assets/oritech/models/block/machine_efficiency_addon.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
{
"credit": "Made with Blockbench",
"texture_size": [64, 64],
"textures": {
"0": "oritech:block/machine_efficiency_addon_off",
"particle": "oritech:block/machine_efficiency_addon_off"
},
"elements": [
{
"name": "base",
"from": [1, 0, 1],
"to": [15, 2, 15],
"rotation": {"angle": 0, "axis": "y", "origin": [1, 0, 1]},
"faces": {
"north": {"uv": [6, 7, 9.5, 7.5], "texture": "#0"},
"east": {"uv": [6, 7.5, 9.5, 8], "texture": "#0"},
"south": {"uv": [2, 7.75, 5.5, 8.25], "texture": "#0"},
"west": {"uv": [5.5, 8, 9, 8.5], "texture": "#0"},
"up": {"uv": [3.5, 3.5, 0, 0], "texture": "#0"},
"down": {"uv": [3.5, 3.5, 0, 7], "texture": "#0"}
}
},
{
"from": [4, 2, 3],
"to": [12, 7, 13],
"rotation": {"angle": 0, "axis": "y", "origin": [6, 2, 6]},
"faces": {
"north": {"uv": [6.5, 5.75, 8.5, 7], "texture": "#0"},
"east": {"uv": [3.5, 6.5, 6, 7.75], "texture": "#0"},
"south": {"uv": [0, 7, 2, 8.25], "texture": "#0"},
"west": {"uv": [6.5, 4.5, 9, 5.75], "texture": "#0"},
"up": {"uv": [5.5, 2.5, 3.5, 0], "texture": "#0"},
"down": {"uv": [5.5, 2.5, 3.5, 5], "texture": "#0"}
}
},
{
"from": [12, 2, 2],
"to": [14, 8, 14],
"rotation": {"angle": 0, "axis": "y", "origin": [12, 2, 6]},
"faces": {
"north": {"uv": [3, 8.25, 3.5, 9.75], "texture": "#0"},
"east": {"uv": [5.5, 1.5, 8.5, 3], "texture": "#0"},
"south": {"uv": [3.5, 8.25, 4, 9.75], "texture": "#0"},
"west": {"uv": [5.5, 3, 8.5, 4.5], "texture": "#0"},
"up": {"uv": [1.5, 11.25, 1, 8.25], "texture": "#0"},
"down": {"uv": [2, 8.25, 1.5, 11.25], "texture": "#0"}
}
},
{
"from": [2, 2, 2],
"to": [4, 8, 14],
"rotation": {"angle": 0, "axis": "y", "origin": [4, 2, 10]},
"faces": {
"north": {"uv": [3.5, 8.25, 4, 9.75], "texture": "#0"},
"east": {"uv": [5.5, 3, 8.5, 4.5], "texture": "#0"},
"south": {"uv": [3, 8.25, 3.5, 9.75], "texture": "#0"},
"west": {"uv": [5.5, 1.5, 8.5, 3], "texture": "#0"},
"up": {"uv": [1.5, 11.25, 1, 8.25], "rotation": 180, "texture": "#0"},
"down": {"uv": [2, 8.25, 1.5, 11.25], "rotation": 180, "texture": "#0"}
}
}
]
}
63 changes: 63 additions & 0 deletions src/main/resources/assets/oritech/models/block/machine_efficiency_addon_on.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
{
"credit": "Made with Blockbench",
"texture_size": [64, 64],
"textures": {
"0": "oritech:block/machine_efficiency_addon_on",
"particle": "oritech:block/machine_efficiency_addon_on"
},
"elements": [
{
"name": "base",
"from": [1, 0, 1],
"to": [15, 2, 15],
"rotation": {"angle": 0, "axis": "y", "origin": [1, 0, 1]},
"faces": {
"north": {"uv": [6, 7, 9.5, 7.5], "texture": "#0"},
"east": {"uv": [6, 7.5, 9.5, 8], "texture": "#0"},
"south": {"uv": [2, 7.75, 5.5, 8.25], "texture": "#0"},
"west": {"uv": [5.5, 8, 9, 8.5], "texture": "#0"},
"up": {"uv": [3.5, 3.5, 0, 0], "texture": "#0"},
"down": {"uv": [3.5, 3.5, 0, 7], "texture": "#0"}
}
},
{
"from": [4, 2, 3],
"to": [12, 7, 13],
"rotation": {"angle": 0, "axis": "y", "origin": [6, 2, 6]},
"faces": {
"north": {"uv": [6.5, 5.75, 8.5, 7], "texture": "#0"},
"east": {"uv": [3.5, 6.5, 6, 7.75], "texture": "#0"},
"south": {"uv": [0, 7, 2, 8.25], "texture": "#0"},
"west": {"uv": [6.5, 4.5, 9, 5.75], "texture": "#0"},
"up": {"uv": [5.5, 2.5, 3.5, 0], "texture": "#0"},
"down": {"uv": [5.5, 2.5, 3.5, 5], "texture": "#0"}
}
},
{
"from": [12, 2, 2],
"to": [14, 8, 14],
"rotation": {"angle": 0, "axis": "y", "origin": [12, 2, 6]},
"faces": {
"north": {"uv": [3, 8.25, 3.5, 9.75], "texture": "#0"},
"east": {"uv": [5.5, 1.5, 8.5, 3], "texture": "#0"},
"south": {"uv": [3.5, 8.25, 4, 9.75], "texture": "#0"},
"west": {"uv": [5.5, 3, 8.5, 4.5], "texture": "#0"},
"up": {"uv": [1.5, 11.25, 1, 8.25], "texture": "#0"},
"down": {"uv": [2, 8.25, 1.5, 11.25], "texture": "#0"}
}
},
{
"from": [2, 2, 2],
"to": [4, 8, 14],
"rotation": {"angle": 0, "axis": "y", "origin": [4, 2, 10]},
"faces": {
"north": {"uv": [3.5, 8.25, 4, 9.75], "texture": "#0"},
"east": {"uv": [5.5, 3, 8.5, 4.5], "texture": "#0"},
"south": {"uv": [3, 8.25, 3.5, 9.75], "texture": "#0"},
"west": {"uv": [5.5, 1.5, 8.5, 3], "texture": "#0"},
"up": {"uv": [1.5, 11.25, 1, 8.25], "rotation": 180, "texture": "#0"},
"down": {"uv": [2, 8.25, 1.5, 11.25], "rotation": 180, "texture": "#0"}
}
}
]
}
91 changes: 91 additions & 0 deletions src/main/resources/assets/oritech/models/item/machine_efficiency_addon.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,91 @@
{
"parent": "oritech:block/machine_efficiency_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": [
40,
-45,
0
],
"translation": [
0,
2.75,
0
],
"scale": [
0.8,
0.8,
0.8
]
},
"head": {
"translation": [
-8,
-6.5,
0
]
},
"fixed": {
"translation": [
-4,
-4,
0
],
"scale": [
0.8,
0.8,
0.8
]
}
}
}
Binary file added src/main/resources/assets/oritech/textures/block/machine_efficiency_addon_off.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.
Binary file added src/main/resources/assets/oritech/textures/block/machine_efficiency_addon_on.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 139f6c5

Please sign in to comment.