Skip to content

Commit a3e4bbc

Browse files
IThundxrIThundxr
committed
cleanup & zfighting fix
1 parent 7f742ae commit a3e4bbc

File tree

10 files changed

+21
-21
lines changed

10 files changed

+21
-21
lines changed

‎common/src/main/java/com/railwayteam/railways/content/custom_bogeys/narrow_gauge/NarrowGaugeBogeyBlock.java ‎common/src/main/java/com/railwayteam/railways/content/custom_bogeys/blocks/narrow_gauge/NarrowGaugeBogeyBlock.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.railwayteam.railways.content.custom_bogeys.narrow_gauge;
1+
package com.railwayteam.railways.content.custom_bogeys.blocks.narrow_gauge;
22

33
import com.railwayteam.railways.content.custom_bogeys.CRBogeyBlock;
44
import com.railwayteam.railways.registry.CRBogeyStyles;

‎common/src/main/java/com/railwayteam/railways/content/custom_bogeys/standard_gauge/DoubleAxleBogeyBlock.java ‎common/src/main/java/com/railwayteam/railways/content/custom_bogeys/blocks/standard_gauge/DoubleAxleBogeyBlock.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.railwayteam.railways.content.custom_bogeys.standard_gauge;
1+
package com.railwayteam.railways.content.custom_bogeys.blocks.standard_gauge;
22

33
import com.railwayteam.railways.content.custom_bogeys.CRBogeyBlock;
44
import com.railwayteam.railways.registry.CRBogeyStyles;

‎common/src/main/java/com/railwayteam/railways/content/custom_bogeys/standard_gauge/LargePlatformDoubleAxleBogeyBlock.java ‎common/src/main/java/com/railwayteam/railways/content/custom_bogeys/blocks/standard_gauge/LargePlatformDoubleAxleBogeyBlock.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.railwayteam.railways.content.custom_bogeys.standard_gauge;
1+
package com.railwayteam.railways.content.custom_bogeys.blocks.standard_gauge;
22

33
import com.railwayteam.railways.registry.CRBogeyStyles;
44
import com.simibubi.create.content.trains.bogey.BogeySizes;

‎common/src/main/java/com/railwayteam/railways/content/custom_bogeys/standard_gauge/SingleAxleBogeyBlock.java ‎common/src/main/java/com/railwayteam/railways/content/custom_bogeys/blocks/standard_gauge/SingleAxleBogeyBlock.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.railwayteam.railways.content.custom_bogeys.standard_gauge;
1+
package com.railwayteam.railways.content.custom_bogeys.blocks.standard_gauge;
22

33
import com.railwayteam.railways.content.custom_bogeys.CRBogeyBlock;
44
import com.railwayteam.railways.registry.CRBogeyStyles;

‎common/src/main/java/com/railwayteam/railways/content/custom_bogeys/standard_gauge/TripleAxleBogeyBlock.java ‎common/src/main/java/com/railwayteam/railways/content/custom_bogeys/blocks/standard_gauge/TripleAxleBogeyBlock.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.railwayteam.railways.content.custom_bogeys.standard_gauge;
1+
package com.railwayteam.railways.content.custom_bogeys.blocks.standard_gauge;
22

33
import com.railwayteam.railways.content.custom_bogeys.CRBogeyBlock;
44
import com.railwayteam.railways.registry.CRBogeyStyles;

‎common/src/main/java/com/railwayteam/railways/content/custom_bogeys/wide_gauge/WideGaugeBogeyBlock.java ‎common/src/main/java/com/railwayteam/railways/content/custom_bogeys/blocks/wide_gauge/WideGaugeBogeyBlock.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.railwayteam.railways.content.custom_bogeys.wide_gauge;
1+
package com.railwayteam.railways.content.custom_bogeys.blocks.wide_gauge;
22

33
import com.railwayteam.railways.content.custom_bogeys.CRBogeyBlock;
44
import com.railwayteam.railways.registry.CRBogeyStyles;

