diff options
| author | Technus <daniel112092@gmail.com> | 2017-08-29 14:08:22 +0200 |
|---|---|---|
| committer | Technus <daniel112092@gmail.com> | 2017-08-29 14:08:22 +0200 |
| commit | 7b00f4854faa528c8f6f761a567f28b150558cd9 (patch) | |
| tree | d8a04084d286cad22e4be9dc12427fa5f5972b6f /src | |
| parent | 1021b7368595ecfe3dd20164c45c5ef6a622ae82 (diff) | |
| parent | 85939344fab14f1e45a43f8f6afc6d2f018bf508 (diff) | |
| download | GT5-Unofficial-7b00f4854faa528c8f6f761a567f28b150558cd9.tar.gz GT5-Unofficial-7b00f4854faa528c8f6f761a567f28b150558cd9.tar.bz2 GT5-Unofficial-7b00f4854faa528c8f6f761a567f28b150558cd9.zip | |
Merge branch 'master' into bassAdditions
Diffstat (limited to 'src')
| -rw-r--r-- | src/main/java/com/github/technus/tectech/TecTech.java | 68 |
1 files changed, 35 insertions, 33 deletions
diff --git a/src/main/java/com/github/technus/tectech/TecTech.java b/src/main/java/com/github/technus/tectech/TecTech.java index 6893663af2..c5e47ed068 100644 --- a/src/main/java/com/github/technus/tectech/TecTech.java +++ b/src/main/java/com/github/technus/tectech/TecTech.java @@ -23,7 +23,9 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; +import java.util.Arrays; import java.util.HashMap; +import java.util.HashSet; import static com.github.technus.tectech.auxiliary.TecTechConfig.DEBUG_MODE; @@ -137,42 +139,42 @@ public class TecTech { } private void fixBlocks(){ + HashSet<String> modIDs=new HashSet<>(Arrays.asList( + "minecraft", + "IC2", + "gregtech", + "dreamcraft", + "miscutils", + "GT++DarkWorld", + "TwilightForest", + "GalacticraftCore", + "GalacticraftMars", + "GalaxySpace", + "extracells", + "ExtraUtilities", + "Avaritia", + "avaritiaddons", + "EnderStorage", + "enhancedportals", + "DraconicEvolution", + "IC2NuclearControl", + "IronChest", + "opensecurity", + "openmodularturrets", + "Railcraft", + "RIO", + "SGCraft", + "appliedenergistics2", + "thaumicenergistics", + "witchery", + "lootgames", + Reference.MODID, + "utilityworlds" + )); String modId; for(Block block : GameData.getBlockRegistry().typeSafeIterable()) { modId = GameRegistry.findUniqueIdentifierFor(block).modId; - if (//Full Whitelisted Mods - modId.equals("minecraft") || - modId.equals("IC2") || - modId.equals("gregtech") || - modId.equals("dreamcraft") || - modId.equals("miscutils") || - modId.equals("GT++DarkWorld") || - modId.equals("TwilightForest") || - modId.equals("GalacticraftCore") || - modId.equals("GalacticraftMars") || - modId.equals("GalaxySpace") || - //modId.equals("EnderIO") || // nerf - //modId.equals("Thaumcraft") || // too op, nerf - modId.equals("extracells") || - modId.equals("ExtraUtilities") || - modId.equals("Avaritia") || - modId.equals("avaritiaddons") || - modId.equals("EnderStorage") || - modId.equals("enhancedportals") || - modId.equals("DraconicEvolution") || - modId.equals("IC2NuclearControl") || - modId.equals("IronChest") || - modId.equals("opensecurity") || - modId.equals("openmodularturrets") || - modId.equals("Railcraft") || - modId.equals("RIO") || - modId.equals("SGCraft") || - modId.equals("appliedenergistics2") || - modId.equals("thaumicenergistics") || - modId.equals("witchery") || - modId.equals("lootgames") || - modId.equals(Reference.MODID) || - modId.equals("utilityworlds")) { + if (modIDs.contains(modId)) {//Full Whitelisted Mods continue; } else if (modId.equals("TConstruct")) { block.slipperiness = 1;//cos we know it is slippery, right Greg? |