diff options
Diffstat (limited to 'src/main/java')
16 files changed, 112 insertions, 190 deletions
diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/API/package-info.java b/src/main/java/com/github/bartimaeusnek/bartworks/API/package-info.java deleted file mode 100644 index f23eb8144a..0000000000 --- a/src/main/java/com/github/bartimaeusnek/bartworks/API/package-info.java +++ /dev/null @@ -1,18 +0,0 @@ -/* - * Copyright (c) 2018-2020 bartimaeusnek Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in the Software without restriction, - * including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following - * conditions: The above copyright notice and this permission notice shall be included in all copies or substantial - * portions of the Software. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, - * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. - * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN - * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS IN THE SOFTWARE. - */ -@API(owner = Mods.Names.BART_WORKS, apiVersion = GT_Version.VERSION, provides = "bartworks API") -package com.github.bartimaeusnek.bartworks.API; - -import cpw.mods.fml.common.API; -import gregtech.GT_Version; -import gregtech.api.enums.Mods; diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/ASM/BWCore.java b/src/main/java/com/github/bartimaeusnek/bartworks/ASM/BWCore.java index 54598f9478..9841ef78da 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/ASM/BWCore.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/ASM/BWCore.java @@ -15,7 +15,6 @@ package com.github.bartimaeusnek.bartworks.ASM; import static com.github.bartimaeusnek.bartworks.ASM.BWCoreTransformer.shouldTransform; import static gregtech.api.enums.Mods.ExtraUtilities; -import static gregtech.api.enums.Mods.GTPlusPlus; import static gregtech.api.enums.Mods.RWG; import static gregtech.api.enums.Mods.Thaumcraft; @@ -69,7 +68,6 @@ public class BWCore extends DummyModContainer { List<ArtifactVersion> ret = new ArrayList<>(); ret.add(new DefaultArtifactVersion(ExtraUtilities.ID, true)); ret.add(new DefaultArtifactVersion(Thaumcraft.ID, true)); - ret.add(new DefaultArtifactVersion(GTPlusPlus.ID, true)); ret.add(new DefaultArtifactVersion(RWG.ID, true)); ret.add(new DefaultArtifactVersion(MainMod.MOD_ID, true)); ret.add(new DefaultArtifactVersion(BartWorksCrossmod.MOD_ID, true)); diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/ASM/BWCorePlugin.java b/src/main/java/com/github/bartimaeusnek/bartworks/ASM/BWCorePlugin.java deleted file mode 100644 index f7fde1167d..0000000000 --- a/src/main/java/com/github/bartimaeusnek/bartworks/ASM/BWCorePlugin.java +++ /dev/null @@ -1,82 +0,0 @@ -/* - * Copyright (c) 2018-2020 bartimaeusnek Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in the Software without restriction, - * including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following - * conditions: The above copyright notice and this permission notice shall be included in all copies or substantial - * portions of the Software. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, - * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. - * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN - * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS IN THE SOFTWARE. - */ - -package com.github.bartimaeusnek.bartworks.ASM; - -import java.io.File; -import java.util.ArrayList; -import java.util.Map; - -import net.minecraftforge.common.config.Configuration; - -import com.github.bartimaeusnek.bartworks.common.configs.ConfigHandler; - -import cpw.mods.fml.relauncher.FMLInjectionData; -import cpw.mods.fml.relauncher.IFMLLoadingPlugin; - -@IFMLLoadingPlugin.SortingIndex(Integer.MAX_VALUE) // Load as late as possible (after fastcraft/OptiFine). -@IFMLLoadingPlugin.MCVersion("1.7.10") -@IFMLLoadingPlugin.TransformerExclusions("com.github.bartimaeusnek.bartworks.ASM") -@IFMLLoadingPlugin.Name(BWCorePlugin.BWCORE_PLUGIN_NAME) -public class BWCorePlugin implements IFMLLoadingPlugin { - - public static final String BWCORE_PLUGIN_NAME = "BartWorks ASM Core Plugin"; - - public static File minecraftDir; - - public BWCorePlugin() { - // Injection Code taken from CodeChickenLib - if (BWCorePlugin.minecraftDir != null) return; // get called twice, once for IFMLCallHook - BWCorePlugin.minecraftDir = (File) FMLInjectionData.data()[6]; - // do all the configuration already now... - new ConfigHandler(new Configuration(new File(new File(BWCorePlugin.minecraftDir, "config"), "bartworks.cfg"))); - BWCoreTransformer.shouldTransform[2] = false; - } - - @Override - public String[] getASMTransformerClass() { - return new String[] { BWCoreTransformer.class.getName() }; - } - - @Override - public String getModContainerClass() { - return BWCore.class.getName(); - } - - @Override - public String getSetupClass() { - return null; - } - - @Override - @SuppressWarnings("rawtypes") - public void injectData(Map<String, Object> data) { - if (data.get("runtimeDeobfuscationEnabled") != null) { - BWCoreTransformer.obfs = (boolean) data.get("runtimeDeobfuscationEnabled"); - } - if (data.get("coremodList") != null) { - for (Object o : (ArrayList) data.get("coremodList")) { - if (o.toString() - .contains("MicdoodlePlugin")) { - BWCoreTransformer.shouldTransform[2] = ConfigHandler.enabledPatches[2]; - break; - } - } - } - } - - @Override - public String getAccessTransformerClass() { - return null; - } -} diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/ASM/BWCoreTransformer.java b/src/main/java/com/github/bartimaeusnek/bartworks/ASM/BWCoreTransformer.java index 02835e39c2..2659f07af1 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/ASM/BWCoreTransformer.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/ASM/BWCoreTransformer.java @@ -52,7 +52,7 @@ public class BWCoreTransformer implements IClassTransformer { "com.rwtema.extrautils.worldgen.endoftime.WorldProviderEndOfTime", "com.rwtema.extrautils.worldgen.endoftime.ChunkProviderEndOfTime", "thaumcraft.common.tiles.TileWandPedestal", "net.minecraft.item.crafting.CraftingManager" }; - static boolean obfs; + public static boolean obfs; public static boolean[] shouldTransform = new boolean[BWCoreTransformer.CLASSESBEINGTRANSFORMED.length]; diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/MainMod.java b/src/main/java/com/github/bartimaeusnek/bartworks/MainMod.java index cf2643a850..f8e4bbfe7b 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/MainMod.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/MainMod.java @@ -22,7 +22,6 @@ import static gregtech.api.enums.Mods.GTPlusPlus; import java.io.IOException; import java.util.Map; -import gregtech.GT_Version; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.ItemStack; import net.minecraftforge.common.MinecraftForge; @@ -74,6 +73,7 @@ import cpw.mods.fml.common.event.FMLServerStartedEvent; import cpw.mods.fml.common.event.FMLServerStartingEvent; import cpw.mods.fml.common.network.IGuiHandler; import cpw.mods.fml.common.network.NetworkRegistry; +import gregtech.GT_Version; import gregtech.api.GregTech_API; import gregtech.api.enums.Mods; import gregtech.api.recipe.RecipeMap; diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/util/package-info.java b/src/main/java/com/github/bartimaeusnek/bartworks/util/package-info.java deleted file mode 100644 index fdb0d3a06a..0000000000 --- a/src/main/java/com/github/bartimaeusnek/bartworks/util/package-info.java +++ /dev/null @@ -1,18 +0,0 @@ -/* - * Copyright (c) 2018-2020 bartimaeusnek Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in the Software without restriction, - * including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following - * conditions: The above copyright notice and this permission notice shall be included in all copies or substantial - * portions of the Software. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, - * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. - * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN - * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS IN THE SOFTWARE. - */ -@API(owner = Mods.Names.BART_WORKS, apiVersion = GT_Version.VERSION, provides = "bartworks util") -package com.github.bartimaeusnek.bartworks.util; - -import cpw.mods.fml.common.API; -import gregtech.GT_Version; -import gregtech.api.enums.Mods; diff --git a/src/main/java/com/github/bartimaeusnek/crossmod/BartWorksCrossmod.java b/src/main/java/com/github/bartimaeusnek/crossmod/BartWorksCrossmod.java index aaabb629ab..0502c121fd 100644 --- a/src/main/java/com/github/bartimaeusnek/crossmod/BartWorksCrossmod.java +++ b/src/main/java/com/github/bartimaeusnek/crossmod/BartWorksCrossmod.java @@ -19,7 +19,6 @@ import static gregtech.api.enums.Mods.TecTech; import java.io.StringReader; -import gregtech.GT_Version; import net.minecraft.util.StringTranslate; import org.apache.commons.io.input.ReaderInputStream; @@ -35,6 +34,7 @@ import cpw.mods.fml.common.event.FMLInitializationEvent; import cpw.mods.fml.common.event.FMLPostInitializationEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent; import cpw.mods.fml.common.event.FMLServerStartingEvent; +import gregtech.GT_Version; @Mod( modid = BartWorksCrossmod.MOD_ID, diff --git a/src/main/java/com/github/bartimaeusnek/crossmod/tgregworks/MaterialsInjector.java b/src/main/java/com/github/bartimaeusnek/crossmod/tgregworks/MaterialsInjector.java index c222a6d787..0eed09d3fd 100644 --- a/src/main/java/com/github/bartimaeusnek/crossmod/tgregworks/MaterialsInjector.java +++ b/src/main/java/com/github/bartimaeusnek/crossmod/tgregworks/MaterialsInjector.java @@ -2,7 +2,6 @@ package com.github.bartimaeusnek.crossmod.tgregworks; import static gregtech.api.enums.Mods.TinkersGregworks; -import gregtech.GT_Version; import net.minecraftforge.common.config.Property; import com.github.bartimaeusnek.bartworks.MainMod; @@ -10,6 +9,7 @@ import com.github.bartimaeusnek.bartworks.system.material.Werkstoff; import cpw.mods.fml.common.Mod; import cpw.mods.fml.common.event.FMLInitializationEvent; +import gregtech.GT_Version; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; import vexatos.tgregworks.TGregworks; diff --git a/src/main/java/gregtech/asm/GTCorePlugin.java b/src/main/java/gregtech/asm/GTCorePlugin.java new file mode 100644 index 0000000000..a31d106bbe --- /dev/null +++ b/src/main/java/gregtech/asm/GTCorePlugin.java @@ -0,0 +1,85 @@ +package gregtech.asm; + +import java.io.File; +import java.util.ArrayList; +import java.util.Map; + +import net.minecraftforge.common.config.Configuration; + +import com.github.bartimaeusnek.bartworks.ASM.BWCore; +import com.github.bartimaeusnek.bartworks.ASM.BWCoreTransformer; +import com.github.bartimaeusnek.bartworks.common.configs.ConfigHandler; + +import cpw.mods.fml.relauncher.FMLInjectionData; +import cpw.mods.fml.relauncher.IFMLLoadingPlugin; +import gtPlusPlus.preloader.CORE_Preloader; +import gtPlusPlus.preloader.asm.AsmConfig; +import gtPlusPlus.preloader.asm.Preloader_DummyContainer; +import gtPlusPlus.preloader.asm.transformers.Preloader_Transformer_Handler; + +@IFMLLoadingPlugin.SortingIndex(Integer.MAX_VALUE) // Load as late as possible (after fastcraft/OptiFine). +@IFMLLoadingPlugin.MCVersion("1.7.10") +@IFMLLoadingPlugin.TransformerExclusions({ "com.github.bartimaeusnek.bartworks.ASM", "gtPlusPlus.preloader", + "gregtech.asm" }) +@IFMLLoadingPlugin.Name("GregTech 5 Unofficial core plugin") +@SuppressWarnings("unused") // loaded by FML +public class GTCorePlugin implements IFMLLoadingPlugin { + + public static final String BWCORE_PLUGIN_NAME = "BartWorks ASM Core Plugin"; + public static File minecraftDir; + + public GTCorePlugin() { + // Injection Code taken from CodeChickenLib + if (minecraftDir != null) return; // get called twice, once for IFMLCallHook + minecraftDir = (File) FMLInjectionData.data()[6]; + // do all the configuration already now... + new ConfigHandler(new Configuration(new File(new File(minecraftDir, "config"), "bartworks.cfg"))); + BWCoreTransformer.shouldTransform[2] = false; + } + + @Override + public String[] getASMTransformerClass() { + return new String[] { BWCoreTransformer.class.getName(), Preloader_Transformer_Handler.class.getName() }; + } + + @Override + public String getModContainerClass() { + FMLInjectionData.containers.add(BWCore.class.getName()); + return Preloader_DummyContainer.class.getName(); + } + + @Override + public String getSetupClass() { + return null; + } + + @Override + public void injectData(Map<String, Object> data) { + // GT++ + CORE_Preloader.DEV_ENVIRONMENT = !(boolean) data.get("runtimeDeobfuscationEnabled"); + File mcDir = (File) data.get("mcLocation"); + if (mcDir != null && mcDir.exists()) { + CORE_Preloader.setMinecraftDirectory(mcDir); + } + CORE_Preloader.DEBUG_MODE = AsmConfig.debugMode; + + // Bartworks + if (data.get("runtimeDeobfuscationEnabled") != null) { + BWCoreTransformer.obfs = (boolean) data.get("runtimeDeobfuscationEnabled"); + } + if (data.get("coremodList") != null) { + for (Object o : (ArrayList) data.get("coremodList")) { + if (o.toString() + .contains("MicdoodlePlugin")) { + BWCoreTransformer.shouldTransform[2] = ConfigHandler.enabledPatches[2]; + break; + } + } + } + } + + @Override + public String getAccessTransformerClass() { + return null; + } +} diff --git a/src/main/java/gtPlusPlus/core/commands/CommandEnableDebugWhileRunning.java b/src/main/java/gtPlusPlus/core/commands/CommandEnableDebugWhileRunning.java index 1794951248..bf42a0792d 100644 --- a/src/main/java/gtPlusPlus/core/commands/CommandEnableDebugWhileRunning.java +++ b/src/main/java/gtPlusPlus/core/commands/CommandEnableDebugWhileRunning.java @@ -37,14 +37,9 @@ public class CommandEnableDebugWhileRunning implements ICommand { @Override public int compareTo(final Object o) { - if (o instanceof Comparable<?>) { - @SuppressWarnings("unchecked") - Comparable<ICommand> a = (Comparable<ICommand>) o; - if (a.equals(this)) { - return 0; - } else { - return -1; - } + if (o instanceof ICommand c) { + return this.getCommandName() + .compareTo(c.getCommandName()); } return -1; } @@ -224,7 +219,7 @@ public class CommandEnableDebugWhileRunning implements ICommand { } @Override - public List<?> addTabCompletionOptions(final ICommandSender var1, final String[] var2) { + public List<String> addTabCompletionOptions(final ICommandSender var1, final String[] var2) { ArrayList<String> aTabCompletes = new ArrayList<>(); aTabCompletes.add("?"); aTabCompletes.add("logging"); diff --git a/src/main/java/gtPlusPlus/core/commands/CommandMath.java b/src/main/java/gtPlusPlus/core/commands/CommandMath.java index 6065044c29..f23e45a359 100644 --- a/src/main/java/gtPlusPlus/core/commands/CommandMath.java +++ b/src/main/java/gtPlusPlus/core/commands/CommandMath.java @@ -26,7 +26,11 @@ public class CommandMath implements ICommand { @Override public int compareTo(final Object o) { - return 0; + if (o instanceof ICommand c) { + return this.getCommandName() + .compareTo(c.getCommandName()); + } + return -1; } @Override @@ -75,7 +79,7 @@ public class CommandMath implements ICommand { } @Override - public List<?> addTabCompletionOptions(final ICommandSender var1, final String[] var2) { + public List<String> addTabCompletionOptions(final ICommandSender var1, final String[] var2) { return null; } diff --git a/src/main/java/gtPlusPlus/core/lib/CORE.java b/src/main/java/gtPlusPlus/core/lib/CORE.java index 9108fafc22..8dce46ee46 100644 --- a/src/main/java/gtPlusPlus/core/lib/CORE.java +++ b/src/main/java/gtPlusPlus/core/lib/CORE.java @@ -10,7 +10,6 @@ import java.util.WeakHashMap; import java.util.concurrent.ConcurrentHashMap; import java.util.function.Supplier; -import gregtech.GT_Version; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; @@ -19,6 +18,7 @@ import net.minecraft.world.World; import com.mojang.authlib.GameProfile; import cpw.mods.fml.common.FMLCommonHandler; +import gregtech.GT_Version; import gregtech.api.objects.XSTR; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.api.objects.data.Pair; diff --git a/src/main/java/gtPlusPlus/core/world/explosions/MiningExplosion.java b/src/main/java/gtPlusPlus/core/world/explosions/MiningExplosion.java index 4d5473d349..016dfc8c58 100644 --- a/src/main/java/gtPlusPlus/core/world/explosions/MiningExplosion.java +++ b/src/main/java/gtPlusPlus/core/world/explosions/MiningExplosion.java @@ -32,7 +32,7 @@ public class MiningExplosion extends Explosion { private final Random explosionRNG = new XSTR(); private final World worldObj; - private final Map<Entity, Vec3> field_77288_k = new HashMap<>(); + private final Map<EntityPlayer, Vec3> field_77288_k = new HashMap<>(); public MiningExplosion(final World worldObj, final Entity entityObj, final double x, final double y, final double z, final float size) { @@ -152,8 +152,8 @@ public class MiningExplosion extends Explosion { entity.motionY += d6 * d8; entity.motionZ += d7 * d8; - if (entity instanceof EntityPlayer) { - this.field_77288_k.put(entity, Vec3.createVectorHelper(d5 * d11, d6 * d11, d7 * d11)); + if (entity instanceof EntityPlayer player) { + this.field_77288_k.put(player, Vec3.createVectorHelper(d5 * d11, d6 * d11, d7 * d11)); } } } @@ -425,7 +425,7 @@ public class MiningExplosion extends Explosion { } @Override - public Map<Entity, Vec3> func_77277_b() { + public Map<EntityPlayer, Vec3> func_77277_b() { return this.field_77288_k; } diff --git a/src/main/java/gtPlusPlus/everglades/biome/Biome_Everglades.java b/src/main/java/gtPlusPlus/everglades/biome/Biome_Everglades.java index 61c8ab5c26..f9b57b14c8 100644 --- a/src/main/java/gtPlusPlus/everglades/biome/Biome_Everglades.java +++ b/src/main/java/gtPlusPlus/everglades/biome/Biome_Everglades.java @@ -1,5 +1,6 @@ package gtPlusPlus.everglades.biome; +import net.minecraft.entity.EntityLiving; import net.minecraft.entity.monster.EntityPigZombie; import net.minecraft.entity.passive.EntityBat; import net.minecraft.entity.passive.EntitySquid; @@ -75,7 +76,7 @@ public class Biome_Everglades { } @SuppressWarnings({ "unchecked", "unused" }) - private boolean addToMonsterSpawnLists(Class<?> EntityClass, int a, int b, int c) { + private boolean addToMonsterSpawnLists(Class<? extends EntityLiving> EntityClass, int a, int b, int c) { this.spawnableCaveCreatureList.add(new SpawnListEntry(EntityClass, a, b, c)); return true; } diff --git a/src/main/java/gtPlusPlus/preloader/asm/Preloader_FMLLoadingPlugin.java b/src/main/java/gtPlusPlus/preloader/asm/Preloader_FMLLoadingPlugin.java deleted file mode 100644 index cdd25bb268..0000000000 --- a/src/main/java/gtPlusPlus/preloader/asm/Preloader_FMLLoadingPlugin.java +++ /dev/null @@ -1,47 +0,0 @@ -package gtPlusPlus.preloader.asm; - -import java.io.File; -import java.util.Map; - -import cpw.mods.fml.relauncher.IFMLLoadingPlugin; -import cpw.mods.fml.relauncher.IFMLLoadingPlugin.MCVersion; -import cpw.mods.fml.relauncher.IFMLLoadingPlugin.SortingIndex; -import gtPlusPlus.preloader.CORE_Preloader; -import gtPlusPlus.preloader.asm.transformers.Preloader_Transformer_Handler; - -@SortingIndex(10097) -@MCVersion(value = "1.7.10") -@IFMLLoadingPlugin.TransformerExclusions("gtPlusPlus.preloader") -@IFMLLoadingPlugin.Name(CORE_Preloader.NAME) -public class Preloader_FMLLoadingPlugin implements IFMLLoadingPlugin { - - @Override - public String getAccessTransformerClass() { - return null; - } - - @Override - public String[] getASMTransformerClass() { - return new String[] { Preloader_Transformer_Handler.class.getName() }; - } - - @Override - public String getModContainerClass() { - return Preloader_DummyContainer.class.getName(); - } - - @Override - public String getSetupClass() { - return null; - } - - @Override - public void injectData(Map<String, Object> data) { - CORE_Preloader.DEV_ENVIRONMENT = !(boolean) data.get("runtimeDeobfuscationEnabled"); - File mcDir = (File) data.get("mcLocation"); - if (mcDir != null && mcDir.exists()) { - CORE_Preloader.setMinecraftDirectory(mcDir); - } - CORE_Preloader.DEBUG_MODE = AsmConfig.debugMode; - } -} diff --git a/src/main/java/gtPlusPlus/xmod/thaumcraft/commands/CommandDumpAspects.java b/src/main/java/gtPlusPlus/xmod/thaumcraft/commands/CommandDumpAspects.java index 5dcc27e592..5351e6d13e 100644 --- a/src/main/java/gtPlusPlus/xmod/thaumcraft/commands/CommandDumpAspects.java +++ b/src/main/java/gtPlusPlus/xmod/thaumcraft/commands/CommandDumpAspects.java @@ -30,7 +30,11 @@ public class CommandDumpAspects implements ICommand { @Override public int compareTo(final Object o) { - return 0; + if (o instanceof ICommand c) { + return this.getCommandName() + .compareTo(c.getCommandName()); + } + return -1; } @Override @@ -77,7 +81,7 @@ public class CommandDumpAspects implements ICommand { } @Override - public List<?> addTabCompletionOptions(final ICommandSender var1, final String[] var2) { + public List<String> addTabCompletionOptions(final ICommandSender var1, final String[] var2) { return null; } |