diff --git a/gradle.properties b/gradle.properties index 5d48e1217..9f7211edc 100644 --- a/gradle.properties +++ b/gradle.properties @@ -19,7 +19,7 @@ parchment_version = 2021.10.31 # dependency versions registrate_version = MC1.17.1-1.0.14 -flywheel_version = 1.17-0.3.0.19 +flywheel_version = 1.17-0.3.0.20 jei_version = 8.2.0.36 # curseforge information diff --git a/src/main/java/com/simibubi/create/content/contraptions/base/flwdata/BeltData.java b/src/main/java/com/simibubi/create/content/contraptions/base/flwdata/BeltData.java index c4473493c..5b89864f9 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/base/flwdata/BeltData.java +++ b/src/main/java/com/simibubi/create/content/contraptions/base/flwdata/BeltData.java @@ -1,6 +1,5 @@ package com.simibubi.create.content.contraptions.base.flwdata; -import com.jozufozu.flywheel.backend.gl.buffer.VecBuffer; import com.mojang.math.Quaternion; import com.simibubi.create.foundation.block.render.SpriteShiftEntry; @@ -49,13 +48,4 @@ public class BeltData extends KineticData { return this; } - @Override - public void write(VecBuffer buf) { - super.write(buf); - - buf.putVec4(qX, qY, qZ, qW); - buf.putVec2(sourceU, sourceV); - buf.putVec4(minU, minV, maxU, maxV); - buf.put(scrollMult); - } } diff --git a/src/main/java/com/simibubi/create/content/contraptions/base/flwdata/KineticData.java b/src/main/java/com/simibubi/create/content/contraptions/base/flwdata/KineticData.java index 7d65ef741..88f97c572 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/base/flwdata/KineticData.java +++ b/src/main/java/com/simibubi/create/content/contraptions/base/flwdata/KineticData.java @@ -1,6 +1,5 @@ package com.simibubi.create.content.contraptions.base.flwdata; -import com.jozufozu.flywheel.backend.gl.buffer.VecBuffer; import com.jozufozu.flywheel.core.materials.BasicData; import com.mojang.math.Vector3f; import com.simibubi.create.content.contraptions.base.KineticTileEntity; @@ -63,14 +62,4 @@ public class KineticData extends BasicData { return this; } - @Override - public void write(VecBuffer buf) { - super.write(buf); - - buf.putFloat(x); - buf.putFloat(y); - buf.putFloat(z); - buf.putFloat(rotationalSpeed); - buf.putFloat(rotationOffset); - } } diff --git a/src/main/java/com/simibubi/create/content/contraptions/base/flwdata/RotatingData.java b/src/main/java/com/simibubi/create/content/contraptions/base/flwdata/RotatingData.java index b019c775f..2431f86b5 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/base/flwdata/RotatingData.java +++ b/src/main/java/com/simibubi/create/content/contraptions/base/flwdata/RotatingData.java @@ -1,6 +1,5 @@ package com.simibubi.create.content.contraptions.base.flwdata; -import com.jozufozu.flywheel.backend.gl.buffer.VecBuffer; import com.mojang.math.Vector3f; import net.minecraft.core.Direction; @@ -27,10 +26,4 @@ public class RotatingData extends KineticData { return this; } - @Override - public void write(VecBuffer buf) { - super.write(buf); - - buf.putVec3(rotationAxisX, rotationAxisY, rotationAxisZ); - } } diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/actors/flwdata/ActorData.java b/src/main/java/com/simibubi/create/content/contraptions/components/actors/flwdata/ActorData.java index d2bb2c151..97d7d7713 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/actors/flwdata/ActorData.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/actors/flwdata/ActorData.java @@ -1,6 +1,5 @@ package com.simibubi.create.content.contraptions.components.actors.flwdata; -import com.jozufozu.flywheel.backend.gl.buffer.VecBuffer; import com.jozufozu.flywheel.backend.instancing.InstanceData; import com.mojang.math.Quaternion; import com.mojang.math.Vector3f; @@ -93,15 +92,4 @@ public class ActorData extends InstanceData { return this; } - @Override - public void write(VecBuffer buf) { - buf.putVec3(x, y, z); - buf.putVec2(blockLight, skyLight); - buf.putFloat(rotationOffset); - buf.putVec3(rotationAxisX, rotationAxisY, rotationAxisZ); - buf.putVec4(qX, qY, qZ, qW); - buf.putVec3(rotationCenterX, rotationCenterY, rotationCenterZ); - buf.putFloat(speed); - - } } diff --git a/src/main/java/com/simibubi/create/content/logistics/block/flap/FlapData.java b/src/main/java/com/simibubi/create/content/logistics/block/flap/FlapData.java index 890e38203..d17aa06dc 100644 --- a/src/main/java/com/simibubi/create/content/logistics/block/flap/FlapData.java +++ b/src/main/java/com/simibubi/create/content/logistics/block/flap/FlapData.java @@ -1,6 +1,5 @@ package com.simibubi.create.content.logistics.block.flap; -import com.jozufozu.flywheel.backend.gl.buffer.VecBuffer; import com.jozufozu.flywheel.backend.instancing.InstanceData; import com.jozufozu.flywheel.core.materials.IFlatLight; import com.mojang.math.Vector3f; @@ -95,18 +94,4 @@ public class FlapData extends InstanceData implements IFlatLight { return this; } - @Override - public void write(VecBuffer buf) { - buf.putVec3(x, y, z); - buf.putVec2(blockLight, skyLight); - - buf.putVec3(segmentOffsetX, segmentOffsetY, segmentOffsetZ); - buf.putVec3(pivotX, pivotY, pivotZ); - - buf.putFloat(horizontalAngle); - buf.putFloat(intensity); - buf.putFloat(flapScale); - - buf.putFloat(flapness); - } }