From 03afe7baad298b38a28f3eb9cd0628bfffa5c20a Mon Sep 17 00:00:00 2001 From: DBotThePony Date: Mon, 30 Aug 2021 11:50:14 +0700 Subject: [PATCH] Move render helpers to render package --- src/main/java/ru/dbotthepony/mc/otm/Registry.java | 9 +++++++++ .../ru/dbotthepony/mc/otm/android/AndroidResearch.java | 2 +- .../mc/otm/android/AndroidResearchBuilder.java | 2 +- .../mc/otm/client/{screen => render}/RGBAColor.java | 2 +- .../mc/otm/client/{screen => render}/RenderHelper.java | 4 +++- .../mc/otm/client/{screen => render}/SkinElement.java | 3 ++- .../mc/otm/client/screen/AndroidStationScreen.java | 2 ++ .../mc/otm/client/screen/panels/AbstractSlotPanel.java | 4 ++-- .../mc/otm/client/screen/panels/EditablePanel.java | 2 +- .../mc/otm/client/screen/panels/FramePanel.java | 2 +- .../mc/otm/client/screen/panels/ScrollBarPanel.java | 2 +- .../mc/otm/client/screen/panels/SlotPanel.java | 2 +- .../ru/dbotthepony/mc/otm/menu/widget/GaugeWidget.java | 2 +- 13 files changed, 26 insertions(+), 12 deletions(-) rename src/main/java/ru/dbotthepony/mc/otm/client/{screen => render}/RGBAColor.java (96%) rename src/main/java/ru/dbotthepony/mc/otm/client/{screen => render}/RenderHelper.java (98%) rename src/main/java/ru/dbotthepony/mc/otm/client/{screen => render}/SkinElement.java (96%) diff --git a/src/main/java/ru/dbotthepony/mc/otm/Registry.java b/src/main/java/ru/dbotthepony/mc/otm/Registry.java index dda6eebcf..0a6307e3e 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/Registry.java +++ b/src/main/java/ru/dbotthepony/mc/otm/Registry.java @@ -1,6 +1,7 @@ package ru.dbotthepony.mc.otm; import net.minecraft.client.gui.screens.MenuScreens; +import net.minecraft.client.renderer.blockentity.BlockEntityRenderers; import net.minecraft.network.chat.TextComponent; import net.minecraft.network.chat.TranslatableComponent; import net.minecraft.resources.ResourceLocation; @@ -31,6 +32,8 @@ import ru.dbotthepony.mc.otm.android.feature.AndroidNanobotsRegeneration; import ru.dbotthepony.mc.otm.block.*; import ru.dbotthepony.mc.otm.block.entity.*; import ru.dbotthepony.mc.otm.android.AndroidFeatureType; +import ru.dbotthepony.mc.otm.client.render.BlackHoleRenderer; +import ru.dbotthepony.mc.otm.client.render.SkinElement; import ru.dbotthepony.mc.otm.item.*; import ru.dbotthepony.mc.otm.menu.*; import ru.dbotthepony.mc.otm.client.screen.*; @@ -465,6 +468,12 @@ public class Registry { // OverdriveThatMatters.LOGGER.info("Registered block entities"); } + + + @SubscribeEvent + public static void registerRenderers(final FMLClientSetupEvent event) { + BlockEntityRenderers.register(BLACK_HOLE, BlackHoleRenderer::new); + } } public static class AndroidFeatures { diff --git a/src/main/java/ru/dbotthepony/mc/otm/android/AndroidResearch.java b/src/main/java/ru/dbotthepony/mc/otm/android/AndroidResearch.java index f69c04ef4..57961e057 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/android/AndroidResearch.java +++ b/src/main/java/ru/dbotthepony/mc/otm/android/AndroidResearch.java @@ -6,7 +6,7 @@ import net.minecraftforge.common.util.INBTSerializable; import ru.dbotthepony.mc.otm.capability.AndroidCapabilityPlayer; import ru.dbotthepony.mc.otm.network.MatteryNetworking; import ru.dbotthepony.mc.otm.network.android.AndroidResearchRequestPacket; -import ru.dbotthepony.mc.otm.client.screen.SkinElement; +import ru.dbotthepony.mc.otm.client.render.SkinElement; import javax.annotation.Nullable; import java.util.List; diff --git a/src/main/java/ru/dbotthepony/mc/otm/android/AndroidResearchBuilder.java b/src/main/java/ru/dbotthepony/mc/otm/android/AndroidResearchBuilder.java index 546ec44b9..e2f64519c 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/android/AndroidResearchBuilder.java +++ b/src/main/java/ru/dbotthepony/mc/otm/android/AndroidResearchBuilder.java @@ -9,7 +9,7 @@ import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Items; import net.minecraftforge.registries.RegistryManager; import ru.dbotthepony.mc.otm.Registry; -import ru.dbotthepony.mc.otm.client.screen.SkinElement; +import ru.dbotthepony.mc.otm.client.render.SkinElement; import javax.annotation.Nullable; import java.util.ArrayList; diff --git a/src/main/java/ru/dbotthepony/mc/otm/client/screen/RGBAColor.java b/src/main/java/ru/dbotthepony/mc/otm/client/render/RGBAColor.java similarity index 96% rename from src/main/java/ru/dbotthepony/mc/otm/client/screen/RGBAColor.java rename to src/main/java/ru/dbotthepony/mc/otm/client/render/RGBAColor.java index b6eb6c04e..b909030b7 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/client/screen/RGBAColor.java +++ b/src/main/java/ru/dbotthepony/mc/otm/client/render/RGBAColor.java @@ -1,4 +1,4 @@ -package ru.dbotthepony.mc.otm.client.screen; +package ru.dbotthepony.mc.otm.client.render; import com.mojang.blaze3d.systems.RenderSystem; diff --git a/src/main/java/ru/dbotthepony/mc/otm/client/screen/RenderHelper.java b/src/main/java/ru/dbotthepony/mc/otm/client/render/RenderHelper.java similarity index 98% rename from src/main/java/ru/dbotthepony/mc/otm/client/screen/RenderHelper.java rename to src/main/java/ru/dbotthepony/mc/otm/client/render/RenderHelper.java index 321779e37..f57aee442 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/client/screen/RenderHelper.java +++ b/src/main/java/ru/dbotthepony/mc/otm/client/render/RenderHelper.java @@ -1,4 +1,4 @@ -package ru.dbotthepony.mc.otm.client.screen; +package ru.dbotthepony.mc.otm.client.render; import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.vertex.*; @@ -7,6 +7,8 @@ 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; diff --git a/src/main/java/ru/dbotthepony/mc/otm/client/screen/SkinElement.java b/src/main/java/ru/dbotthepony/mc/otm/client/render/SkinElement.java similarity index 96% rename from src/main/java/ru/dbotthepony/mc/otm/client/screen/SkinElement.java rename to src/main/java/ru/dbotthepony/mc/otm/client/render/SkinElement.java index b1e659747..7739e0892 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/client/screen/SkinElement.java +++ b/src/main/java/ru/dbotthepony/mc/otm/client/render/SkinElement.java @@ -1,8 +1,9 @@ -package ru.dbotthepony.mc.otm.client.screen; +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.render.RenderHelper; /** * Represents a texture element on atlas diff --git a/src/main/java/ru/dbotthepony/mc/otm/client/screen/AndroidStationScreen.java b/src/main/java/ru/dbotthepony/mc/otm/client/screen/AndroidStationScreen.java index 636e06cf9..ddb5178fa 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/client/screen/AndroidStationScreen.java +++ b/src/main/java/ru/dbotthepony/mc/otm/client/screen/AndroidStationScreen.java @@ -11,6 +11,8 @@ import ru.dbotthepony.mc.otm.android.AndroidResearch; import ru.dbotthepony.mc.otm.android.AndroidResearchType; import ru.dbotthepony.mc.otm.capability.MatteryCapability; import ru.dbotthepony.mc.otm.capability.AndroidCapabilityPlayer; +import ru.dbotthepony.mc.otm.client.render.RGBAColor; +import ru.dbotthepony.mc.otm.client.render.RenderHelper; import ru.dbotthepony.mc.otm.menu.AndroidStationMenu; import ru.dbotthepony.mc.otm.menu.slot.MatterySlot; import ru.dbotthepony.mc.otm.menu.widget.GaugeWidget; diff --git a/src/main/java/ru/dbotthepony/mc/otm/client/screen/panels/AbstractSlotPanel.java b/src/main/java/ru/dbotthepony/mc/otm/client/screen/panels/AbstractSlotPanel.java index 669df073d..38f6e8167 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/client/screen/panels/AbstractSlotPanel.java +++ b/src/main/java/ru/dbotthepony/mc/otm/client/screen/panels/AbstractSlotPanel.java @@ -8,8 +8,8 @@ import net.minecraft.client.renderer.GameRenderer; import net.minecraft.network.chat.Component; import net.minecraft.world.item.ItemStack; import ru.dbotthepony.mc.otm.client.screen.MatteryScreen; -import ru.dbotthepony.mc.otm.client.screen.RGBAColor; -import ru.dbotthepony.mc.otm.client.screen.RenderHelper; +import ru.dbotthepony.mc.otm.client.render.RGBAColor; +import ru.dbotthepony.mc.otm.client.render.RenderHelper; import javax.annotation.Nonnull; import javax.annotation.Nullable; diff --git a/src/main/java/ru/dbotthepony/mc/otm/client/screen/panels/EditablePanel.java b/src/main/java/ru/dbotthepony/mc/otm/client/screen/panels/EditablePanel.java index 00f558eae..77ba035a5 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/client/screen/panels/EditablePanel.java +++ b/src/main/java/ru/dbotthepony/mc/otm/client/screen/panels/EditablePanel.java @@ -5,7 +5,7 @@ import com.mojang.blaze3d.vertex.PoseStack; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.components.events.GuiEventListener; import ru.dbotthepony.mc.otm.client.screen.MatteryScreen; -import ru.dbotthepony.mc.otm.client.screen.RenderHelper; +import ru.dbotthepony.mc.otm.client.render.RenderHelper; import javax.annotation.Nonnull; import javax.annotation.Nullable; diff --git a/src/main/java/ru/dbotthepony/mc/otm/client/screen/panels/FramePanel.java b/src/main/java/ru/dbotthepony/mc/otm/client/screen/panels/FramePanel.java index 706289f00..130877b8e 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/client/screen/panels/FramePanel.java +++ b/src/main/java/ru/dbotthepony/mc/otm/client/screen/panels/FramePanel.java @@ -9,7 +9,7 @@ import net.minecraft.client.resources.sounds.SimpleSoundInstance; import net.minecraft.network.chat.Component; import net.minecraft.sounds.SoundEvents; import ru.dbotthepony.mc.otm.client.screen.MatteryScreen; -import ru.dbotthepony.mc.otm.client.screen.RenderHelper; +import ru.dbotthepony.mc.otm.client.render.RenderHelper; import javax.annotation.Nonnull; import javax.annotation.Nullable; diff --git a/src/main/java/ru/dbotthepony/mc/otm/client/screen/panels/ScrollBarPanel.java b/src/main/java/ru/dbotthepony/mc/otm/client/screen/panels/ScrollBarPanel.java index 83a082d15..b3e2ab47f 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/client/screen/panels/ScrollBarPanel.java +++ b/src/main/java/ru/dbotthepony/mc/otm/client/screen/panels/ScrollBarPanel.java @@ -2,7 +2,7 @@ package ru.dbotthepony.mc.otm.client.screen.panels; import com.mojang.blaze3d.vertex.PoseStack; import ru.dbotthepony.mc.otm.client.screen.MatteryScreen; -import ru.dbotthepony.mc.otm.client.screen.RenderHelper; +import ru.dbotthepony.mc.otm.client.render.RenderHelper; import javax.annotation.Nonnull; import javax.annotation.Nullable; diff --git a/src/main/java/ru/dbotthepony/mc/otm/client/screen/panels/SlotPanel.java b/src/main/java/ru/dbotthepony/mc/otm/client/screen/panels/SlotPanel.java index 838292510..625c7e5f2 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/client/screen/panels/SlotPanel.java +++ b/src/main/java/ru/dbotthepony/mc/otm/client/screen/panels/SlotPanel.java @@ -8,7 +8,7 @@ import net.minecraft.world.inventory.AbstractContainerMenu; import net.minecraft.world.item.ItemStack; import ru.dbotthepony.mc.otm.menu.slot.MatterySlot; import ru.dbotthepony.mc.otm.client.screen.MatteryScreen; -import ru.dbotthepony.mc.otm.client.screen.RenderHelper; +import ru.dbotthepony.mc.otm.client.render.RenderHelper; import javax.annotation.Nonnull; import javax.annotation.Nullable; diff --git a/src/main/java/ru/dbotthepony/mc/otm/menu/widget/GaugeWidget.java b/src/main/java/ru/dbotthepony/mc/otm/menu/widget/GaugeWidget.java index 48edb979c..c7a82c4cf 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/menu/widget/GaugeWidget.java +++ b/src/main/java/ru/dbotthepony/mc/otm/menu/widget/GaugeWidget.java @@ -4,7 +4,7 @@ import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.vertex.PoseStack; import net.minecraft.client.renderer.GameRenderer; import ru.dbotthepony.mc.otm.menu.MatteryMenu; -import ru.dbotthepony.mc.otm.client.screen.RenderHelper; +import ru.dbotthepony.mc.otm.client.render.RenderHelper; import ru.dbotthepony.mc.otm.client.screen.UVWindingOrder; abstract public class GaugeWidget extends AbstractWidget {