diff options
Diffstat (limited to 'src/main/java/gtPlusPlus')
7 files changed, 23 insertions, 66 deletions
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; } |