Skip to content

Commit

Permalink
Simplified the model
Browse files Browse the repository at this point in the history
  • Loading branch information
Edivad99 committed Sep 30, 2023
1 parent 100769e commit f158ced
Show file tree
Hide file tree
Showing 10 changed files with 11 additions and 86 deletions.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 1.20.1 2023-08-28T12:04:48.326938 Block States: railcraft
// 1.20.1 2023-09-30T16:15:07.718927 Block States: railcraft
add6c7b9a50c93a0ccd9ba6e317c1464c29ff9f0 assets/railcraft/blockstates/abandoned_activator_track.json
141e735829ad3c7798b22e3fcc73490d9a9602ac assets/railcraft/blockstates/abandoned_booster_track.json
bf85af556cff4cd7c4421614b631bf7d67ad23fe assets/railcraft/blockstates/abandoned_buffer_stop_track.json
Expand Down Expand Up @@ -28,8 +28,8 @@ cc5e238804a014d0f29d9ce5136ab4c191ad0e9a assets/railcraft/blockstates/abyssal_co
d29063a0c0cecf23a6fd426881ee8d16985dca98 assets/railcraft/blockstates/abyssal_paver_slab.json
3782eea78695d5b9444bf68c1005c4a6a59d55d0 assets/railcraft/blockstates/abyssal_paver_stairs.json
c36b30737941cef0e7971e4208c14b8994cd0ccb assets/railcraft/blockstates/abyssal_stone.json
a99ffdb7d82508f90443353ae02d93f108b550a8 assets/railcraft/blockstates/advanced_item_loader.json
4d29d589152971eda406827a6d1b49e773ec95c9 assets/railcraft/blockstates/advanced_item_unloader.json
643abc7b01001b120a462e4a0e5110ba9c6b3a93 assets/railcraft/blockstates/advanced_item_loader.json
ae24bce00ef8a9fb3b1234877566dc8e4563670b assets/railcraft/blockstates/advanced_item_unloader.json
16de95e1e70abc0ad372f19c17021be5bebcebd5 assets/railcraft/blockstates/analog_signal_controller_box.json
6cf953def7c498854c263d5c80ca840b3ea71589 assets/railcraft/blockstates/black_iron_tank_gauge.json
1e71df96eea642e105eefc11eae80d844ee59856 assets/railcraft/blockstates/black_iron_tank_valve.json
Expand Down Expand Up @@ -59,7 +59,7 @@ a7af7fcae90ed502651f4db0875dad271aa83e87 assets/railcraft/blockstates/brown_post
e14430740b4bf40f59f0b54522c2a720c8576ecc assets/railcraft/blockstates/brown_steel_tank_valve.json
5b1bddf8d77c27bb617d02468d0bdb5b821029b2 assets/railcraft/blockstates/brown_steel_tank_wall.json
e4a1c807d75d6f17b950f947f0f5c83bac483c4a assets/railcraft/blockstates/brown_strengthened_glass.json
75e22d111fbc9c1f6f7e65581f8166bdb0f76d04 assets/railcraft/blockstates/cart_dispenser.json
716e63cb98da5adb3c0e23ddb3aeb98249ad63b0 assets/railcraft/blockstates/cart_dispenser.json
b4e853b1ce74e365dd60a6f295e2dcb21bba7e7b assets/railcraft/blockstates/chipped_steel_anvil.json
5b68d5eeb761c97e65e41c60d2b937c9ed25fb8a assets/railcraft/blockstates/chiseled_abyssal_stone.json
020c4bf2c1c9775f45293479d216e70989115a3a assets/railcraft/blockstates/chiseled_quarried_stone.json
Expand Down Expand Up @@ -327,7 +327,7 @@ bc79c3c0a7e4876049f54543c4b22aa17f54d89a assets/railcraft/blockstates/strap_iron
1a29ee18d1ccf3d43ec5db84e9978e309729a3c9 assets/railcraft/blockstates/tin_block.json
d144ae7674b5d4aa4204310db11cd6e0db0fc8a7 assets/railcraft/blockstates/tin_ore.json
ee2ff4d0b75d7082106e68fd3209393c895c985a assets/railcraft/blockstates/token_signal.json
b06c6b7369158876a69a02aeefabe52e9fa42aed assets/railcraft/blockstates/train_dispenser.json
8d13abe1a4ad112f7ee0941c24b0dbfa573c63b8 assets/railcraft/blockstates/train_dispenser.json
f1343f56bc730afeb0e07c25cf7481d8da0109f0 assets/railcraft/blockstates/water_tank_siding.json
a1bb3d06c181aeb7bdb17556a59a1c1a7422b17c assets/railcraft/blockstates/white_iron_tank_gauge.json
4a2a0bb4dc6fd13d286ac7ed1f5308a371a6576b assets/railcraft/blockstates/white_iron_tank_valve.json
Expand Down Expand Up @@ -389,11 +389,7 @@ aa7248fb37c008d1b77e9c7d6cf40dc6db36163b assets/railcraft/models/block/activator
8bdead09e22309a632bf4a58cd1f6dd0f817ad1b assets/railcraft/models/block/activator_track_raised_ne.json
7240855f322b8e4175dae7f0a2481b8e67b94c88 assets/railcraft/models/block/activator_track_raised_sw.json
f4f6ada40ad500c758a49d9236cb3a202551899d assets/railcraft/models/block/advanced_item_loader.json
834dfb58b865735266c728872146b1d7250cf3e3 assets/railcraft/models/block/advanced_item_loader_down.json
aedd43485d44ccddb338793f5aa90abdedd28233 assets/railcraft/models/block/advanced_item_loader_up.json
3ad208d9a61038666421e49fa0e335e3914eede3 assets/railcraft/models/block/advanced_item_unloader.json
d01efad0f048fe676de6266e9fdc8fb36d314cd4 assets/railcraft/models/block/advanced_item_unloader_down.json
53dc5360e249544d4a0a3c6eb571fea3717c36ee assets/railcraft/models/block/advanced_item_unloader_up.json
bfcdd9f4076e6387d2bf44d2a6f5b577b618c7f1 assets/railcraft/models/block/analog_signal_controller_box.json
f841113d45734a48415b31b82aa152d3684c3f18 assets/railcraft/models/block/black_iron_tank_gauge_bottom.json
6f068b4be1878ef8a070d96fcf4810fa46fcde7c assets/railcraft/models/block/black_iron_tank_gauge_center.json
Expand Down Expand Up @@ -482,8 +478,6 @@ fa8a34e0e7ad0060d98b61351de92fae7e3e25f0 assets/railcraft/models/block/brown_str
d1bf9f0a1ffaaa07490da880bea491fa261f3b8d assets/railcraft/models/block/brown_strengthened_glass_single.json
339781b4c1bb285645b8fda2408127451fa52707 assets/railcraft/models/block/brown_strengthened_glass_top.json
d0ba402757d5725ebbe61735bbe07bfc5097e308 assets/railcraft/models/block/cart_dispenser.json
5f05795124985451e6c967177c9b04b331ee34ed assets/railcraft/models/block/cart_dispenser_down.json
d846e8ae49502e6b761b682b5eb3dc70af5f15ec assets/railcraft/models/block/cart_dispenser_up.json
bbfdfbf2b7370e52d9fe2376c653e955e80aa2d6 assets/railcraft/models/block/chipped_steel_anvil.json
28871bd5b70581071ecb7ba90d42a4a98edfe671 assets/railcraft/models/block/chiseled_abyssal_stone.json
83f23a1adc2980d6c85b98a80c7fd1fa9e99ceca assets/railcraft/models/block/chiseled_quarried_stone.json
Expand Down Expand Up @@ -1097,8 +1091,6 @@ ddea650e79afd92647831c32c2318fd59f75b722 assets/railcraft/models/block/throttle_
5545c7514eb85fa47b803f646bb37723b7d12d86 assets/railcraft/models/block/tin_block.json
483136df2abb895741fcf30e5af971c0db6930a4 assets/railcraft/models/block/tin_ore.json
f1c073e28513202bc01623d0bcae2ee6168021d6 assets/railcraft/models/block/train_dispenser.json
40779092a34b9cf21c5e3eccfaeece053bc0828a assets/railcraft/models/block/train_dispenser_down.json
fd4df387a1c6a508a3ff5aedbd4d5e97bb60e836 assets/railcraft/models/block/train_dispenser_up.json
d191ce0e813b92ccbe664cf827a1d4b4502dd402 assets/railcraft/models/block/transition_track.json
b26a7c01e79a733189a971ac007a542e9132744a assets/railcraft/models/block/transition_track_on.json
c5dc95c35ccc3d34ac5a0fb0c94c17c63ff0ecf0 assets/railcraft/models/block/transition_track_on_raised_ne.json
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -602,16 +602,11 @@ private void createDirectionalManipulator(ManipulatorBlock<?> block) {
horizontalTexture.get(TextureSlot.SIDE), horizontalTexture.get(TextureSlot.FRONT),
horizontalTexture.get(TextureSlot.TOP));

var side = TextureMapping.getBlockTexture(block, "_side");
var front = TextureMapping.getBlockTexture(block, "_front");
var top = TextureMapping.getBlockTexture(block, "_top");
var upModel = this.models().cubeBottomTop(this.name(block, "_up"), side, top, front);
var downModel = this.models().cubeBottomTop(this.name(block, "_down"), side, front, top);

this.getVariantBuilder(block)
.forAllStatesExcept(blockState -> {
Direction facing = blockState.getValue(BlockStateProperties.FACING);
int yRot = 0;
int xRot = 0;

switch (facing) {
case SOUTH:
Expand All @@ -624,16 +619,18 @@ private void createDirectionalManipulator(ManipulatorBlock<?> block) {
yRot = 270;
break;
case UP:
return ConfiguredModel.builder().modelFile(upModel).build();
xRot = 270;
break;
case DOWN:
return ConfiguredModel.builder().modelFile(downModel).build();
xRot = 90;
break;
default:
break;
}

return ConfiguredModel.builder()
.modelFile(horizontalModel)
.rotationX(0)
.rotationX(xRot)
.rotationY(yRot)
.build();
}, AdvancedItemLoaderBlock.POWERED);
Expand Down

0 comments on commit f158ced

Please sign in to comment.