From 35e8b554c58dca58e756cf5ac34bc8ed83383831 Mon Sep 17 00:00:00 2001 From: DBotThePony Date: Wed, 19 Jan 2022 12:53:43 +0700 Subject: [PATCH] Move UV stuff to render package --- .../ru/dbotthepony/mc/otm/client/render/RenderHelper.java | 3 --- .../mc/otm/client/{screen => render}/UVCoords.java | 2 +- .../mc/otm/client/{screen => render}/UVWindingOrder.java | 2 +- .../ru/dbotthepony/mc/otm/block/BlockGravitationStabilizer.kt | 4 ++-- .../kotlin/ru/dbotthepony/mc/otm/client/render/SkinElement.kt | 1 - .../ru/dbotthepony/mc/otm/client/screen/widget/Gauges.kt | 2 +- 6 files changed, 5 insertions(+), 9 deletions(-) rename src/main/java/ru/dbotthepony/mc/otm/client/{screen => render}/UVCoords.java (60%) rename src/main/java/ru/dbotthepony/mc/otm/client/{screen => render}/UVWindingOrder.java (94%) diff --git a/src/main/java/ru/dbotthepony/mc/otm/client/render/RenderHelper.java b/src/main/java/ru/dbotthepony/mc/otm/client/render/RenderHelper.java index c03c7ea6d..52b7bb24e 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/client/render/RenderHelper.java +++ b/src/main/java/ru/dbotthepony/mc/otm/client/render/RenderHelper.java @@ -7,13 +7,10 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GameRenderer; import net.minecraft.resources.ResourceLocation; import ru.dbotthepony.mc.otm.OverdriveThatMatters; -import ru.dbotthepony.mc.otm.client.screen.UVCoords; -import ru.dbotthepony.mc.otm.client.screen.UVWindingOrder; import java.util.Stack; import static org.lwjgl.opengl.GL11.GL_ALWAYS; -import static ru.dbotthepony.mc.otm.client.render.SkinElementKt.*; /** * I am too lazy to learn how Mojang's API works diff --git a/src/main/java/ru/dbotthepony/mc/otm/client/screen/UVCoords.java b/src/main/java/ru/dbotthepony/mc/otm/client/render/UVCoords.java similarity index 60% rename from src/main/java/ru/dbotthepony/mc/otm/client/screen/UVCoords.java rename to src/main/java/ru/dbotthepony/mc/otm/client/render/UVCoords.java index d8fa04616..f9f6071a7 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/client/screen/UVCoords.java +++ b/src/main/java/ru/dbotthepony/mc/otm/client/render/UVCoords.java @@ -1,4 +1,4 @@ -package ru.dbotthepony.mc.otm.client.screen; +package ru.dbotthepony.mc.otm.client.render; public record UVCoords(float u0, float v0, float u1, float v1) { } diff --git a/src/main/java/ru/dbotthepony/mc/otm/client/screen/UVWindingOrder.java b/src/main/java/ru/dbotthepony/mc/otm/client/render/UVWindingOrder.java similarity index 94% rename from src/main/java/ru/dbotthepony/mc/otm/client/screen/UVWindingOrder.java rename to src/main/java/ru/dbotthepony/mc/otm/client/render/UVWindingOrder.java index 1223ea154..daf0c1d34 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/client/screen/UVWindingOrder.java +++ b/src/main/java/ru/dbotthepony/mc/otm/client/render/UVWindingOrder.java @@ -1,4 +1,4 @@ -package ru.dbotthepony.mc.otm.client.screen; +package ru.dbotthepony.mc.otm.client.render; public enum UVWindingOrder { U0_V0_U1_V1(0, 1, 2, 3), // normal operation diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/BlockGravitationStabilizer.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/BlockGravitationStabilizer.kt index 979b73e0e..9fcbc4845 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/BlockGravitationStabilizer.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/BlockGravitationStabilizer.kt @@ -44,7 +44,7 @@ class BlockGravitationStabilizer : BlockMatteryRotatable(Properties.of(Material. } override fun getStateForPlacement(context: BlockPlaceContext): BlockState? { - var state = super.getStateForPlacement(context) ?: return null + val state = super.getStateForPlacement(context) ?: return null val blockPos = context.clickedPos val level = context.level @@ -58,7 +58,7 @@ class BlockGravitationStabilizer : BlockMatteryRotatable(Properties.of(Material. if (!getState.isAir) { if (chunk.getBlockEntity(pos) is BlockEntityBlackHole) { - state = state.setValue(FACING_FULL, face) + return state.setValue(FACING_FULL, face) } } } diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/SkinElement.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/SkinElement.kt index 61b282679..34e0db4a5 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/SkinElement.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/SkinElement.kt @@ -3,7 +3,6 @@ package ru.dbotthepony.mc.otm.client.render import com.mojang.blaze3d.systems.RenderSystem import com.mojang.blaze3d.vertex.PoseStack import net.minecraft.resources.ResourceLocation -import ru.dbotthepony.mc.otm.client.screen.UVWindingOrder @JvmRecord data class SkinElement @JvmOverloads constructor( diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/widget/Gauges.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/widget/Gauges.kt index 2a06ac187..c8f8df595 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/widget/Gauges.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/widget/Gauges.kt @@ -7,7 +7,7 @@ import net.minecraft.network.chat.Component import net.minecraft.network.chat.TranslatableComponent import ru.dbotthepony.mc.otm.client.render.SkinElement import ru.dbotthepony.mc.otm.client.screen.MatteryScreen -import ru.dbotthepony.mc.otm.client.screen.UVWindingOrder +import ru.dbotthepony.mc.otm.client.render.UVWindingOrder import ru.dbotthepony.mc.otm.client.screen.panels.EditablePanel import ru.dbotthepony.mc.otm.menu.FormattingHelper import ru.dbotthepony.mc.otm.menu.widget.LevelGaugeWidget