Revert "Set aside JSON model code for now"

This reverts commit 31fdf3383195b65a00e999a5634ed3ead8f060b2.
This commit is contained in:
ah-OOG-ah committed 2024-02-29 21:17:46 -05:00
1 parent 2fea614a45
commit 6d49e82a0c
10 files changed
+23 -28

No files matched your search

@@ -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;
@@ -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)
@@ -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;
@@ -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;
@@ -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;
@@ -1,4 +1,4 @@
package com.gtnewhorizons.angelica.models.unready.json;
package com.gtnewhorizons.angelica.models.json;
import org.joml.Vector3f;
@@ -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;
@@ -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;
@@ -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
@@ -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) {}