mirrors/Create
0
0
Fork 0
mirror of https://github.com/Creators-of-Create/Create.git synced 2025-01-27 13:28:00 +01:00
Code Issues Projects Releases Packages Wiki Activity

Spinning up the wheel

Browse source 
- Bump flywheel build - 0.6.2.65
This commit is contained in:
Jozufozu 2022-04-07 14:28:13 -07:00
parent 9c8439fe08
commit d7b63fd6f2
7 changed files with 5 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
gradle.properties
View file

@ -19,7 +19,7 @@ parchment_version = 2022.03.13
# dependency versions # dependency versions
registrate_version = MC1.18.2-1.0.24 registrate_version = MC1.18.2-1.0.24
flywheel_version = 1.18-0.6.2.64 flywheel_version = 1.18-0.6.2.65
jei_minecraft_version = 1.18.2 jei_minecraft_version = 1.18.2
jei_version = 9.5.3.143 jei_version = 9.5.3.143

2
src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/render/FlwContraption.java
View file

@ -182,7 +182,7 @@ public class FlwContraption extends ContraptionRenderInfo {
private final ContraptionInstanceManager tileInstanceManager; private final ContraptionInstanceManager tileInstanceManager;
public ContraptionInstanceWorld(FlwContraption parent) { public ContraptionInstanceWorld(FlwContraption parent) {
switch (Backend.getEngine()) { switch (Backend.getBackendType()) {
case INSTANCING -> { case INSTANCING -> {
InstancingEngine<ContraptionProgram> engine = InstancingEngine.builder(CreateContexts.CWORLD) InstancingEngine<ContraptionProgram> engine = InstancingEngine.builder(CreateContexts.CWORLD)
.setGroupFactory(ContraptionGroup.forContraption(parent)) .setGroupFactory(ContraptionGroup.forContraption(parent))

4
src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/render/FlwContraptionManager.java
View file

@ -7,7 +7,7 @@ import com.jozufozu.flywheel.backend.Backend;
import com.jozufozu.flywheel.backend.RenderLayer; import com.jozufozu.flywheel.backend.RenderLayer;
import com.jozufozu.flywheel.backend.gl.GlStateTracker; import com.jozufozu.flywheel.backend.gl.GlStateTracker;
import com.jozufozu.flywheel.backend.gl.GlTextureUnit; import com.jozufozu.flywheel.backend.gl.GlTextureUnit;
import com.jozufozu.flywheel.config.FlwEngine; import com.jozufozu.flywheel.config.BackendType;
import com.jozufozu.flywheel.core.Formats; import com.jozufozu.flywheel.core.Formats;
import com.jozufozu.flywheel.core.Materials; import com.jozufozu.flywheel.core.Materials;
import com.jozufozu.flywheel.core.compile.ProgramContext; import com.jozufozu.flywheel.core.compile.ProgramContext;
@ -43,7 +43,7 @@ public class FlwContraptionManager extends ContraptionRenderingWorld<FlwContrapt
GlStateTracker.State restoreState = GlStateTracker.getRestoreState(); GlStateTracker.State restoreState = GlStateTracker.getRestoreState();
GlTextureUnit active = GlTextureUnit.getActive(); GlTextureUnit active = GlTextureUnit.getActive();
if (Backend.getEngine() != FlwEngine.BATCHING) { if (Backend.getBackendType() != BackendType.BATCHING) {
renderStructures(event); renderStructures(event);
} }

3
src/main/java/com/simibubi/create/content/logistics/trains/entity/BogeyInstance.java
View file

@ -1,7 +1,5 @@
package com.simibubi.create.content.logistics.trains.entity; package com.simibubi.create.content.logistics.trains.entity;
import org.jetbrains.annotations.Nullable;
import com.jozufozu.flywheel.api.Material; import com.jozufozu.flywheel.api.Material;
import com.jozufozu.flywheel.api.MaterialManager; import com.jozufozu.flywheel.api.MaterialManager;
import com.jozufozu.flywheel.core.Materials; import com.jozufozu.flywheel.core.Materials;
@ -11,7 +9,6 @@ import com.mojang.blaze3d.vertex.PoseStack;
import com.simibubi.create.AllBlockPartials; import com.simibubi.create.AllBlockPartials;
import com.simibubi.create.AllBlocks; import com.simibubi.create.AllBlocks;
import com.simibubi.create.content.contraptions.relays.elementary.ShaftBlock; import com.simibubi.create.content.contraptions.relays.elementary.ShaftBlock;
import com.simibubi.create.foundation.render.CachedBufferer;
import com.simibubi.create.foundation.utility.AngleHelper; import com.simibubi.create.foundation.utility.AngleHelper;
import com.simibubi.create.foundation.utility.Iterate; import com.simibubi.create.foundation.utility.Iterate;

4
src/main/java/com/simibubi/create/content/logistics/trains/entity/CarriageContraptionEntityRenderer.java
View file

@ -43,8 +43,6 @@ public class CarriageContraptionEntityRenderer extends ContraptionEntityRenderer
if (carriage == null) if (carriage == null)
return; return;
boolean usingFlywheel = Backend.isOn();
Vec3 position = entity.getPosition(partialTicks); Vec3 position = entity.getPosition(partialTicks);
float viewYRot = entity.getViewYRot(partialTicks); float viewYRot = entity.getViewYRot(partialTicks);
@ -55,7 +53,7 @@ public class CarriageContraptionEntityRenderer extends ContraptionEntityRenderer
if (bogey == null) if (bogey == null)
return; return;
if (!usingFlywheel) { if (!Backend.isOn()) {
ms.pushPose(); ms.pushPose();
translateBogey(ms, bogey, bogeySpacing, viewYRot, viewXRot, partialTicks); translateBogey(ms, bogey, bogeySpacing, viewYRot, viewXRot, partialTicks);

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

@ -8,11 +8,6 @@ import com.jozufozu.flywheel.util.transform.TransformStack;
import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.PoseStack;
import com.simibubi.create.foundation.utility.Couple; import com.simibubi.create.foundation.utility.Couple;
import net.minecraft.client.renderer.LightTexture;
import net.minecraft.core.BlockPos;
import net.minecraft.world.level.LightLayer;
import net.minecraft.world.phys.Vec3;
public class CarriageContraptionInstance extends EntityInstance<CarriageContraptionEntity> implements DynamicInstance { public class CarriageContraptionInstance extends EntityInstance<CarriageContraptionEntity> implements DynamicInstance {
private final PoseStack ms = new PoseStack(); private final PoseStack ms = new PoseStack();

1
src/main/java/com/simibubi/create/events/ClientEvents.java
View file

@ -211,7 +211,6 @@ public class ClientEvents {
CreateClient.GHOST_BLOCKS.renderAll(ms, buffer); CreateClient.GHOST_BLOCKS.renderAll(ms, buffer);
CreateClient.OUTLINER.renderOutlines(ms, buffer, pt); CreateClient.OUTLINER.renderOutlines(ms, buffer, pt);
// LightVolumeDebugger.render(ms, buffer);
buffer.draw(); buffer.draw();
RenderSystem.enableCull(); RenderSystem.enableCull();