update buildscript and fplib dep

Temporarily disable archaicfix
This commit is contained in:
FalsePattern committed 2022-08-25 21:10:41 +02:00
1 parent 5d3bb1bc77
commit bbe23d663d
9 files changed
+93 -79

No files matched your search

@@ -1,9 +1,6 @@
package com.falsepattern.endlessids;
import com.falsepattern.endlessids.asm.IETransformer;
import com.falsepattern.endlessids.config.GeneralConfig;
import com.falsepattern.lib.config.ConfigException;
import com.falsepattern.lib.config.ConfigurationManager;
import lombok.SneakyThrows;
import lombok.val;
@@ -23,13 +20,6 @@ import static cpw.mods.fml.relauncher.IFMLLoadingPlugin.TransformerExclusions;
@TransformerExclusions({"com.falsepattern.endlessids.asm"})
@DependsOn("falsepatternlib")
public class IEPlugin implements IFMLLoadingPlugin {
static {
try {
ConfigurationManager.registerConfig(GeneralConfig.class);
} catch (ConfigException e) {
System.err.println("Failed to load EndlessIDs config. Using defaults.");
}
}
public IEPlugin() {
super();
@@ -3,17 +3,12 @@ package com.falsepattern.endlessids.config;
import com.falsepattern.endlessids.Tags;
import com.falsepattern.endlessids.constants.ExtendedConstants;
import com.falsepattern.lib.config.Config;
import com.falsepattern.lib.config.ConfigException;
import com.falsepattern.lib.config.ConfigurationManager;
@Config(modid = Tags.MODID, category = "darkworld")
public class DarkWorldIDConfig {
static {
try {
ConfigurationManager.registerConfig(DarkWorldIDConfig.class);
} catch (ConfigException e) {
throw new RuntimeException(e);
}
ConfigurationManager.selfInit();
}
@Config.Comment("Original: 100")
@Config.RangeInt(min = 40, max = ExtendedConstants.biomeIDCount - 1)
@@ -3,17 +3,12 @@ package com.falsepattern.endlessids.config;
import com.falsepattern.endlessids.Tags;
import com.falsepattern.endlessids.constants.ExtendedConstants;
import com.falsepattern.lib.config.Config;
import com.falsepattern.lib.config.ConfigException;
import com.falsepattern.lib.config.ConfigurationManager;
@Config(modid = Tags.MODID, category = "futurepack")
public class FuturepackIDConfig {
static {
try {
ConfigurationManager.registerConfig(FuturepackIDConfig.class);
} catch (ConfigException e) {
throw new RuntimeException(e);
}
ConfigurationManager.selfInit();
}
@Config.Comment("Original: 97")
@Config.RangeInt(min = 40, max = ExtendedConstants.biomeIDCount - 1)
@@ -2,16 +2,23 @@ package com.falsepattern.endlessids.config;
import com.falsepattern.endlessids.Tags;
import com.falsepattern.lib.config.Config;
import com.falsepattern.lib.config.ConfigurationManager;
@Config(modid = Tags.MODID)
public class GeneralConfig {
public static boolean catchUnregisteredBlocks = false;
static {
ConfigurationManager.selfInit();
}
@Config.DefaultBoolean(false)
public static boolean catchUnregisteredBlocks;
@Config.Comment("Remove invalid (corrupted) blocks from the game.")
public static boolean removeInvalidBlocks = false;
@Config.DefaultBoolean(false)
public static boolean removeInvalidBlocks;
@Config.Comment("Extend DataWatcher IDs. Vanilla limit is 31, new limit is 127.")
public static boolean extendDataWatcher = false;
@Config.DefaultBoolean(false)
public static boolean extendDataWatcher;
@Config.Comment(
"Setting this value greater than 0 will reduce RAM usage, at the cost of less available Block IDs.\n" +
@@ -21,5 +28,6 @@ public class GeneralConfig {
"(0: 16M, 1: 8M, 2: 4M, 3: 2M, 4: 1M, 5: 512K, 6: 256K, 7: 128K, 8: 64K, 9: 32K, 10: 16K, 11: 8K, 12: 4K)\n")
@Config.RangeInt(min = 0,
max = 12)
public static int countCorrectionBits = 0;
@Config.DefaultInt(0)
public static int countCorrectionBits;
}
@@ -1,7 +1,7 @@
package com.falsepattern.endlessids.mixin.mixins.common.antiidconflict;
import code.elix_x.coremods.antiidconflict.AntiIdConflictBase;
import org.spongepowered.asm.lib.Opcodes;
import org.objectweb.asm.Opcodes;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow;
import org.spongepowered.asm.mixin.injection.At;