tilera/CreateMod
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Refactored Changes To Existing Methods

Browse source
This commit is contained in:
Rabbitminers 2023-03-23 17:42:06 +00:00
parent 9ded16fbab
commit 2661d260d8
2 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/main/java/com/simibubi/create/content/logistics/trains/StandardBogeyRenderer.java
View file

@ -1,6 +1,7 @@
package com.simibubi.create.content.logistics.trains; package com.simibubi.create.content.logistics.trains;
import com.jozufozu.flywheel.api.MaterialManager; import com.jozufozu.flywheel.api.MaterialManager;
import com.jozufozu.flywheel.core.materials.model.ModelData;
import com.jozufozu.flywheel.util.transform.Transform; import com.jozufozu.flywheel.util.transform.Transform;
import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.PoseStack;
import com.mojang.blaze3d.vertex.VertexConsumer; import com.mojang.blaze3d.vertex.VertexConsumer;
@ -38,11 +39,11 @@ public class StandardBogeyRenderer extends BogeyRenderer {
public void renderSmall(CompoundTag bogeyData, float wheelAngle, PoseStack ms, int light, public void renderSmall(CompoundTag bogeyData, float wheelAngle, PoseStack ms, int light,
@Nullable VertexConsumer vb) { @Nullable VertexConsumer vb) {
boolean inContraption = vb != null; boolean inContraption = vb == null;
Transform<?> transform = getTransformFromPartial(BOGEY_FRAME, inContraption); Transform<?> transform = getTransformFromPartial(BOGEY_FRAME, ms, inContraption);
finalize(transform, ms, light, vb); finalize(transform, ms, light, vb);
Transform<?>[] wheels = getTransformsFromPartial(SMALL_BOGEY_WHEELS, inContraption, 2); Transform<?>[] wheels = getTransformsFromPartial(SMALL_BOGEY_WHEELS, ms, inContraption, 2);
for (int side : Iterate.positiveAndNegative) { for (int side : Iterate.positiveAndNegative) {
if (!inContraption) if (!inContraption)
ms.pushPose(); ms.pushPose();
@ -57,30 +58,31 @@ public class StandardBogeyRenderer extends BogeyRenderer {
public void renderLarge(CompoundTag bogeyData, float wheelAngle, PoseStack ms, int light, public void renderLarge(CompoundTag bogeyData, float wheelAngle, PoseStack ms, int light,
@Nullable VertexConsumer vb) { @Nullable VertexConsumer vb) {
boolean inContraption = vb != null;
Transform<?> bogeyDrive = getTransformFromPartial(BOGEY_DRIVE, inContraption); boolean inContraption = vb == null;
Transform<?> bogeyDrive = getTransformFromPartial(BOGEY_DRIVE, ms, inContraption);
finalize(bogeyDrive, ms, light, vb); finalize(bogeyDrive, ms, light, vb);
Transform<?> bogeyPiston = getTransformFromPartial(BOGEY_PISTON, inContraption) Transform<?> bogeyPiston = getTransformFromPartial(BOGEY_PISTON, ms, inContraption)
.translate(0, 0, 1 / 4f * Math.sin(AngleHelper.rad(wheelAngle))); .translate(0, 0, 1 / 4f * Math.sin(AngleHelper.rad(wheelAngle)));
finalize(bogeyPiston, ms, light, vb); finalize(bogeyPiston, ms, light, vb);
if (!inContraption) if (!inContraption)
ms.pushPose(); ms.pushPose();
Transform<?> bogeyWheels = getTransformFromPartial(LARGE_BOGEY_WHEELS, inContraption) Transform<?> bogeyWheels = getTransformFromPartial(LARGE_BOGEY_WHEELS, ms, inContraption)
.translate(0, 1, 0) .translate(0, 1, 0)
.rotateX(wheelAngle); .rotateX(wheelAngle);
finalize(bogeyWheels, ms, light, vb); finalize(bogeyWheels, ms, light, vb);
Transform<?> bogeyPin = getTransformFromPartial(BOGEY_PIN, inContraption) Transform<?> bogeyPin = getTransformFromPartial(BOGEY_PIN, ms, inContraption)
.translate(0, 1, 0) .translate(0, 1, 0)
.rotateX(wheelAngle) .rotateX(wheelAngle)
.translate(0, 1 / 4f, 0) .translate(0, 1 / 4f, 0)
.rotateX(-wheelAngle); .rotateX(-wheelAngle);
finalize(bogeyPin, ms, light, vb); finalize(bogeyPin, ms, light, vb);
if (!inContraption) if (!inContraption)
ms.popPose(); ms.popPose();
} }

2
src/main/java/com/simibubi/create/content/logistics/trains/entity/CarriageContraptionInstance.java
View file

@ -99,7 +99,7 @@ public class CarriageContraptionInstance extends EntityInstance<CarriageContrapt
bogeys.forEach(instance -> { bogeys.forEach(instance -> {
if (instance != null) if (instance != null)
instance.remove(); instance.renderer.remove();
}); });
} }