Skip to content

Commit 6dbdcee

Browse files
committed
Remove the ID limit fixes
1 parent 8cb3088 commit 6dbdcee

11 files changed

Lines changed: 7 additions & 475 deletions
Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package org.dimdev.vanillafix;
22

33
import net.minecraftforge.common.config.Configuration;
4-
import net.minecraftforge.common.config.Property;
54

65
import java.io.File;
76

@@ -11,7 +10,6 @@ public class LoadingConfig {
1110

1211
public boolean bugFixes;
1312
public boolean crashFixes;
14-
public boolean idLimit;
1513
public boolean modSupport;
1614
public boolean profiler;
1715
public boolean textureFixes;
@@ -21,7 +19,6 @@ public void init(File file) {
2119
if (!file.exists()) {
2220
bugFixes = true;
2321
crashFixes = true;
24-
idLimit = true;
2522
modSupport = true;
2623
profiler = true;
2724
textureFixes = true;
@@ -34,17 +31,10 @@ public void init(File file) {
3431
}
3532

3633
public void reload() {
37-
bugFixes = getBoolean("bugFixes", "fixes", true);
38-
crashFixes = getBoolean("crashFixes", "fixes", true);
39-
idLimit = getBoolean("idLimit", "fixes", true);
40-
modSupport = getBoolean("modSupport", "fixes", true);
41-
profiler = getBoolean("profiler", "fixes", true);
42-
textureFixes = getBoolean("textureFixes", "fixes", true);
34+
bugFixes = config.get("fixes", "bugFixes", true).getBoolean();
35+
crashFixes = config.get("fixes", "crashFixes", true).getBoolean();
36+
modSupport = config.get("fixes", "modSupport", true).getBoolean();
37+
profiler = config.get("fixes", "profiler", true).getBoolean();
38+
textureFixes = config.get("fixes", "textureFixes", true).getBoolean();
4339
}
44-
45-
private boolean getBoolean(String name, String category, boolean defaultValue) {
46-
Property prop = config.get(category, name, defaultValue);
47-
return prop.getBoolean(defaultValue);
48-
}
49-
5040
}

src/main/java/org/dimdev/vanillafix/ModCompatibilityMixinPlugin.java

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,11 @@
1111

1212
public class ModCompatibilityMixinPlugin implements IMixinConfigPlugin {
1313
private boolean spongeInstalled;
14-
private boolean neidInstalled;
1514

1615
@Override
1716
public void onLoad(String mixinPackage) {
1817
try {
1918
spongeInstalled = Launch.classLoader.getClassBytes("org.spongepowered.mod.SpongeCoremod") != null;
20-
neidInstalled = Launch.classLoader.getClassBytes("ru.fewizz.neid.asm.Transformer") != null;
2119
} catch (IOException e) {
2220
throw new RuntimeException(e); // Should never happen
2321
}
@@ -36,11 +34,6 @@ public boolean shouldApplyMixin(String targetClassName, String mixinClassName) {
3634
if (mixinClassName.equals("org.dimdev.vanillafix.profiler.mixins.MixinWorld")) return false;
3735
}
3836

39-
// NotEnoughIDs
40-
if (neidInstalled) {
41-
if (mixinClassName.startsWith("org.dimdev.vanillafix.idlimit.")) return false;
42-
}
43-
4437
return true;
4538
}
4639

src/main/java/org/dimdev/vanillafix/ModConfig.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,6 @@ public static class Fixes {
3131
@RequiresMcRestart
3232
public boolean crashFixes = true;
3333

34-
@Name("idLimit")
35-
@LangKey("vanillafix.fixes.idLimit")
36-
@RequiresMcRestart
37-
public boolean idLimit = true;
38-
3934
@Name("modSupport")
4035
@LangKey("vanillafix.fixes.modSupport")
4136
@RequiresMcRestart

src/main/java/org/dimdev/vanillafix/VanillaFixLoadingPlugin.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,13 @@ public VanillaFixLoadingPlugin() {
3636

3737
MixinBootstrap.init();
3838

39+
// @formatter:off
3940
if (config.bugFixes) Mixins.addConfiguration("mixins.vanillafix.bugs.json");
4041
if (config.crashFixes) Mixins.addConfiguration("mixins.vanillafix.crashes.json");
4142
if (config.profiler) Mixins.addConfiguration("mixins.vanillafix.profiler.json");
4243
if (config.textureFixes) Mixins.addConfiguration("mixins.vanillafix.textures.json");
43-
if (config.idLimit) Mixins.addConfiguration("mixins.vanillafix.idlimit.json");
4444
if (config.modSupport) Mixins.addConfiguration("mixins.vanillafix.modsupport.json");
45+
// @formatter:on
4546
}
4647

4748
public static void initialize() {

src/main/java/org/dimdev/vanillafix/idlimit/IPatchedBlockStateContainer.java

Lines changed: 0 additions & 6 deletions
This file was deleted.

src/main/java/org/dimdev/vanillafix/idlimit/mixins/MixinAnvilChunkLoader.java

Lines changed: 0 additions & 35 deletions
This file was deleted.

src/main/java/org/dimdev/vanillafix/idlimit/mixins/MixinBlock.java

Lines changed: 0 additions & 51 deletions
This file was deleted.

src/main/java/org/dimdev/vanillafix/idlimit/mixins/MixinBlockStateContainer.java

Lines changed: 0 additions & 113 deletions
This file was deleted.

src/main/java/org/dimdev/vanillafix/idlimit/mixins/MixinGameData.java

Lines changed: 0 additions & 26 deletions
This file was deleted.

0 commit comments

Comments
 (0)