From 139f6c50267a3762c0697f22d1193ef2cfec7857 Mon Sep 17 00:00:00 2001 From: rearth Date: Fri, 23 Feb 2024 01:50:42 +0100 Subject: [PATCH] Add efficiency addon model --- .../blockstates/machine_efficiency_addon.json | 7 -- .../block/machine_efficiency_addon.json | 6 - .../models/item/machine_efficiency_addon.json | 3 - .../oritech/init/datagen/ModelGenerator.java | 4 - .../blockstates/machine_efficiency_addon.json | 112 ++++++++++++++++++ .../block/machine_efficiency_addon.json | 63 ++++++++++ .../block/machine_efficiency_addon_on.json | 63 ++++++++++ .../models/item/machine_efficiency_addon.json | 91 ++++++++++++++ .../block/machine_efficiency_addon_off.png | Bin 0 -> 934 bytes .../block/machine_efficiency_addon_on.png | Bin 0 -> 950 bytes 10 files changed, 329 insertions(+), 20 deletions(-) delete mode 100644 src/main/generated/assets/oritech/blockstates/machine_efficiency_addon.json delete mode 100644 src/main/generated/assets/oritech/models/block/machine_efficiency_addon.json delete mode 100644 src/main/generated/assets/oritech/models/item/machine_efficiency_addon.json create mode 100644 src/main/resources/assets/oritech/blockstates/machine_efficiency_addon.json create mode 100644 src/main/resources/assets/oritech/models/block/machine_efficiency_addon.json create mode 100644 src/main/resources/assets/oritech/models/block/machine_efficiency_addon_on.json create mode 100644 src/main/resources/assets/oritech/models/item/machine_efficiency_addon.json create mode 100644 src/main/resources/assets/oritech/textures/block/machine_efficiency_addon_off.png create mode 100644 src/main/resources/assets/oritech/textures/block/machine_efficiency_addon_on.png diff --git a/src/main/generated/assets/oritech/blockstates/machine_efficiency_addon.json b/src/main/generated/assets/oritech/blockstates/machine_efficiency_addon.json deleted file mode 100644 index 22934f04d..000000000 --- a/src/main/generated/assets/oritech/blockstates/machine_efficiency_addon.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "oritech:block/machine_efficiency_addon" - } - } -} \ No newline at end of file diff --git a/src/main/generated/assets/oritech/models/block/machine_efficiency_addon.json b/src/main/generated/assets/oritech/models/block/machine_efficiency_addon.json deleted file mode 100644 index e530a964e..000000000 --- a/src/main/generated/assets/oritech/models/block/machine_efficiency_addon.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "oritech:block/machine_efficiency_addon" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/oritech/models/item/machine_efficiency_addon.json b/src/main/generated/assets/oritech/models/item/machine_efficiency_addon.json deleted file mode 100644 index 833d3ad3b..000000000 --- a/src/main/generated/assets/oritech/models/item/machine_efficiency_addon.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "oritech:block/machine_efficiency_addon" -} \ No newline at end of file diff --git a/src/main/java/rearth/oritech/init/datagen/ModelGenerator.java b/src/main/java/rearth/oritech/init/datagen/ModelGenerator.java index 6623a3373..f2e5994b5 100644 --- a/src/main/java/rearth/oritech/init/datagen/ModelGenerator.java +++ b/src/main/java/rearth/oritech/init/datagen/ModelGenerator.java @@ -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); } diff --git a/src/main/resources/assets/oritech/blockstates/machine_efficiency_addon.json b/src/main/resources/assets/oritech/blockstates/machine_efficiency_addon.json new file mode 100644 index 000000000..7ef234e27 --- /dev/null +++ b/src/main/resources/assets/oritech/blockstates/machine_efficiency_addon.json @@ -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 + } + } +} diff --git a/src/main/resources/assets/oritech/models/block/machine_efficiency_addon.json b/src/main/resources/assets/oritech/models/block/machine_efficiency_addon.json new file mode 100644 index 000000000..06dfb843e --- /dev/null +++ b/src/main/resources/assets/oritech/models/block/machine_efficiency_addon.json @@ -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"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/oritech/models/block/machine_efficiency_addon_on.json b/src/main/resources/assets/oritech/models/block/machine_efficiency_addon_on.json new file mode 100644 index 000000000..bcbc172e4 --- /dev/null +++ b/src/main/resources/assets/oritech/models/block/machine_efficiency_addon_on.json @@ -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"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/oritech/models/item/machine_efficiency_addon.json b/src/main/resources/assets/oritech/models/item/machine_efficiency_addon.json new file mode 100644 index 000000000..d9b46e211 --- /dev/null +++ b/src/main/resources/assets/oritech/models/item/machine_efficiency_addon.json @@ -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 + ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/oritech/textures/block/machine_efficiency_addon_off.png b/src/main/resources/assets/oritech/textures/block/machine_efficiency_addon_off.png new file mode 100644 index 0000000000000000000000000000000000000000..74ff9f6e714a7b7b85df5d8c73045447d197411b GIT binary patch literal 934 zcmV;X16lluP)iJjF+_qfjMcTOWVryb0rm>S1}Jvr0{~iPpC#(#Ygv{Ha1S7DsEh$J${0`-aH@V< zQpsttqaI+h+hMcY5p{=jvZyk09ykqG4F%r-~o#UFhd*o+I>CvAzz!^M;j5?{cz!YaN&(0?F5MGUPSB z7vP`5tQBC*j=cr68J=i=ziA37+7Af;in_X}W`-;oAk$b-SY@6m+E`e$q7D(n2I##0 zIECD)p7B?tPuf{{450Zi7A~F&Y6h6kdjUY7FqOB?hi`vkk`|}B1R5&*Xd5p`l-tG& z&`{y0se%qBOF(IajfF)ZkERxChz-zHekZN_UYFk#0ARA?pj3D={u=DI1pxqeH(e;K zszl^1yK@8)Apf>MQD&aZe7~aJ>JAP1(QVr8$pxDtCLO7OsVR%<>yZyQ3;A75D!jOLl5xe>^}hUHM-Dq1KFJF_iN;P@Bz^#C; zGvz>J7e0EbMFQd{(Bajvsvp@a9HowgH_*;b36mZ5(%d`anXGAcs=NY#p(`uvJBB!+D(u47_0umcSD8UwH_&5V=3!CzZu)z z+u?K%F#f1iED5Shly@!}ZSHKfBxRo#!|`9~kWXe&?Kf&hPxrZ}O+0^74iF!+z1=%>qduR8dDx{ zu%c2^{%dswz~;nC_4}YXdBCIr^iT%Ac5g2*FRuC#Z~A(q;eoAp`@IO?;PGazwTt0_ z^m{oS(jMOpuvcN)1E9^e{R${EJn=w4H-!`rKmY)%-%m6%WXb@!#)1Qf^)p3(e=M6B zjv)*i;8yqJ40?xr#a|hH()Pk)0Lh2ZaPdqKGr-dR7XZ`=Q|ah@^yWt@X>p=kpu_4% z+hlRF+%{Q^4y&K!5L6H~K&P(-fH-l<5R!}*hPQyf@^)7BURPe{0ARYSTo@S+0swj} zVF19uh7%*hK~z(`N8kbD@AfAv^plzIR^>v1-2te+^ z>CDOlAsYiMdB@S{_Na8Tb2Bozvi$t%Ln1+u2gKm?dvXv@&i(@+?$Pq@J9rcimBT)6&JvjB)U(9yN1tRKlM>}B?(H;~RwanoIO!s1)) zm8@=Z$h-o8rYon)C7ITWrg}rV{ZDG|OK|T$i-(rGLt@Ih|9lW}S0q_h9(t75Salb^ zXb#v_;})_tR;ujNn~9x$9M1L=jqC=VJgf0PO+Lh8ckN02mAggTY`h7z_r3!C){L3