From 6d49e82a0cf149c7ebc0f1e8cbb4e1c39939a0c3 Mon Sep 17 00:00:00 2001 From: ah-OOG-ah <75745146+ah-OOG-ah@users.noreply.github.com> Date: Tue, 20 Feb 2024 12:34:54 -0500 Subject: [PATCH] Revert "Set aside JSON model code for now" This reverts commit 31fdf3383195b65a00e999a5634ed3ead8f060b2. --- .../{models/unready => }/common/BlockTest.java | 8 ++++---- .../angelica/config/AngelicaConfig.java | 5 ++--- .../{unready/json => }/TestBakedModel.java | 5 ++--- .../models/{unready => }/json/JsonModel.java | 2 +- .../models/{unready => }/json/Loader.java | 2 +- .../models/{unready => }/json/ModelDisplay.java | 2 +- .../models/{unready => }/json/ModelElement.java | 2 +- .../models/{unready => }/json/Variant.java | 2 +- .../angelica/proxy/ClientProxy.java | 16 +++++++--------- .../angelica/proxy/CommonProxy.java | 7 +++---- 10 files changed, 23 insertions(+), 28 deletions(-) rename src/main/java/com/gtnewhorizons/angelica/{models/unready => }/common/BlockTest.java (92%) rename src/main/java/com/gtnewhorizons/angelica/models/{unready/json => }/TestBakedModel.java (94%) rename src/main/java/com/gtnewhorizons/angelica/models/{unready => }/json/JsonModel.java (99%) rename src/main/java/com/gtnewhorizons/angelica/models/{unready => }/json/Loader.java (98%) rename src/main/java/com/gtnewhorizons/angelica/models/{unready => }/json/ModelDisplay.java (95%) rename src/main/java/com/gtnewhorizons/angelica/models/{unready => }/json/ModelElement.java (97%) rename src/main/java/com/gtnewhorizons/angelica/models/{unready => }/json/Variant.java (92%) diff --git a/src/main/java/com/gtnewhorizons/angelica/models/unready/common/BlockTest.java b/src/main/java/com/gtnewhorizons/angelica/common/BlockTest.java similarity index 92% rename from src/main/java/com/gtnewhorizons/angelica/models/unready/common/BlockTest.java rename to src/main/java/com/gtnewhorizons/angelica/common/BlockTest.java index 0291c9f9b..82f922c34 100644 --- a/src/main/java/com/gtnewhorizons/angelica/models/unready/common/BlockTest.java +++ b/src/main/java/com/gtnewhorizons/angelica/common/BlockTest.java @@ -1,11 +1,11 @@ -package com.gtnewhorizons.angelica.models.unready.common; +package com.gtnewhorizons.angelica.common; import com.gtnewhorizons.angelica.api.QuadProvider; import com.gtnewhorizons.angelica.compat.mojang.BlockPos; import com.gtnewhorizons.angelica.compat.nd.Quad; -import com.gtnewhorizons.angelica.models.unready.json.JsonModel; -import com.gtnewhorizons.angelica.models.unready.json.Loader; -import com.gtnewhorizons.angelica.models.unready.json.Variant; +import com.gtnewhorizons.angelica.models.json.JsonModel; +import com.gtnewhorizons.angelica.models.json.Loader; +import com.gtnewhorizons.angelica.models.json.Variant; import com.gtnewhorizons.angelica.utils.ObjectPooler; import it.unimi.dsi.fastutil.objects.ObjectImmutableList; import java.util.List; diff --git a/src/main/java/com/gtnewhorizons/angelica/config/AngelicaConfig.java b/src/main/java/com/gtnewhorizons/angelica/config/AngelicaConfig.java index bfa7d18ef..6fabd4bfc 100644 --- a/src/main/java/com/gtnewhorizons/angelica/config/AngelicaConfig.java +++ b/src/main/java/com/gtnewhorizons/angelica/config/AngelicaConfig.java @@ -23,11 +23,10 @@ public class AngelicaConfig { @Config.RequiresMcRestart public static boolean injectQPRendering; - // TODO: JSON models - /*@Config.Comment("Enable Angelica's test blocks") + @Config.Comment("Enable Angelica's test blocks") @Config.DefaultBoolean(false) @Config.RequiresMcRestart - public static boolean enableTestBlocks;*/ + public static boolean enableTestBlocks; @Config.Comment("Enable Iris Shaders [Requires Sodium]") @Config.DefaultBoolean(false) diff --git a/src/main/java/com/gtnewhorizons/angelica/models/unready/json/TestBakedModel.java b/src/main/java/com/gtnewhorizons/angelica/models/TestBakedModel.java similarity index 94% rename from src/main/java/com/gtnewhorizons/angelica/models/unready/json/TestBakedModel.java rename to src/main/java/com/gtnewhorizons/angelica/models/TestBakedModel.java index 4b0ec673a..c6729a47e 100644 --- a/src/main/java/com/gtnewhorizons/angelica/models/unready/json/TestBakedModel.java +++ b/src/main/java/com/gtnewhorizons/angelica/models/TestBakedModel.java @@ -1,10 +1,9 @@ -package com.gtnewhorizons.angelica.models.unready.json; +package com.gtnewhorizons.angelica.models; import com.gtnewhorizons.angelica.api.QuadProvider; import com.gtnewhorizons.angelica.compat.mojang.BlockPos; import com.gtnewhorizons.angelica.compat.nd.Quad; -import com.gtnewhorizons.angelica.models.NdQuadBuilder; -import com.gtnewhorizons.angelica.models.unready.json.JsonModel; +import com.gtnewhorizons.angelica.models.json.JsonModel; import com.gtnewhorizons.angelica.utils.ObjectPooler; import it.unimi.dsi.fastutil.objects.ObjectImmutableList; import java.util.ArrayList; diff --git a/src/main/java/com/gtnewhorizons/angelica/models/unready/json/JsonModel.java b/src/main/java/com/gtnewhorizons/angelica/models/json/JsonModel.java similarity index 99% rename from src/main/java/com/gtnewhorizons/angelica/models/unready/json/JsonModel.java rename to src/main/java/com/gtnewhorizons/angelica/models/json/JsonModel.java index 063da0999..65100e200 100644 --- a/src/main/java/com/gtnewhorizons/angelica/models/unready/json/JsonModel.java +++ b/src/main/java/com/gtnewhorizons/angelica/models/json/JsonModel.java @@ -1,4 +1,4 @@ -package com.gtnewhorizons.angelica.models.unready.json; +package com.gtnewhorizons.angelica.models.json; import com.google.gson.JsonArray; import com.google.gson.JsonDeserializationContext; diff --git a/src/main/java/com/gtnewhorizons/angelica/models/unready/json/Loader.java b/src/main/java/com/gtnewhorizons/angelica/models/json/Loader.java similarity index 98% rename from src/main/java/com/gtnewhorizons/angelica/models/unready/json/Loader.java rename to src/main/java/com/gtnewhorizons/angelica/models/json/Loader.java index 91c79ff85..afaf66d98 100644 --- a/src/main/java/com/gtnewhorizons/angelica/models/unready/json/Loader.java +++ b/src/main/java/com/gtnewhorizons/angelica/models/json/Loader.java @@ -1,4 +1,4 @@ -package com.gtnewhorizons.angelica.models.unready.json; +package com.gtnewhorizons.angelica.models.json; import com.google.gson.Gson; import com.google.gson.GsonBuilder; diff --git a/src/main/java/com/gtnewhorizons/angelica/models/unready/json/ModelDisplay.java b/src/main/java/com/gtnewhorizons/angelica/models/json/ModelDisplay.java similarity index 95% rename from src/main/java/com/gtnewhorizons/angelica/models/unready/json/ModelDisplay.java rename to src/main/java/com/gtnewhorizons/angelica/models/json/ModelDisplay.java index 032a741dc..11c8a56af 100644 --- a/src/main/java/com/gtnewhorizons/angelica/models/unready/json/ModelDisplay.java +++ b/src/main/java/com/gtnewhorizons/angelica/models/json/ModelDisplay.java @@ -1,4 +1,4 @@ -package com.gtnewhorizons.angelica.models.unready.json; +package com.gtnewhorizons.angelica.models.json; import org.joml.Vector3f; diff --git a/src/main/java/com/gtnewhorizons/angelica/models/unready/json/ModelElement.java b/src/main/java/com/gtnewhorizons/angelica/models/json/ModelElement.java similarity index 97% rename from src/main/java/com/gtnewhorizons/angelica/models/unready/json/ModelElement.java rename to src/main/java/com/gtnewhorizons/angelica/models/json/ModelElement.java index 6ed52fecc..12a2ccc6b 100644 --- a/src/main/java/com/gtnewhorizons/angelica/models/unready/json/ModelElement.java +++ b/src/main/java/com/gtnewhorizons/angelica/models/json/ModelElement.java @@ -1,4 +1,4 @@ -package com.gtnewhorizons.angelica.models.unready.json; +package com.gtnewhorizons.angelica.models.json; import com.gtnewhorizons.angelica.compat.mojang.Axis; import java.util.List; diff --git a/src/main/java/com/gtnewhorizons/angelica/models/unready/json/Variant.java b/src/main/java/com/gtnewhorizons/angelica/models/json/Variant.java similarity index 92% rename from src/main/java/com/gtnewhorizons/angelica/models/unready/json/Variant.java rename to src/main/java/com/gtnewhorizons/angelica/models/json/Variant.java index 20eafb24b..a7cb3ef90 100644 --- a/src/main/java/com/gtnewhorizons/angelica/models/unready/json/Variant.java +++ b/src/main/java/com/gtnewhorizons/angelica/models/json/Variant.java @@ -1,4 +1,4 @@ -package com.gtnewhorizons.angelica.models.unready.json; +package com.gtnewhorizons.angelica.models.json; import lombok.Getter; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/com/gtnewhorizons/angelica/proxy/ClientProxy.java b/src/main/java/com/gtnewhorizons/angelica/proxy/ClientProxy.java index 08f0db925..ae50d328f 100644 --- a/src/main/java/com/gtnewhorizons/angelica/proxy/ClientProxy.java +++ b/src/main/java/com/gtnewhorizons/angelica/proxy/ClientProxy.java @@ -1,11 +1,13 @@ package com.gtnewhorizons.angelica.proxy; import com.google.common.base.Objects; +import com.gtnewhorizons.angelica.common.BlockTest; import com.gtnewhorizons.angelica.compat.ModStatus; import com.gtnewhorizons.angelica.config.AngelicaConfig; import com.gtnewhorizons.angelica.glsm.GLStateManager; import com.gtnewhorizons.angelica.glsm.debug.OpenGLDebugging; import com.gtnewhorizons.angelica.hudcaching.HUDCaching; +import com.gtnewhorizons.angelica.models.json.Loader; import com.gtnewhorizons.angelica.render.CloudRenderer; import cpw.mods.fml.client.registry.ClientRegistry; import cpw.mods.fml.common.FMLCommonHandler; @@ -47,8 +49,7 @@ import static com.gtnewhorizons.angelica.loading.AngelicaTweaker.LOGGER; public class ClientProxy extends CommonProxy { final Minecraft mc = Minecraft.getMinecraft(); - // TODO: JSON models - //private static boolean baked = false; + private static boolean baked = false; @Override public void preInit(FMLPreInitializationEvent event) { @@ -57,8 +58,7 @@ public class ClientProxy extends CommonProxy { FMLCommonHandler.instance().bus().register(this); MinecraftForge.EVENT_BUS.register(this); - // TODO: JSON models - //Loader.registerModels(BlockTest::loadModel, BlockTest.modelId); + Loader.registerModels(BlockTest::loadModel, BlockTest.modelId); } @@ -99,8 +99,7 @@ public class ClientProxy extends CommonProxy { glsmKeyBinding = new KeyBinding("Print GLSM Debug", Keyboard.KEY_NONE, "Angelica Keybinds"); ClientRegistry.registerKeyBinding(glsmKeyBinding); - // TODO: JSON models - //Loader.loadModels(); + Loader.loadModels(); } private boolean wasGLSMKeyPressed; @@ -246,11 +245,10 @@ public class ClientProxy extends CommonProxy { CloudRenderer.getCloudRenderer().checkSettings(); } - // TODO: JSON models - /*if (!baked) { + if (!baked) { Loader.bakeModels(); baked = true; - }*/ + } } @SubscribeEvent diff --git a/src/main/java/com/gtnewhorizons/angelica/proxy/CommonProxy.java b/src/main/java/com/gtnewhorizons/angelica/proxy/CommonProxy.java index 919273266..6f57ebe54 100644 --- a/src/main/java/com/gtnewhorizons/angelica/proxy/CommonProxy.java +++ b/src/main/java/com/gtnewhorizons/angelica/proxy/CommonProxy.java @@ -1,6 +1,6 @@ package com.gtnewhorizons.angelica.proxy; -import com.gtnewhorizons.angelica.models.unready.common.BlockTest; +import com.gtnewhorizons.angelica.common.BlockTest; import com.gtnewhorizons.angelica.config.AngelicaConfig; import cpw.mods.fml.common.event.FMLInitializationEvent; import cpw.mods.fml.common.event.FMLPostInitializationEvent; @@ -11,10 +11,9 @@ public class CommonProxy { public void preInit(FMLPreInitializationEvent event) { - // TODO: JSON models - /*if (AngelicaConfig.enableTestBlocks){ + if (AngelicaConfig.enableTestBlocks){ GameRegistry.registerBlock(new BlockTest(), "test_block"); - }*/ + } } public void init(FMLInitializationEvent event) {}