Skip to content

Commit

Permalink
Add fertilizer frame port, add block placer model
Browse files Browse the repository at this point in the history
  • Loading branch information
@Rearth
Rearth committed Apr 16, 2024
1 parent 661cdb2 commit ab0d0d1
Show file tree
Hide file tree
Showing 10 changed files with 314 additions and 79 deletions.
19 changes: 9 additions & 10 deletions src/main/generated/.cache/19c08d24c255c2719fbb8ac01f9dff290b763461
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 1.20.4 2024-04-16T18:45:26.8357641 Oritech/Model Definitions
// 1.20.4 2024-04-16T21:07:32.0724271 Oritech/Model Definitions
b4b5bb16cd9934be2399058ea8772b23ac699345 assets\oritech\models\item\exo_chestplate.json
0ea8315aed10abcf90ec950fee0062aed26075cb assets\oritech\models\item\energy_pipe.json
8ede0997449fd1c3f65a07df184768a843b473ed assets\oritech\models\item\centrifuge_block.json
Expand All @@ -9,26 +9,25 @@ e6f197ee5ac22cd68bc502a86d40b65bfe40884a assets\oritech\models\item\target_desig
7eb395cd65df72caf43bedc54067cbf53940fd6c assets\oritech\blockstates\lava_generator_block.json
7eb395cd65df72caf43bedc54067cbf53940fd6c assets\oritech\blockstates\centrifuge_block.json
8ef5ff056a3d2fa26393ec9ccb4b6f3b410f8be8 assets\oritech\models\item\item_pipe.json
b91305cbccecb97f9d74e2b92787ae9fa6387786 assets\oritech\blockstates\fluid_pipe.json
7eb395cd65df72caf43bedc54067cbf53940fd6c assets\oritech\blockstates\fragment_forge_block.json
7eb395cd65df72caf43bedc54067cbf53940fd6c assets\oritech\blockstates\big_solar_panel_block.json
b91305cbccecb97f9d74e2b92787ae9fa6387786 assets\oritech\blockstates\fluid_pipe.json
98d62a615b70fca694eb00c6b8aa9297c4a92b62 assets\oritech\blockstates\energy_pipe_connection.json
7eb395cd65df72caf43bedc54067cbf53940fd6c assets\oritech\blockstates\big_solar_panel_block.json
ff8c539de2afd50edaef11008239ffb8e08c66de assets\oritech\models\block\pump_trunk_block.json
3e5d7c884b038c90ab274adde5d4c3657b3895ae assets\oritech\models\item\exo_boots.json
3ceff0ef4325bb269831205626285bc857c60de8 assets\oritech\models\item\destroyer_block.json
829faf2dfb04c9aea2dd6c971037fbfdaa9aa389 assets\oritech\models\item\pump_block.json
7eb395cd65df72caf43bedc54067cbf53940fd6c assets\oritech\blockstates\pulverizer_block.json
7eb395cd65df72caf43bedc54067cbf53940fd6c assets\oritech\blockstates\laser_arm_block.json
7eb395cd65df72caf43bedc54067cbf53940fd6c assets\oritech\blockstates\pulverizer_block.json
e4497bad8afbd4f4b4e830d892284a05718b06dd assets\oritech\models\block\machine_core_basic.json
505d30e3b61ee0ba1f2616e1226689e2cdb7ab58 assets\oritech\models\block\addon_indicator_block.json
9e1e897bfc5831f5d050ccdbe781ddc814d86d7d assets\oritech\models\item\fuel_generator_block.json
a5651b8d4a27308b40c404f7cd3abcf9769b64b6 assets\oritech\models\item\machine_core_basic.json
fb03aa413ddd02d32aca58d75003db4dbc224080 assets\oritech\models\item\exo_leggings.json
7eb395cd65df72caf43bedc54067cbf53940fd6c assets\oritech\blockstates\pump_block.json
7eb395cd65df72caf43bedc54067cbf53940fd6c assets\oritech\blockstates\basic_generator_block.json
2f7dfa17792770a034a13f117e6b8b1942b459e4 assets\oritech\models\block\placer_block.json
ee822d455f99c8c53c789fdb744979f678ca2729 assets\oritech\blockstates\fertilizer_block.json
46af77abe62b29d232feadccde429fd59d5603fc assets\oritech\blockstates\placer_block.json
433b29c70aa324b6255f9a01a08ea1fb562e82d1 assets\oritech\blockstates\fertilizer_block.json
7db08abb2bf7a445cd5d747e05cba610231b2547 assets\oritech\blockstates\placer_block.json
3d37038977380bd685f913e722cc3b1c3a25c35d assets\oritech\models\item\atomic_forge_block.json
eafe84c787830ab2a866e0878e9ed718d58659f5 assets\oritech\blockstates\banana_block.json
b5ee97616ae0d2da17dfaecf45aa42f2cf19f691 assets\oritech\blockstates\machine_extender.json
Expand All @@ -45,20 +44,20 @@ c0a08ce14172e22abd9f55d82686f7e96e74834a assets\oritech\blockstates\large_storag
230eb8fa77942cdf46509bea8df75b48f82e9e8e assets\oritech\blockstates\machine_frame_block.json
7490d9bdd19f3bb73de89d7e68af4f576c3d4749 assets\oritech\models\item\exo_helmet.json
9caec2452545622571a137712307b8e0e669af9e assets\oritech\models\block\block_fertilizer_head.json
54472f85797924c842326a60299d72263cb2c301 assets\oritech\blockstates\block_destroyer_head.json
7eb395cd65df72caf43bedc54067cbf53940fd6c assets\oritech\blockstates\atomic_forge_block.json
54472f85797924c842326a60299d72263cb2c301 assets\oritech\blockstates\block_destroyer_head.json
ff59e92a557b29eeb7f85b1c15ef206c5b99aff6 assets\oritech\models\item\foundry_block.json
907e1d1717c926ebc0455ebe3291c7e917eb74d2 assets\oritech\models\item\basic_generator_block.json
c641d411ad252487b93d779cee9028b9ee920281 assets\oritech\blockstates\machine_core_basic.json
78f4a2e5abfbdcb3a8cd6f797ad3aa776614617d assets\oritech\blockstates\pump_trunk_block.json
c641d411ad252487b93d779cee9028b9ee920281 assets\oritech\blockstates\machine_core_basic.json
70cd17a84bf2d31647992ee3d21766ca5ea23151 assets\oritech\models\item\fragment_forge_block.json
a5afa0ba8780ec08bd0a9284bc08e0c681fe7158 assets\oritech\blockstates\block_placer_head.json
7eb395cd65df72caf43bedc54067cbf53940fd6c assets\oritech\blockstates\assembler_block.json
5054284e6d5fe0785ac93bdda5101c47337953cf assets\oritech\models\item\machine_frame_block.json
7b3ae67ec28f9b36b96539cd48b92096861d0853 assets\oritech\models\item\oil_bucket.json
1b9cd3719105dc1e03398de41f2cab37337816fe assets\oritech\blockstates\machine_core_good.json
7eb395cd65df72caf43bedc54067cbf53940fd6c assets\oritech\blockstates\powered_furnace_block.json
ccd7e87c2ba5a5062bb88aa6e103d49d47cd56ff assets\oritech\blockstates\energy_pipe.json
1b9cd3719105dc1e03398de41f2cab37337816fe assets\oritech\blockstates\machine_core_good.json
5462a2453fcdd2f8b99129894aec60f282d29ca9 assets\oritech\models\item\pulverizer_block.json
ae8496aa356910304cb7036f1290ca3f7d76437e assets\oritech\models\item\item_filter_block.json
a3f9b72f6f36d42af4e5c3a87d7e180b2e36a2ed assets\oritech\models\item\machine_core_good.json
Expand Down
14 changes: 13 additions & 1 deletion src/main/generated/assets/oritech/blockstates/fertilizer_block.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,19 @@
{
"variants": {
"": {
"facing=east": {
"model": "oritech:block/fertilizer_block",
"y": 90
},
"facing=north": {
"model": "oritech:block/fertilizer_block"
},
"facing=south": {
"model": "oritech:block/fertilizer_block",
"y": 180
},
"facing=west": {
"model": "oritech:block/fertilizer_block",
"y": 270
}
}
}
14 changes: 13 additions & 1 deletion src/main/generated/assets/oritech/blockstates/placer_block.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,19 @@
{
"variants": {
"": {
"facing=east": {
"model": "oritech:block/placer_block",
"y": 90
},
"facing=north": {
"model": "oritech:block/placer_block"
},
"facing=south": {
"model": "oritech:block/placer_block",
"y": 180
},
"facing=west": {
"model": "oritech:block/placer_block",
"y": 270
}
}
}
6 changes: 0 additions & 6 deletions src/main/generated/assets/oritech/models/block/placer_block.json
View file

This file was deleted.

1 change: 1 addition & 0 deletions src/main/java/rearth/oritech/client/init/ModRenderers.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ public static void registerRenderers() {
BlockRenderLayerMap.INSTANCE.putBlock(BlockContent.CROP_FILTER_ADDON, RenderLayer.getCutout());
BlockRenderLayerMap.INSTANCE.putBlock(BlockContent.LARGE_STORAGE_BLOCK, RenderLayer.getCutout());
BlockRenderLayerMap.INSTANCE.putBlock(BlockContent.FERTILIZER_BLOCK, RenderLayer.getCutout());
BlockRenderLayerMap.INSTANCE.putBlock(BlockContent.PLACER_BLOCK, RenderLayer.getCutout());

// fluids
FluidRenderHandlerRegistry.INSTANCE.register(FluidContent.STILL_OIL, FluidContent.FLOWING_OIL, new SimpleFluidRenderHandler(
Expand Down
7 changes: 4 additions & 3 deletions src/main/java/rearth/oritech/init/datagen/ModelGenerator.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,10 @@ public void generateBlockStateModels(BlockStateModelGenerator blockStateModelGen
blockStateModelGenerator.registerSimpleState(BlockContent.SMALL_STORAGE_BLOCK);
blockStateModelGenerator.registerSimpleState(BlockContent.LARGE_STORAGE_BLOCK);

blockStateModelGenerator.registerSimpleCubeAll(BlockContent.PLACER_BLOCK);
blockStateModelGenerator.registerNorthDefaultHorizontalRotation(BlockContent.PLACER_BLOCK);
blockStateModelGenerator.registerSimpleCubeAll(BlockContent.DESTROYER_BLOCK);
blockStateModelGenerator.registerSimpleState(BlockContent.FERTILIZER_BLOCK);
// blockStateModelGenerator.registerSimpleState(BlockContent.FERTILIZER_BLOCK);
blockStateModelGenerator.registerNorthDefaultHorizontalRotation(BlockContent.FERTILIZER_BLOCK);

blockStateModelGenerator.registerStateWithModelReference(BlockContent.PUMP_BLOCK, BlockContent.MACHINE_SPEED_ADDON);

Expand Down Expand Up @@ -76,6 +77,6 @@ public void generateItemModels(ItemModelGenerator itemModelGenerator) {
itemModelGenerator.register(ToolsContent.EXO_CHESTPLATE, Models.GENERATED);
itemModelGenerator.register(ToolsContent.EXO_LEGGINGS, Models.GENERATED);
itemModelGenerator.register(ToolsContent.EXO_BOOTS, Models.GENERATED);
// itemModelGenerator.registerArmor((ArmorItem) ToolsContent.EXO_HELMET); // this would generate it compatible with armor trims
// itemModelGenerator.registerArmor((ArmorItem) ToolsContent.EXO_HELMET); // this seems to generate it compatible with armor trims
}
}
129 changes: 71 additions & 58 deletions src/main/resources/assets/oritech/models/block/fertilizer_block.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"credit": "Made with Blockbench",
"texture_size": [64, 64],
"textures": {
"0": "oritech:block/fertilizer_block",
"2": "oritech:block/fertilizer_block",
"particle": "oritech:block/machine_particle_texture"
},
"elements": [
Expand All @@ -11,52 +11,38 @@
"to": [15.01, 2.01, 15.01],
"rotation": {"angle": 0, "axis": "y", "origin": [-5, -11, 0]},
"faces": {
"north": {"uv": [10, 2.25, 13.5, 2.75], "texture": "#0"},
"east": {"uv": [10, 2.75, 13.5, 3.25], "texture": "#0"},
"south": {"uv": [10, 3.25, 13.5, 3.75], "texture": "#0"},
"west": {"uv": [10, 3.75, 13.5, 4.25], "texture": "#0"},
"up": {"uv": [3.5, 3.5, 0, 0], "texture": "#0"},
"down": {"uv": [3.5, 3.5, 0, 7], "texture": "#0"}
"north": {"uv": [11.5, 11, 15, 11.5], "texture": "#2"},
"east": {"uv": [11.5, 11.5, 15, 12], "texture": "#2"},
"south": {"uv": [12, 6, 15.5, 6.5], "texture": "#2"},
"west": {"uv": [12, 6.5, 15.5, 7], "texture": "#2"},
"up": {"uv": [3.5, 3.5, 0, 0], "texture": "#2"},
"down": {"uv": [3.5, 3.5, 0, 7], "texture": "#2"}
}
},
{
"from": [2, 2, 2],
"to": [14, 5, 14],
"rotation": {"angle": 0, "axis": "y", "origin": [-5, -8, 0]},
"faces": {
"north": {"uv": [10, 0, 13, 0.75], "texture": "#0"},
"east": {"uv": [10, 0.75, 13, 1.5], "texture": "#0"},
"south": {"uv": [1, 10, 4, 10.75], "texture": "#0"},
"west": {"uv": [10, 1.5, 13, 2.25], "texture": "#0"},
"up": {"uv": [3, 10, 0, 7], "texture": "#0"},
"down": {"uv": [10, 0, 7, 3], "texture": "#0"}
"north": {"uv": [3, 10, 6, 10.75], "texture": "#2"},
"east": {"uv": [10, 9.5, 13, 10.25], "texture": "#2"},
"south": {"uv": [10, 10.25, 13, 11], "texture": "#2"},
"west": {"uv": [6, 10.5, 9, 11.25], "texture": "#2"},
"up": {"uv": [3, 10, 0, 7], "texture": "#2"},
"down": {"uv": [10, 0, 7, 3], "texture": "#2"}
}
},
{
"from": [1, 5, 1],
"to": [15, 7, 15],
"rotation": {"angle": 0, "axis": "y", "origin": [-5, -11, 0]},
"faces": {
"north": {"uv": [10, 4.25, 13.5, 4.75], "texture": "#0"},
"east": {"uv": [10, 4.75, 13.5, 5.25], "texture": "#0"},
"south": {"uv": [10, 5.25, 13.5, 5.75], "texture": "#0"},
"west": {"uv": [10, 9.5, 13.5, 10], "texture": "#0"},
"up": {"uv": [7, 3.5, 3.5, 0], "texture": "#0"},
"down": {"uv": [7, 3.5, 3.5, 7], "texture": "#0"}
}
},
{
"name": "clip_side",
"from": [6, 0, 14],
"to": [10, 11, 16],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 5.5, 15]},
"faces": {
"north": {"uv": [9, 9.5, 10, 12.25], "texture": "#0"},
"east": {"uv": [4, 10, 4.5, 12.75], "texture": "#0"},
"south": {"uv": [0, 10, 1, 12.75], "texture": "#0"},
"west": {"uv": [4.5, 10, 5, 12.75], "texture": "#0"},
"up": {"uv": [8, 6.5, 7, 6], "texture": "#0"},
"down": {"uv": [8, 6.5, 7, 7], "texture": "#0"}
"north": {"uv": [12, 7, 15.5, 7.5], "texture": "#2"},
"east": {"uv": [12, 7.5, 15.5, 8], "texture": "#2"},
"south": {"uv": [12, 8, 15.5, 8.5], "texture": "#2"},
"west": {"uv": [12, 8.5, 15.5, 9], "texture": "#2"},
"up": {"uv": [7, 3.5, 3.5, 0], "texture": "#2"},
"down": {"uv": [7, 3.5, 3.5, 7], "texture": "#2"}
}
},
{
Expand All @@ -65,12 +51,12 @@
"to": [10, 11, 2],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 5.5, 15]},
"faces": {
"north": {"uv": [0, 10, 1, 12.75], "texture": "#0"},
"east": {"uv": [4.5, 10, 5, 12.75], "texture": "#0"},
"south": {"uv": [9, 9.5, 10, 12.25], "texture": "#0"},
"west": {"uv": [4, 10, 4.5, 12.75], "texture": "#0"},
"up": {"uv": [8, 6.5, 7, 6], "rotation": 180, "texture": "#0"},
"down": {"uv": [8, 6.5, 7, 7], "rotation": 180, "texture": "#0"}
"north": {"uv": [2, 10, 3, 12.75], "texture": "#2"},
"east": {"uv": [12, 12, 12.5, 14.75], "texture": "#2"},
"south": {"uv": [10, 2.75, 11, 5.5], "texture": "#2"},
"west": {"uv": [3, 12.25, 3.5, 15], "texture": "#2"},
"up": {"uv": [11, 6, 10, 5.5], "texture": "#2"},
"down": {"uv": [13, 9, 12, 9.5], "texture": "#2"}
}
},
{
Expand All @@ -79,12 +65,12 @@
"to": [16, 11, 10],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 5.5, 15]},
"faces": {
"north": {"uv": [4, 10, 4.5, 12.75], "texture": "#0"},
"east": {"uv": [0, 10, 1, 12.75], "texture": "#0"},
"south": {"uv": [4.5, 10, 5, 12.75], "texture": "#0"},
"west": {"uv": [9, 9.5, 10, 12.25], "texture": "#0"},
"up": {"uv": [8, 6.5, 7, 6], "rotation": 270, "texture": "#0"},
"down": {"uv": [8, 6.5, 7, 7], "rotation": 90, "texture": "#0"}
"north": {"uv": [7.5, 11.25, 8, 14], "texture": "#2"},
"east": {"uv": [9, 9.5, 10, 12.25], "texture": "#2"},
"south": {"uv": [8, 11.25, 8.5, 14], "texture": "#2"},
"west": {"uv": [0, 10, 1, 12.75], "texture": "#2"},
"up": {"uv": [9, 7, 8.5, 6], "texture": "#2"},
"down": {"uv": [4.5, 12.25, 4, 13.25], "texture": "#2"}
}
},
{
Expand All @@ -93,25 +79,51 @@
"to": [2, 11, 10],
"rotation": {"angle": 0, "axis": "y", "origin": [15, 5.5, 8]},
"faces": {
"north": {"uv": [4.5, 10, 5, 12.75], "texture": "#0"},
"east": {"uv": [9, 9.5, 10, 12.25], "texture": "#0"},
"south": {"uv": [4, 10, 4.5, 12.75], "texture": "#0"},
"west": {"uv": [0, 10, 1, 12.75], "texture": "#0"},
"up": {"uv": [8, 6.5, 7, 6], "rotation": 90, "texture": "#0"},
"down": {"uv": [8, 6.5, 7, 7], "rotation": 270, "texture": "#0"}
"north": {"uv": [8.5, 11.25, 9, 14], "texture": "#2"},
"east": {"uv": [10, 0, 11, 2.75], "texture": "#2"},
"south": {"uv": [11.5, 12, 12, 14.75], "texture": "#2"},
"west": {"uv": [1, 10, 2, 12.75], "texture": "#2"},
"up": {"uv": [5, 13.25, 4.5, 12.25], "texture": "#2"},
"down": {"uv": [12.75, 4.5, 12.25, 5.5], "texture": "#2"}
}
},
{
"name": "tank",
"from": [2, 7, 2],
"to": [14, 14, 14],
"faces": {
"north": {"uv": [6, 7, 9, 8.75], "texture": "#0"},
"east": {"uv": [6, 8.75, 9, 10.5], "texture": "#0"},
"south": {"uv": [9, 6, 12, 7.75], "texture": "#0"},
"west": {"uv": [9, 7.75, 12, 9.5], "texture": "#0"},
"up": {"uv": [6, 10, 3, 7], "texture": "#0"},
"down": {"uv": [10, 3, 7, 6], "texture": "#0"}
"north": {"uv": [6, 7, 9, 8.75], "texture": "#2"},
"east": {"uv": [6, 8.75, 9, 10.5], "texture": "#2"},
"south": {"uv": [9, 6, 12, 7.75], "texture": "#2"},
"west": {"uv": [9, 7.75, 12, 9.5], "texture": "#2"},
"up": {"uv": [6, 10, 3, 7], "texture": "#2"},
"down": {"uv": [10, 3, 7, 6], "texture": "#2"}
}
},
{
"name": "frame_side",
"from": [5, 5, 16],
"to": [11, 11, 21],
"faces": {
"north": {"uv": [3, 10.75, 4.5, 12.25], "texture": "#2"},
"east": {"uv": [11, 3, 12.25, 4.5], "texture": "#2"},
"south": {"uv": [4.5, 10.75, 6, 12.25], "texture": "#2"},
"west": {"uv": [11, 4.5, 12.25, 6], "texture": "#2"},
"up": {"uv": [11.5, 12.25, 10, 11], "texture": "#2"},
"down": {"uv": [7.5, 11.25, 6, 12.5], "texture": "#2"}
}
},
{
"name": "port",
"from": [5, 4.99, 14],
"to": [11, 11, 16],
"faces": {
"north": {"uv": [11, 0, 12.5, 1.5], "texture": "#2"},
"east": {"uv": [12.25, 3, 12.75, 4.5], "texture": "#2"},
"south": {"uv": [11, 1.5, 12.5, 3], "texture": "#2"},
"west": {"uv": [3.5, 12.25, 4, 13.75], "texture": "#2"},
"up": {"uv": [8.5, 6.5, 7, 6], "texture": "#2"},
"down": {"uv": [8.5, 6.5, 7, 7], "texture": "#2"}
}
}
],
Expand Down Expand Up @@ -157,6 +169,7 @@
4,
5,
6,
7
7,
8
]
}
Loading

0 comments on commit ab0d0d1

Please sign in to comment.