diff --git a/.gitignore b/.gitignore index 1ff2116..ff5c98e 100644 --- a/.gitignore +++ b/.gitignore @@ -9,6 +9,14 @@ /asm/* /bin/* /libs/* +/download/* +/.settings/* +/eclipse/* +/debug/* +/.metadata/* +/config/* +/logs/* +/saves/* #File Extensions *.psd @@ -17,7 +25,22 @@ *.iws *.classpath *.project +*.lock #Specific files MCFPost.txt -Thumbs.db \ No newline at end of file +Thumbs.db +options.txt + +#Remove OS generated garbage +*/.DS_Store +.DS_Store +.DS_Store? +.Spotlight-V100 +.Trashes +Icon? +ehthumbs.db +Thumbs.db + +#Vim backups +*~ \ No newline at end of file diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 871fd2d..0000000 --- a/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,13 +0,0 @@ -# -#Tue Jul 07 09:13:42 MSK 2015 -org.eclipse.jdt.core.compiler.debug.localVariable=generate -org.eclipse.jdt.core.compiler.compliance=1.6 -org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.debug.sourceFile=generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.debug.lineNumber=generate -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.source=1.6 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error diff --git a/src/main/java/tombenpotter/emt/client/gui/config/EMTGuiConfig.java b/src/main/java/tombenpotter/emt/client/gui/config/EMTGuiConfig.java index 5b8d439..a184420 100644 --- a/src/main/java/tombenpotter/emt/client/gui/config/EMTGuiConfig.java +++ b/src/main/java/tombenpotter/emt/client/gui/config/EMTGuiConfig.java @@ -10,6 +10,7 @@ import tombenpotter.emt.ModInformation; import java.util.ArrayList; import java.util.List; +import java.util.Locale; import static tombenpotter.emt.common.util.ConfigHandler.*; @@ -23,10 +24,10 @@ public class EMTGuiConfig extends GuiConfig { private static List getConfigElements(GuiScreen parent) { List list = new ArrayList(); - list.add(new ConfigElement(config.getCategory(CATEGORY_RANDOM.toLowerCase()))); - list.add(new ConfigElement(config.getCategory(CATEGORY_VALUES.toLowerCase()))); - list.add(new ConfigElement(config.getCategory(CATEGORY_RESEARCH.toLowerCase()))); - list.add(new ConfigElement(config.getCategory(CATEGORY_OUTPUTS.toLowerCase()))); + list.add(new ConfigElement(config.getCategory(CATEGORY_RANDOM.toLowerCase(Locale.US)))); + list.add(new ConfigElement(config.getCategory(CATEGORY_VALUES.toLowerCase(Locale.US)))); + list.add(new ConfigElement(config.getCategory(CATEGORY_RESEARCH.toLowerCase(Locale.US)))); + list.add(new ConfigElement(config.getCategory(CATEGORY_OUTPUTS.toLowerCase(Locale.US)))); return list; } diff --git a/src/main/java/tombenpotter/emt/common/items/tools/chainsaws/ItemDiamondChainsaw.java b/src/main/java/tombenpotter/emt/common/items/tools/chainsaws/ItemDiamondChainsaw.java index 1e1c000..e5fa568 100644 --- a/src/main/java/tombenpotter/emt/common/items/tools/chainsaws/ItemDiamondChainsaw.java +++ b/src/main/java/tombenpotter/emt/common/items/tools/chainsaws/ItemDiamondChainsaw.java @@ -34,6 +34,7 @@ import tombenpotter.emt.ModInformation; import tombenpotter.emt.common.util.ConfigHandler; import java.util.List; +import java.util.Locale; public class ItemDiamondChainsaw extends ItemAxe implements IElectricItem { @@ -105,7 +106,7 @@ public class ItemDiamondChainsaw extends ItemAxe implements IElectricItem { public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float xOffset, float yOffset, float zOffset) { for (int i = 0; i < player.inventory.mainInventory.length; i++) { ItemStack torchStack = player.inventory.mainInventory[i]; - if (torchStack == null || !torchStack.getUnlocalizedName().toLowerCase().contains("torch")) { + if (torchStack == null || !torchStack.getUnlocalizedName().toLowerCase(Locale.US).contains("torch")) { continue; } Item item = torchStack.getItem(); diff --git a/src/main/java/tombenpotter/emt/common/items/tools/drills/ItemRockbreakerDrill.java b/src/main/java/tombenpotter/emt/common/items/tools/drills/ItemRockbreakerDrill.java index 7dcf24e..cfda7f3 100644 --- a/src/main/java/tombenpotter/emt/common/items/tools/drills/ItemRockbreakerDrill.java +++ b/src/main/java/tombenpotter/emt/common/items/tools/drills/ItemRockbreakerDrill.java @@ -45,6 +45,7 @@ import tombenpotter.emt.common.util.ConfigHandler; import javax.swing.*; import java.util.ArrayList; import java.util.Iterator; +import java.util.Locale; public class ItemRockbreakerDrill extends ItemThaumiumDrill { @@ -157,7 +158,7 @@ public class ItemRockbreakerDrill extends ItemThaumiumDrill { if (!player.isSneaking()) { for (int i = 0; i < player.inventory.mainInventory.length; i++) { ItemStack torchStack = player.inventory.mainInventory[i]; - if (torchStack == null || !torchStack.getUnlocalizedName().toLowerCase().contains("torch")) { + if (torchStack == null || !torchStack.getUnlocalizedName().toLowerCase(Locale.US).contains("torch")) { continue; } Item item = torchStack.getItem(); diff --git a/src/main/java/tombenpotter/emt/common/items/tools/omnitools/ItemOmnitoolIron.java b/src/main/java/tombenpotter/emt/common/items/tools/omnitools/ItemOmnitoolIron.java index 245f6d4..ee21746 100644 --- a/src/main/java/tombenpotter/emt/common/items/tools/omnitools/ItemOmnitoolIron.java +++ b/src/main/java/tombenpotter/emt/common/items/tools/omnitools/ItemOmnitoolIron.java @@ -34,6 +34,7 @@ import tombenpotter.emt.ModInformation; import tombenpotter.emt.common.util.ConfigHandler; import java.util.List; +import java.util.Locale; public class ItemOmnitoolIron extends ItemPickaxe implements IElectricItem { @@ -116,7 +117,7 @@ public class ItemOmnitoolIron extends ItemPickaxe implements IElectricItem { public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float xOffset, float yOffset, float zOffset) { for (int i = 0; i < player.inventory.mainInventory.length; i++) { ItemStack torchStack = player.inventory.mainInventory[i]; - if (torchStack == null || !torchStack.getUnlocalizedName().toLowerCase().contains("torch")) { + if (torchStack == null || !torchStack.getUnlocalizedName().toLowerCase(Locale.US).contains("torch")) { continue; } Item item = torchStack.getItem(); diff --git a/src/main/java/tombenpotter/emt/common/util/RandomHelper.java b/src/main/java/tombenpotter/emt/common/util/RandomHelper.java index 5d8b2d7..a00ddf4 100644 --- a/src/main/java/tombenpotter/emt/common/util/RandomHelper.java +++ b/src/main/java/tombenpotter/emt/common/util/RandomHelper.java @@ -13,6 +13,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.world.World; import net.minecraftforge.event.ForgeEventFactory; +import java.util.Locale; + public class RandomHelper { public static boolean isRKMPressed(World world){ @@ -27,7 +29,7 @@ public class RandomHelper { public static boolean placeTorch(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float xOffset, float yOffset, float zOffset) { for (int i = 0; i < player.inventory.mainInventory.length; i++) { ItemStack torchStack = player.inventory.mainInventory[i]; - if (torchStack == null || !torchStack.getUnlocalizedName().toLowerCase().contains("torch")) continue; + if (torchStack == null || !torchStack.getUnlocalizedName().toLowerCase(Locale.US).contains("torch")) continue; Item item = torchStack.getItem(); if (!(item instanceof ItemBlock)) continue; int oldMeta = torchStack.getItemDamage(); diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info index 81cc152..a609b0b 100644 --- a/src/main/resources/mcmod.info +++ b/src/main/resources/mcmod.info @@ -7,8 +7,8 @@ "mcversion": "1.7.10", "url": "http://www.minecraftforum.net/topic/2196652-", "updateUrl": "", - "authorList": ["Tombenpotter", "TehNut"], - "credits": "Azanor, the IC2 guys, TehNut, and the forge guys!", + "authorList": ["fewizz", "TheSilentium"], + "credits": "Azanor, Tombenpotter, TehNut, the IC2 guys and the forge guys!", "logoFile": "emt.png", "screenshots": [], "dependencies": ["Thaumcraft 4", "IC2"] diff --git a/src/main/resources/pack.mcmeta b/src/main/resources/pack.mcmeta new file mode 100644 index 0000000..5b79a00 --- /dev/null +++ b/src/main/resources/pack.mcmeta @@ -0,0 +1,6 @@ +{ + "pack": { + "pack_format": 1, + "description": "Resources used for Electro-Magic Tools" + } +} \ No newline at end of file