‎common/src/main/java/com/railwayteam/railways/content/custom_bogeys/wide_gauge/WideGaugeComicallyLargeBogeyBlock.java ‎common/src/main/java/com/railwayteam/railways/content/custom_bogeys/blocks/wide_gauge/WideGaugeComicallyLargeBogeyBlock.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.railwayteam.railways.content.custom_bogeys.wide_gauge;
1+
package com.railwayteam.railways.content.custom_bogeys.blocks.wide_gauge;
22

33
import com.railwayteam.railways.registry.CRBogeyStyles;
44
import com.simibubi.create.content.trains.bogey.BogeySizes;

‎common/src/main/java/com/railwayteam/railways/content/custom_bogeys/renderer/gauge/standard/double_axle/FreightBogeyRenderer.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
import com.mojang.blaze3d.vertex.PoseStack;
55
import com.mojang.blaze3d.vertex.VertexConsumer;
66
import com.simibubi.create.AllBlocks;
7-
import com.simibubi.create.AllPartialModels;
87
import com.simibubi.create.content.kinetics.simpleRelays.ShaftBlock;
98
import com.simibubi.create.content.trains.bogey.BogeyRenderer;
109
import com.simibubi.create.content.trains.bogey.BogeySizes;
@@ -14,11 +13,12 @@
1413
import net.minecraft.nbt.CompoundTag;
1514

1615
import static com.railwayteam.railways.registry.CRBlockPartials.FREIGHT_FRAME;
16+
import static com.railwayteam.railways.registry.CRBlockPartials.LONG_SHAFTED_WHEELS;
1717

