aboutsummaryrefslogtreecommitdiff
path: root/src/Java/gtPlusPlus/preloader/Preloader_GT_OreDict.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/Java/gtPlusPlus/preloader/Preloader_GT_OreDict.java')
-rw-r--r--src/Java/gtPlusPlus/preloader/Preloader_GT_OreDict.java54
1 files changed, 27 insertions, 27 deletions
diff --git a/src/Java/gtPlusPlus/preloader/Preloader_GT_OreDict.java b/src/Java/gtPlusPlus/preloader/Preloader_GT_OreDict.java
index 26cefe7254..018e0bee82 100644
--- a/src/Java/gtPlusPlus/preloader/Preloader_GT_OreDict.java
+++ b/src/Java/gtPlusPlus/preloader/Preloader_GT_OreDict.java
@@ -10,48 +10,48 @@ import net.minecraft.item.ItemStack;
public class Preloader_GT_OreDict {
- public static boolean shouldPreventRegistration(String string, ItemStack bannedItem) {
+ public static boolean shouldPreventRegistration(final String string, final ItemStack bannedItem) {
try {
if (CORE_Preloader.enableOldGTcircuits){
- if (bannedItem != null && ItemUtils.getModId(bannedItem).toLowerCase().equals("gregtech")){
- int damageValue = bannedItem.getItemDamage() - 32000;
+ if ((bannedItem != null) && ItemUtils.getModId(bannedItem).toLowerCase().equals("gregtech")){
+ final int damageValue = bannedItem.getItemDamage() - 32000;
if (bannedItem.getItem() instanceof GT_MetaGenerated_Item_01) { // 700-720
- if (damageValue >= 700 && damageValue <= 720) {
+ if ((damageValue >= 700) && (damageValue <= 720)) {
return true;
}
}
else {
try {
if (Class.forName("gregtech.common.items.GT_MetaGenerated_Item_03") != null) { // 6/11/12/14/16/20/30-57/69-73/79-96
- Class<?> MetaItem03 = Class.forName("gregtech.common.items.GT_MetaGenerated_Item_03");
+ final Class<?> MetaItem03 = Class.forName("gregtech.common.items.GT_MetaGenerated_Item_03");
if (isInstanceOf(MetaItem03, bannedItem.getItem())) {
- if (damageValue == 6 || damageValue == 7 || damageValue == 11 || damageValue == 12 || damageValue == 14
- || damageValue == 16 || damageValue == 20 || damageValue == 21 || damageValue == 22) {
+ if ((damageValue == 6) || (damageValue == 7) || (damageValue == 11) || (damageValue == 12) || (damageValue == 14)
+ || (damageValue == 16) || (damageValue == 20) || (damageValue == 21) || (damageValue == 22)) {
return true;
}
- else if (damageValue >= 30 && damageValue <= 57) {
+ else if ((damageValue >= 30) && (damageValue <= 57)) {
return true;
}
- else if (damageValue >= 69 && damageValue <= 73) {
+ else if ((damageValue >= 69) && (damageValue <= 73)) {
return true;
}
- else if (damageValue >= 78 && damageValue <= 96) {
+ else if ((damageValue >= 78) && (damageValue <= 96)) {
return true;
}
}
}
}
- catch (ClassNotFoundException e) {
+ catch (final ClassNotFoundException e) {
}
}
}
}
-
+
//Mekanism Support - Let's not make Mek Osmium useful in GT anymore.
- if (bannedItem != null && (ItemUtils.getModId(bannedItem).toLowerCase().equals("mekanism") || LoadedMods.Mekanism)){
+ if ((((bannedItem != null) && (ItemUtils.getModId(bannedItem).toLowerCase().equals("mekanism"))) || (LoadedMods.Mekanism)) && !LoadedMods.RedTech){
//Circuits
if (Class.forName("mekanism.common.item.ItemControlCircuit") != null) {
- Class<?> MekCircuit = Class.forName("mekanism.common.item.ItemControlCircuit");
+ final Class<?> MekCircuit = Class.forName("mekanism.common.item.ItemControlCircuit");
if (isInstanceOf(MekCircuit, bannedItem.getItem())) {
for (int r=0;r<4;r++){
if (bannedItem.getItemDamage() == r){
@@ -63,7 +63,7 @@ public class Preloader_GT_OreDict {
}
//Ingots
if (Class.forName("mekanism.common.item.ItemIngot") != null) {
- Class<?> MekIngot = Class.forName("mekanism.common.item.ItemIngot");
+ final Class<?> MekIngot = Class.forName("mekanism.common.item.ItemIngot");
if (isInstanceOf(MekIngot, bannedItem.getItem())) {
if (bannedItem.getItemDamage() == 1){
FMLRelaunchLog.log("[GT++ ASM] OreDictTransformer", Level.INFO, "Removing "+bannedItem.getDisplayName()+" from the OreDictionary to balance Mekanism.");
@@ -73,7 +73,7 @@ public class Preloader_GT_OreDict {
}
//Dirty Dust
if (Class.forName("mekanism.common.item.ItemDirtyDust") != null) {
- Class<?> MekIngot = Class.forName("mekanism.common.item.ItemDirtyDust");
+ final Class<?> MekIngot = Class.forName("mekanism.common.item.ItemDirtyDust");
if (isInstanceOf(MekIngot, bannedItem.getItem())) {
if (bannedItem.getItemDamage() == 2){
FMLRelaunchLog.log("[GT++ ASM] OreDictTransformer", Level.INFO, "Removing "+bannedItem.getDisplayName()+" from the OreDictionary to balance Mekanism.");
@@ -83,27 +83,27 @@ public class Preloader_GT_OreDict {
}
//Dust
if (Class.forName("mekanism.common.item.ItemDust") != null) {
- Class<?> MekIngot = Class.forName("mekanism.common.item.ItemDust");
+ final Class<?> MekIngot = Class.forName("mekanism.common.item.ItemDust");
if (isInstanceOf(MekIngot, bannedItem.getItem())) {
if (bannedItem.getItemDamage() == 2){
FMLRelaunchLog.log("[GT++ ASM] OreDictTransformer", Level.INFO, "Removing "+bannedItem.getDisplayName()+" from the OreDictionary to balance Mekanism.");
return true;
}
}
- }
+ }
//Crystal
if (Class.forName("mekanism.common.item.ItemCrystal") != null) {
- Class<?> MekIngot = Class.forName("mekanism.common.item.ItemCrystal");
+ final Class<?> MekIngot = Class.forName("mekanism.common.item.ItemCrystal");
if (isInstanceOf(MekIngot, bannedItem.getItem())) {
if (bannedItem.getItemDamage() == 2){
FMLRelaunchLog.log("[GT++ ASM] OreDictTransformer", Level.INFO, "Removing "+bannedItem.getDisplayName()+" from the OreDictionary to balance Mekanism.");
return true;
}
}
- }
+ }
//Shard
if (Class.forName("mekanism.common.item.ItemShard") != null) {
- Class<?> MekIngot = Class.forName("mekanism.common.item.ItemShard");
+ final Class<?> MekIngot = Class.forName("mekanism.common.item.ItemShard");
if (isInstanceOf(MekIngot, bannedItem.getItem())) {
if (bannedItem.getItemDamage() == 2){
FMLRelaunchLog.log("[GT++ ASM] OreDictTransformer", Level.INFO, "Removing "+bannedItem.getDisplayName()+" from the OreDictionary to balance Mekanism.");
@@ -113,18 +113,18 @@ public class Preloader_GT_OreDict {
}
//Clump
if (Class.forName("mekanism.common.item.ItemClump") != null) {
- Class<?> MekIngot = Class.forName("mekanism.common.item.ItemClump");
+ final Class<?> MekIngot = Class.forName("mekanism.common.item.ItemClump");
if (isInstanceOf(MekIngot, bannedItem.getItem())) {
if (bannedItem.getItemDamage() == 2){
FMLRelaunchLog.log("[GT++ ASM] OreDictTransformer", Level.INFO, "Removing "+bannedItem.getDisplayName()+" from the OreDictionary to balance Mekanism.");
return true;
}
}
- }
+ }
//Ores
if (Class.forName("mekanism.common.item.ItemBlockOre") != null) {
- Class<?> MekOre = Class.forName("mekanism.common.item.ItemBlockOre");
- if (isInstanceOf(MekOre, bannedItem.getItem()) || bannedItem == ItemUtils.simpleMetaStack("Mekanism:OreBlock", 0, 1)) {
+ final Class<?> MekOre = Class.forName("mekanism.common.item.ItemBlockOre");
+ if (isInstanceOf(MekOre, bannedItem.getItem()) || (bannedItem == ItemUtils.simpleMetaStack("Mekanism:OreBlock", 0, 1))) {
if (bannedItem.getItemDamage() == 0){
FMLRelaunchLog.log("[GT++ ASM] OreDictTransformer", Level.INFO, "Removing "+bannedItem.getDisplayName()+" from the OreDictionary to balance Mekanism.");
return true;
@@ -133,7 +133,7 @@ public class Preloader_GT_OreDict {
}
}
- } catch (Throwable e) {
+ } catch (final Throwable e) {
FMLRelaunchLog.log("[GT++ ASM] OreDictTransformer", Level.INFO, "A mod tried to register an invalid item with the OreDictonary.");
if (bannedItem != null){
FMLRelaunchLog.log("[GT++ ASM] OreDictTransformer", Level.INFO, "Please report this issue to the authors of "+ItemUtils.getModId(bannedItem));
@@ -144,7 +144,7 @@ public class Preloader_GT_OreDict {
}
// Simplification of Life.
- private static boolean isInstanceOf(Class<?> clazz, Object obj) {
+ private static boolean isInstanceOf(final Class<?> clazz, final Object obj) {
return clazz.isInstance(obj);
}