diff --git a/README.MD b/README.MD index 78208509b..38f9c66e5 100644 --- a/README.MD +++ b/README.MD @@ -60,4 +60,5 @@ * Forge 1.12+ * Some files have been taken from Minecraft Forge under the LGPL 2.1 license and are marked as such * FRAPI and Indigo - * Model building API heavily inspired by/copied from Fabric's and are relicensed under the LGPLv3; upstream may use it under the Apache 2.0, see LICENSE in that package + * Model building API heavily inspired by/copied from Fabric's; upstream may use it under the original Apache 2.0 + license, see LICENSE in `com.gtnewhorizons.angelica.models` diff --git a/src/main/java/com/gtnewhorizons/angelica/config/AngelicaConfig.java b/src/main/java/com/gtnewhorizons/angelica/config/AngelicaConfig.java index 6fabd4bfc..97861b024 100644 --- a/src/main/java/com/gtnewhorizons/angelica/config/AngelicaConfig.java +++ b/src/main/java/com/gtnewhorizons/angelica/config/AngelicaConfig.java @@ -25,7 +25,7 @@ public class AngelicaConfig { @Config.Comment("Enable Angelica's test blocks") @Config.DefaultBoolean(false) - @Config.RequiresMcRestart + @Config.Ignore() public static boolean enableTestBlocks; @Config.Comment("Enable Iris Shaders [Requires Sodium]") diff --git a/src/main/java/com/gtnewhorizons/angelica/loading/AngelicaTweaker.java b/src/main/java/com/gtnewhorizons/angelica/loading/AngelicaTweaker.java index 8fd5cd20e..617088317 100644 --- a/src/main/java/com/gtnewhorizons/angelica/loading/AngelicaTweaker.java +++ b/src/main/java/com/gtnewhorizons/angelica/loading/AngelicaTweaker.java @@ -50,6 +50,9 @@ public class AngelicaTweaker implements IFMLLoadingPlugin, IEarlyMixinLoader { AngelicaConfig.enableIris = Boolean.parseBoolean(System.getProperty("angelica.enableShaders", "false")); AngelicaConfig.enableMCPatcherForgeFeatures = Boolean.parseBoolean(System.getProperty("angelica.enableMCPatcherForgeFeatures", "false")); + // Debug features + AngelicaConfig.enableTestBlocks = Boolean.parseBoolean(System.getProperty("angelica.enableTestBlocks", "false")); + } catch (ConfigException e) { throw new RuntimeException(e); } diff --git a/src/main/java/com/gtnewhorizons/angelica/mixins/early/angelica/models/MixinBlockStone.java b/src/main/java/com/gtnewhorizons/angelica/mixins/early/angelica/models/MixinBlockStone.java index af0d9682b..2e953fc7f 100644 --- a/src/main/java/com/gtnewhorizons/angelica/mixins/early/angelica/models/MixinBlockStone.java +++ b/src/main/java/com/gtnewhorizons/angelica/mixins/early/angelica/models/MixinBlockStone.java @@ -3,7 +3,7 @@ package com.gtnewhorizons.angelica.mixins.early.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.MixinModels; +import com.gtnewhorizons.angelica.models.VanillaModels; import com.gtnewhorizons.angelica.utils.ObjectPooler; import net.minecraft.block.Block; import net.minecraft.block.BlockStone; @@ -19,6 +19,6 @@ public abstract class MixinBlockStone implements QuadProvider { // TODO: Use modern model API public List getQuads(IBlockAccess world, BlockPos pos, Block block, int meta, ForgeDirection dir, Random random, int color, ObjectPooler quadPool) { - return MixinModels.stoneModel.getQuads(world, pos, block, meta, dir, random, color, quadPool); + return VanillaModels.stoneModel.getQuads(world, pos, block, meta, dir, random, color, quadPool); } } diff --git a/src/main/java/com/gtnewhorizons/angelica/models/MixinModels.java b/src/main/java/com/gtnewhorizons/angelica/models/VanillaModels.java similarity index 77% rename from src/main/java/com/gtnewhorizons/angelica/models/MixinModels.java rename to src/main/java/com/gtnewhorizons/angelica/models/VanillaModels.java index a3263d409..9c6e7ff33 100644 --- a/src/main/java/com/gtnewhorizons/angelica/models/MixinModels.java +++ b/src/main/java/com/gtnewhorizons/angelica/models/VanillaModels.java @@ -1,15 +1,11 @@ package com.gtnewhorizons.angelica.models; -import com.gtnewhorizons.angelica.compat.nd.Quad; import com.gtnewhorizons.angelica.models.json.JsonModel; import com.gtnewhorizons.angelica.models.json.Loader; import com.gtnewhorizons.angelica.models.json.Variant; -import it.unimi.dsi.fastutil.objects.ObjectImmutableList; import net.minecraft.util.ResourceLocation; -import java.util.List; - -public class MixinModels { +public class VanillaModels { public static final Variant stoneVariant = new Variant( new ResourceLocation("blocks/stone"), diff --git a/src/main/java/com/gtnewhorizons/angelica/proxy/ClientProxy.java b/src/main/java/com/gtnewhorizons/angelica/proxy/ClientProxy.java index 9b0165486..903afa94e 100644 --- a/src/main/java/com/gtnewhorizons/angelica/proxy/ClientProxy.java +++ b/src/main/java/com/gtnewhorizons/angelica/proxy/ClientProxy.java @@ -7,7 +7,7 @@ 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.MixinModels; +import com.gtnewhorizons.angelica.models.VanillaModels; import com.gtnewhorizons.angelica.models.json.Loader; import com.gtnewhorizons.angelica.render.CloudRenderer; import com.gtnewhorizons.angelica.rendering.AngelicaBlockSafetyRegistry; @@ -64,8 +64,10 @@ public class ClientProxy extends CommonProxy { FMLCommonHandler.instance().bus().register(this); MinecraftForge.EVENT_BUS.register(this); - Loader.registerModels(BlockTest::loadModel, BlockTest.modelId); - Loader.registerModels(MixinModels::loadModels, MixinModels.stoneVariant); + if (AngelicaConfig.enableTestBlocks) + Loader.registerModels(BlockTest::loadModel, BlockTest.modelId); + if (AngelicaConfig.injectQPRendering) + Loader.registerModels(VanillaModels::loadModels, VanillaModels.stoneVariant); }