mirror of
https://github.com/GTNewHorizons/Angelica.git
synced 2026-11-22 13:19:44 +00:00
Minor patches + license rewording
This commit is contained in:
1 parent
bc3ca5209f
commit
f2445fabba
6 files changed
+14
-12
No files matched your search
@@ -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]")
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
+2
-2
@@ -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<Quad> getQuads(IBlockAccess world, BlockPos pos, Block block, int meta, ForgeDirection dir, Random random, int color, ObjectPooler<Quad> 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);
|
||||
}
|
||||
}
|
||||
+1
-5
@@ -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"),
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in new issue
Block a user