1818
public class FreightBogeyRenderer extends BogeyRenderer {
1919
@Override
2020
public void initialiseContraptionModelData(MaterialManager materialManager, CarriageBogey carriageBogey) {
21-
createModelInstance(materialManager, AllPartialModels.SMALL_BOGEY_WHEELS, 2);
21+
createModelInstance(materialManager, LONG_SHAFTED_WHEELS, 2);
2222
createModelInstance(materialManager, FREIGHT_FRAME);
2323
createModelInstance(materialManager, AllBlocks.SHAFT.getDefaultState()
2424
.setValue(ShaftBlock.AXIS, Direction.Axis.Z), 2);
@@ -48,7 +48,7 @@ public void render(CompoundTag bogeyData, float wheelAngle, PoseStack ms, int li
4848
getTransform(FREIGHT_FRAME, ms, inInstancedContraption)
4949
.render(ms, light, vb);
5050

51-
BogeyModelData[] wheels = getTransform(AllPartialModels.SMALL_BOGEY_WHEELS, ms, inInstancedContraption, 2);
51+
BogeyModelData[] wheels = getTransform(LONG_SHAFTED_WHEELS, ms, inInstancedContraption, 2);
5252
for (int side : Iterate.positiveAndNegative) {
5353
if (!inInstancedContraption)
5454
ms.pushPose();

‎common/src/main/java/com/railwayteam/railways/content/custom_bogeys/renderer/gauge/standard/double_axle/Y25BogeyRenderer.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
import com.mojang.blaze3d.vertex.PoseStack;
55
import com.mojang.blaze3d.vertex.VertexConsumer;
66
import com.simibubi.create.AllBlocks;
7-
import com.simibubi.create.AllPartialModels;
87
import com.simibubi.create.content.kinetics.simpleRelays.ShaftBlock;
98
import com.simibubi.create.content.trains.bogey.BogeyRenderer;
109
import com.simibubi.create.content.trains.bogey.BogeySizes;
@@ -13,12 +12,13 @@
1312
import net.minecraft.core.Direction;
1413
import net.minecraft.nbt.CompoundTag;
1514

15+
import static com.railwayteam.railways.registry.CRBlockPartials.LONG_SHAFTED_WHEELS;
1616
import static com.railwayteam.railways.registry.CRBlockPartials.Y25_FRAME;
1717

1818
public class Y25BogeyRenderer extends BogeyRenderer {
1919
@Override
2020
public void initialiseContraptionModelData(MaterialManager materialManager, CarriageBogey carriageBogey) {
21-
createModelInstance(materialManager, AllPartialModels.SMALL_BOGEY_WHEELS, 2);
21+
createModelInstance(materialManager, LONG_SHAFTED_WHEELS, 2);
2222
createModelInstance(materialManager, Y25_FRAME);
2323
createModelInstance(materialManager, AllBlocks.SHAFT.getDefaultState()
2424
.setValue(ShaftBlock.AXIS, Direction.Axis.Z), 2);
@@ -48,7 +48,7 @@ public void render(CompoundTag bogeyData, float wheelAngle, PoseStack ms, int li
4848
getTransform(Y25_FRAME, ms, inInstancedContraption)
4949
.render(ms, light, vb);
5050

51-
BogeyModelData[] wheels = getTransform(AllPartialModels.SMALL_BOGEY_WHEELS, ms, inInstancedContraption, 2);
51+
BogeyModelData[] wheels = getTransform(LONG_SHAFTED_WHEELS, ms, inInstancedContraption, 2);
5252
for (int side : Iterate.positiveAndNegative) {
5353
if (!inInstancedContraption)
5454
ms.pushPose();

‎common/src/main/java/com/railwayteam/railways/registry/CRBlocks.java

+8-8
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,17 @@
1515
import com.railwayteam.railways.content.coupling.TrackCouplerDisplaySource;
1616
import com.railwayteam.railways.content.coupling.coupler.TrackCouplerBlock;
1717
import com.railwayteam.railways.content.coupling.coupler.TrackCouplerBlockItem;
18-
import com.railwayteam.railways.content.custom_bogeys.standard_gauge.DoubleAxleBogeyBlock;
19-
import com.railwayteam.railways.content.custom_bogeys.standard_gauge.LargePlatformDoubleAxleBogeyBlock;
20-
import com.railwayteam.railways.content.custom_bogeys.standard_gauge.SingleAxleBogeyBlock;
21-
import com.railwayteam.railways.content.custom_bogeys.standard_gauge.TripleAxleBogeyBlock;
18+
import com.railwayteam.railways.content.custom_bogeys.blocks.standard_gauge.DoubleAxleBogeyBlock;
19+
import com.railwayteam.railways.content.custom_bogeys.blocks.standard_gauge.LargePlatformDoubleAxleBogeyBlock;
20+
import com.railwayteam.railways.content.custom_bogeys.blocks.standard_gauge.SingleAxleBogeyBlock;
21+
import com.railwayteam.railways.content.custom_bogeys.blocks.standard_gauge.TripleAxleBogeyBlock;
2222
import com.railwayteam.railways.content.custom_bogeys.invisible.InvisibleBogeyBlock;
2323
import com.railwayteam.railways.content.custom_bogeys.monobogey.InvisibleMonoBogeyBlock;
2424
import com.railwayteam.railways.content.custom_bogeys.monobogey.MonoBogeyBlock;
25-
import com.railwayteam.railways.content.custom_bogeys.narrow_gauge.NarrowGaugeBogeyBlock;
26-
import com.railwayteam.railways.content.custom_bogeys.narrow_gauge.NarrowGaugeBogeyBlock.NarrowGaugeStandardStyle;
27-
import com.railwayteam.railways.content.custom_bogeys.wide_gauge.WideGaugeBogeyBlock;
28-
import com.railwayteam.railways.content.custom_bogeys.wide_gauge.WideGaugeComicallyLargeBogeyBlock;
25+
import com.railwayteam.railways.content.custom_bogeys.blocks.narrow_gauge.NarrowGaugeBogeyBlock;
26+
import com.railwayteam.railways.content.custom_bogeys.blocks.narrow_gauge.NarrowGaugeBogeyBlock.NarrowGaugeStandardStyle;
27+
import com.railwayteam.railways.content.custom_bogeys.blocks.wide_gauge.WideGaugeBogeyBlock;
28+
import com.railwayteam.railways.content.custom_bogeys.blocks.wide_gauge.WideGaugeComicallyLargeBogeyBlock;
2929
import com.railwayteam.railways.content.custom_tracks.CustomTrackBlockStateGenerator;
3030
import com.railwayteam.railways.content.custom_tracks.casing.CasingCollisionBlock;
3131
import com.railwayteam.railways.content.custom_tracks.generic_crossing.GenericCrossingBlock;

0 commit comments

Comments
 (0)