aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gtPlusPlus/core/util
diff options
context:
space:
mode:
authorConnor-Colenso <52056774+Connor-Colenso@users.noreply.github.com>2023-09-04 03:05:22 +0100
committerGitHub <noreply@github.com>2023-09-04 03:05:22 +0100
commit76719d65a90d98e228a914774d3b11ed9f01ac8e (patch)
treece0d35f954e441e9cc4aa95aa347073728e6f4ee /src/main/java/gtPlusPlus/core/util
parent0393b582eb3edcb5c575330804b6747577a55e27 (diff)
downloadGT5-Unofficial-76719d65a90d98e228a914774d3b11ed9f01ac8e.tar.gz
GT5-Unofficial-76719d65a90d98e228a914774d3b11ed9f01ac8e.tar.bz2
GT5-Unofficial-76719d65a90d98e228a914774d3b11ed9f01ac8e.zip
Clean-up v2 (#729)
* Remove test items from NEI with no texture * Add number formatting to hand pumps * Remove heavy plates (no recipes & completely unused). * Remove helium generator (no texture, no recipe) * Remove fire pit and fire starter (no use, no recipe, no textures) * Remove giant chicken and associated unused stuff, has no texture and is unobtainable. Used to be relevant but isn't anymore. * Remove villagers with silly trades like 1 motor + 1 hull = 1 hull. Why? * Remove trade bench, no recipe, missing textures. Unused. * Remove farm processors, no texture, no recipe. Unused. * Remove MAX tier components, these exist in GT now, have no recipe here and are unused. * Hide untextured light block from NEI * Update buildscript * Remove unused backpacks, no recipe and contains dupe bugs. Bad. * Remove eatotronic, universal toolbox and magic tool bag. All 3 are missing textures and uncraftable. * Remove eatotronic, universal toolbox and magic tool bag. All 3 are missing textures and uncraftable. part 2 * Remove dragon catcher (what?), no texture, no recipe, unused. * Remove empty item, does nothing, has no recipe, no idea why it is here. * Empty item v2 removal * Revert "Empty item v2 removal" This reverts commit 75bcd3ccfaf55bbfe2c12b2e4167d5c37636030d. * Revert "Remove empty item, does nothing, has no recipe, no idea why it is here." This reverts commit e41a9f484392776331c58530ab1faa5ef978ef36. * Remove debug square. No recipe, unused. * Number formatting overflow covers * Remove JVM garbage collection block. Unused, no recipe. * Remove nanotubes, no recipe for them. Unused. * Remove "git" item, doesn't seem to work. Has no recipe. * Remove uncraftable food with awful textures. * Remove "bat king" mob, unused content. Does not spawn. * Remove uncraftable doors with bad textures. Unused content. * Remove uncraftable, unlocalised redstone stuff that crashes game when placed. * Remove weird spawner item. No recipe, does not exist in world. * Remove sunnarium bit, no recipe, no usage. * Remove unused modularity table and some misc uncraftable, unused items. * Remove Interconnecting Storage Crate, no recipe, unused. * Delete worse debug power gen, this already exists as part of GT. Unneeded duplication. * Delete unused placeholder circuit * Delete uncraftable generator hatches. * Spotless * Remove XP tank thing, unused and uncraftable. * Remove null item, this fluid registry only seemed to register one null fluid. All others exist? * Remove EU -> RF battery. Unused in GTNH. * Remove some shelf nonsense, why is this in this mod? * Remove some weird random tools. These have no realistic usage in GTNH. * Remove firemaker. Useless in GTNH. * Removed helium blob. Deprecated item, not used anymore, uncraftable. * spotlessApply (#730) Co-authored-by: GitHub GTNH Actions <> * Stop modulators generating unused blocks with no textures * Remove more unused untextured casings * Remove more unused untextured casings * Remove more unused untextured casings * Remove more unused untextured casings * Remove more unused untextured casings * Remove some weird methods and uncraftable mining parts, probably part of deprecated multiblock. * spotlessApply (#732) Co-authored-by: GitHub GTNH Actions <> * Remove gem shards, unused. * Remove unused atoms * Remove unused gum * Remove unused elements/materials * Bye bye * Remove some unused reflection stuff * Remove control cores, obsolete now. * Remove mob killing thing with no texture and no recipe. * Remove uncraftable covers * Remove pizza gloves * Net and rope removal, unused * Remove force crop * Removal of some old event stuff * Remove unused nuclear chem items * Remove player safe, mostly because of the horrible event code that was intercepting every block break. I can't see any real usage of this via discord. * Remove Force material and associated other nonsense. Also remove some nuclear chem stuff. * Remove force for realsies * Skookum Chooker purge. * Remove some enderio compat, these plates/dusts are added via GT5 anyway now. This is obsolete. * spotlessApply (#733) Co-authored-by: GitHub GTNH Actions <> * Unused textures * Bump dep * Revert "Remove force for realsies" This reverts commit 0d288912a99f9dabce56d2a2623d4d3510f4804e. * Revert "Remove Force material and associated other nonsense. Also remove some nuclear chem stuff." This reverts commit 3455e6e916defe1f2aef923be6f9696a6cf3095b. * Remove nuclear items that are unused * spotlessApply (#734) Co-authored-by: GitHub GTNH Actions <> --------- Co-authored-by: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com> Co-authored-by: Connor Colenso <colen@CONNORSPC> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Diffstat (limited to 'src/main/java/gtPlusPlus/core/util')
-rw-r--r--src/main/java/gtPlusPlus/core/util/Utils.java129
-rw-r--r--src/main/java/gtPlusPlus/core/util/minecraft/ItemUtils.java200
-rw-r--r--src/main/java/gtPlusPlus/core/util/minecraft/MaterialUtils.java5
-rw-r--r--src/main/java/gtPlusPlus/core/util/minecraft/PlayerUtils.java18
4 files changed, 10 insertions, 342 deletions
diff --git a/src/main/java/gtPlusPlus/core/util/Utils.java b/src/main/java/gtPlusPlus/core/util/Utils.java
index 5908941dfc..2b6ad41f13 100644
--- a/src/main/java/gtPlusPlus/core/util/Utils.java
+++ b/src/main/java/gtPlusPlus/core/util/Utils.java
@@ -1,15 +1,8 @@
package gtPlusPlus.core.util;
import java.awt.*;
-import java.io.ByteArrayOutputStream;
import java.io.File;
-import java.io.IOException;
-import java.io.ObjectOutput;
-import java.io.ObjectOutputStream;
import java.lang.reflect.Method;
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
-import java.security.SecureRandom;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
@@ -18,8 +11,6 @@ import java.util.Map;
import java.util.Timer;
import java.util.TimerTask;
-import javax.xml.bind.DatatypeConverter;
-
import net.minecraft.block.Block;
import net.minecraft.client.Minecraft;
import net.minecraft.entity.Entity;
@@ -42,8 +33,6 @@ import net.minecraftforge.oredict.OreDictionary;
import org.apache.commons.lang3.EnumUtils;
import cpw.mods.fml.common.FMLCommonHandler;
-import cpw.mods.fml.common.registry.EntityRegistry;
-import cpw.mods.fml.common.registry.EntityRegistry.EntityRegistration;
import gregtech.api.GregTech_API;
import gregtech.api.enums.GT_Values;
import gregtech.api.enums.Materials;
@@ -57,13 +46,10 @@ import gtPlusPlus.api.objects.Logger;
import gtPlusPlus.api.objects.data.AutoMap;
import gtPlusPlus.core.item.ModItems;
import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.material.Material;
import gtPlusPlus.core.util.math.MathUtils;
import gtPlusPlus.core.util.minecraft.FluidUtils;
import gtPlusPlus.core.util.minecraft.ItemUtils;
import gtPlusPlus.core.util.minecraft.NBTUtils;
-import gtPlusPlus.core.util.sys.SystemUtils;
-import gtPlusPlus.plugin.villagers.tile.TileEntityGenericSpawner;
import ic2.core.Ic2Items;
import ic2.core.init.InternalName;
import ic2.core.item.resources.ItemCell;
@@ -659,28 +645,7 @@ public class Utils {
return temp;
}
- public static ToolMaterial generateToolMaterial(final Material material) {
- final String name = material.getLocalizedName();
- final int harvestLevel = material.vHarvestLevel;
- final int durability = (int) material.vDurability;
- final float damage = material.vToolQuality;
- final int efficiency = material.vToolQuality;
- // int enchantability = material.mEnchantmentToolsLevel;
- Logger.INFO(
- "ToolMaterial stats for " + material.getLocalizedName()
- + " | harvestLevel:"
- + harvestLevel
- + " | durability:"
- + durability
- + " | toolQuality:"
- + damage
- + " | toolSpeed:"
- + damage);
- final ToolMaterial temp = EnumHelper.addToolMaterial(name, harvestLevel, durability, efficiency, damage, 0);
- return temp;
- }
-
- public static enum Versioning {
+ public enum Versioning {
EQUAL(0),
NEWER(1),
@@ -688,7 +653,7 @@ public class Utils {
private final int versioningInfo;
- private Versioning(final int versionStatus) {
+ Versioning(final int versionStatus) {
this.versioningInfo = versionStatus;
}
@@ -746,13 +711,12 @@ public class Utils {
Logger.INFO("WARNING: String for written Book too long! -> " + aPages[i]);
GT_Log.err.println(
new StringBuilder().append("WARNING: String for written Book too long! -> ")
- .append(aPages[i]).toString());
+ .append(aPages[i]));
}
} else {
Logger.INFO("WARNING: Too much Pages for written Book! -> " + aTitle);
GT_Log.err.println(
- new StringBuilder().append("WARNING: Too much Pages for written Book! -> ").append(aTitle)
- .toString());
+ new StringBuilder().append("WARNING: Too much Pages for written Book! -> ").append(aTitle));
break;
}
}
@@ -765,100 +729,17 @@ public class Utils {
rStack.setTagCompound(tNBT);
GT_Log.out.println(
new StringBuilder().append("GT++_Mod: Added Book to Book++ List - Mapping: '").append(aMapping)
- .append("' - Name: '").append(aTitle).append("' - Author: '").append(aAuthor).append("'")
- .toString());
+ .append("' - Name: '").append(aTitle).append("' - Author: '").append(aAuthor).append("'"));
NBTUtils.createIntegerTagCompound(rStack, "stats", "mMeta", vMeta);
CORE.sBookList.put(aMapping, rStack);
Logger.INFO("Creating book: " + aTitle + " by " + aAuthor + ". Using Meta " + vMeta + ".");
return GT_Utility.copy(new Object[] { rStack });
}
- public static SecureRandom generateSecureRandom() {
- SecureRandom secRan;
- String secRanType;
-
- if (SystemUtils.isWindows()) {
- secRanType = "Windows-PRNG";
- } else {
- secRanType = "NativePRNG";
- }
- try {
- secRan = SecureRandom.getInstance(secRanType);
- // Default constructor would have returned insecure SHA1PRNG algorithm, so make an explicit call.
- byte[] b = new byte[64];
- secRan.nextBytes(b);
- return secRan;
- } catch (NoSuchAlgorithmException e) {
- return null;
- }
- }
-
- public static String calculateChecksumMD5(Object bytes) {
- byte[] result = new byte[] {};
- ByteArrayOutputStream bos = new ByteArrayOutputStream();
- ObjectOutput out = null;
- try {
- out = new ObjectOutputStream(bos);
- out.writeObject(bytes);
- out.flush();
- result = bos.toByteArray();
- } catch (IOException e) {} finally {
- try {
- bos.close();
- } catch (IOException e) {}
- }
- return calculateChecksumMD5(result);
- }
-
- public static String calculateChecksumMD5(byte[] bytes) {
- MessageDigest md;
- try {
- md = MessageDigest.getInstance("MD5");
- md.update(bytes);
- byte[] digest = md.digest();
- String myHash = DatatypeConverter.printHexBinary(digest).toUpperCase();
- return myHash;
- } catch (NoSuchAlgorithmException e) {
- return null;
- }
- }
-
- public static boolean createNewMobSpawner(int aID, Entity aEntity) {
- if (aEntity instanceof Entity) {
- Class c = aEntity.getClass();
- return createNewMobSpawner(aID, c);
- }
- return false;
- }
-
- public static boolean createNewMobSpawner(int aID, Class aEntity) {
- Logger.INFO("[Spawn] Generating new spawner for entity with class (" + aEntity.getSimpleName() + ").");
- if (TileEntityGenericSpawner.registerNewMobSpawner(aID, (Class<Entity>) aEntity)) {
- EntityRegistration x = EntityRegistry.instance().lookupModSpawn((Class<? extends Entity>) aEntity, true);
- if (x != null) {
- Logger.INFO("[Spawn] Registration for " + x.getEntityName() + " successful");
- return true;
- } else {
- Logger.INFO("[Spawn] Registration for " + aEntity.getSimpleName() + " successful");
- return true;
- }
- }
- Logger.INFO("[Spawn] Mob Spawner creation for " + aEntity.getName() + " failed");
- return false;
- }
-
public static long getMillisSince(long aStartTime, long aCurrentTime) {
return (aCurrentTime - aStartTime);
}
- public static long getSecondsFromMillis(long aMillis) {
- return (aMillis / 1000);
- }
-
- public static long getTicksFromSeconds(long aSeconds) {
- return (aSeconds * 20);
- }
-
public static byte getTier(long l) {
byte i = -1;
do {
diff --git a/src/main/java/gtPlusPlus/core/util/minecraft/ItemUtils.java b/src/main/java/gtPlusPlus/core/util/minecraft/ItemUtils.java
index 58832e095b..6e9bd64c61 100644
--- a/src/main/java/gtPlusPlus/core/util/minecraft/ItemUtils.java
+++ b/src/main/java/gtPlusPlus/core/util/minecraft/ItemUtils.java
@@ -1,9 +1,6 @@
package gtPlusPlus.core.util.minecraft;
-import static gregtech.api.enums.Mods.GTPlusPlus;
-import static gregtech.api.enums.Mods.GregTech;
-import static gregtech.api.enums.Mods.IndustrialCraft2;
-import static gregtech.api.enums.Mods.Minecraft;
+import static gregtech.api.enums.Mods.*;
import java.util.ArrayList;
import java.util.HashMap;
@@ -16,7 +13,6 @@ import net.minecraft.enchantment.EnchantmentData;
import net.minecraft.init.Items;
import net.minecraft.inventory.IInventory;
import net.minecraft.item.Item;
-import net.minecraft.item.Item.ToolMaterial;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.EnumChatFormatting;
@@ -42,13 +38,9 @@ import gtPlusPlus.api.objects.minecraft.BlockPos;
import gtPlusPlus.core.item.ModItems;
import gtPlusPlus.core.item.base.BasicSpawnEgg;
import gtPlusPlus.core.item.base.dusts.BaseItemDustUnique;
-import gtPlusPlus.core.item.base.dusts.decimal.BaseItemCentidust;
-import gtPlusPlus.core.item.base.dusts.decimal.BaseItemDecidust;
import gtPlusPlus.core.item.base.plates.BaseItemPlate_OLD;
import gtPlusPlus.core.item.chemistry.AgriculturalChem;
import gtPlusPlus.core.item.chemistry.GenericChem;
-import gtPlusPlus.core.item.tool.staballoy.MultiPickaxeBase;
-import gtPlusPlus.core.item.tool.staballoy.MultiSpadeBase;
import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.material.Material;
import gtPlusPlus.core.recipe.common.CI;
@@ -103,31 +95,12 @@ public class ItemUtils {
public static final int WILDCARD_VALUE = Short.MAX_VALUE;
- public static ItemStack getWildcardStack(final Item x) {
- final ItemStack y = new ItemStack(x, 1, WILDCARD_VALUE);
- return y;
- }
-
public static ItemStack getWildcardStack(final ItemStack x) {
- final ItemStack y = ItemUtils.simpleMetaStack(x, WILDCARD_VALUE, 1);
- return y;
- }
-
- public static ItemStack getIC2Cell(final String S) {
- final ItemStack moreTemp = ItemUtils.getItemStackOfAmountFromOreDictNoBroken("cell" + S, 1);
-
- if (moreTemp == null) {
- final int cellID = 0;
- final ItemStack temp = GT_ModHandler.getModItem(IndustrialCraft2.ID, "itemCellEmpty", 1L, cellID);
- return temp != null ? temp : null;
- }
-
- return moreTemp;
+ return ItemUtils.simpleMetaStack(x, WILDCARD_VALUE, 1);
}
public static ItemStack getIC2Cell(final int meta) {
- final ItemStack temp = GT_ModHandler.getModItem(IndustrialCraft2.ID, "itemCellEmpty", 1L, meta);
- return temp != null ? temp : null;
+ return GT_ModHandler.getModItem(IndustrialCraft2.ID, "itemCellEmpty", 1L, meta);
}
public static ItemStack getEmptyCell() {
@@ -241,14 +214,7 @@ public class ItemUtils {
if (size < 0 || size > 64) {
size = 1;
}
- // Logger.INFO("Found Metastack: " + item.getUnlocalizedName() + ":" + meta);
- // Logger.INFO(""+ReflectionUtils.getMethodName(0));
- // Logger.INFO(""+ReflectionUtils.getMethodName(1));
- // Logger.INFO(""+ReflectionUtils.getMethodName(2));
- // Logger.INFO(""+ReflectionUtils.getMethodName(3));
- // Logger.INFO(""+ReflectionUtils.getMethodName(4));
- final ItemStack metaStack = new ItemStack(item, size, meta);
- return metaStack;
+ return new ItemStack(item, size, meta);
}
public static ItemStack simpleMetaStack(final Block block, final int meta, final int size) {
@@ -580,164 +546,6 @@ public class ItemUtils {
return output;
}
- public static MultiPickaxeBase generateMultiPick(final boolean GT_Durability, final Materials material) {
- final ToolMaterial customMaterial = Utils.generateToolMaterialFromGT(material);
- final int enchantLevel = material.mEnchantmentToolsLevel;
- final Object enchant = new Pair(material.mEnchantmentTools, enchantLevel);
- return generateMultiPick(
- GT_Durability,
- customMaterial,
- material.mDefaultLocalName,
- material.mDurability,
- material.mRGBa,
- enchant);
- }
-
- public static MultiPickaxeBase generateMultiPick(final Material material) {
- final ToolMaterial customMaterial = Utils.generateToolMaterial(material);
- return generateMultiPick(
- true,
- customMaterial,
- material.getLocalizedName(),
- (int) material.vDurability,
- material.getRGBA(),
- null);
- }
-
- public static MultiPickaxeBase generateMultiPick(final boolean GT_Durability, final ToolMaterial customMaterial,
- final String name, final int durability, final short[] rgba, final Object enchantment) {
- Logger.WARNING("Generating a Multi-Pick out of " + name);
- final short[] rgb = rgba;
- int dur = customMaterial.getMaxUses();
- Logger.WARNING("Determined durability for " + name + " is " + dur);
- if (GT_Durability) {
- dur = durability * 100;
- Logger.WARNING("Using gregtech durability value, " + name + " is now " + dur + ".");
- } else if (dur <= 0) {
- dur = durability;
- Logger.WARNING(
- "Determined durability too low, " + name
- + " is now "
- + dur
- + " based on the GT material durability.");
- }
- if (dur <= 0) {
- Logger.WARNING("Still too low, " + name + " will now go unused.");
- return null;
- }
-
- Object enchant;
- if (enchantment != null) {
- if (enchantment instanceof Pair) {
- enchant = enchantment;
- }
- } else {
- enchant = null;
- }
-
- final MultiPickaxeBase MP_Redstone = new MultiPickaxeBase(
- name + " Multipick",
- (customMaterial),
- dur,
- Utils.rgbtoHexValue(rgb[0], rgb[1], rgb[2]),
- enchantment);
-
- if (MP_Redstone.isValid) {
- return MP_Redstone;
- }
- Logger.WARNING("Pickaxe was not valid.");
- return null;
- }
-
- public static MultiSpadeBase generateMultiShovel(final boolean GT_Durability, final Materials material) {
- final ToolMaterial customMaterial = Utils.generateToolMaterialFromGT(material);
- return generateMultiShovel(
- GT_Durability,
- customMaterial,
- material.mDefaultLocalName,
- material.mDurability,
- material.mRGBa);
- }
-
- public static MultiSpadeBase generateMultiShovel(final Material material) {
- final ToolMaterial customMaterial = Utils.generateToolMaterial(material);
- return generateMultiShovel(
- true,
- customMaterial,
- material.getLocalizedName(),
- (int) material.vDurability,
- material.getRGBA());
- }
-
- public static MultiSpadeBase generateMultiShovel(final boolean GT_Durability, final ToolMaterial customMaterial,
- final String name, final int durability, final short[] rgba) {
- Logger.WARNING("Generating a Multi-Spade out of " + name);
- final short[] rgb = rgba;
- int dur = customMaterial.getMaxUses();
- Logger.WARNING("Determined durability for " + name + " is " + dur);
- if (GT_Durability) {
- dur = durability * 100;
- Logger.WARNING("Using gregtech durability value, " + name + " is now " + dur + ".");
- } else if (dur <= 0) {
- dur = durability;
- Logger.WARNING(
- "Determined durability too low, " + name
- + " is now "
- + dur
- + " based on the GT material durability.");
- }
- if (dur <= 0) {
- Logger.WARNING("Still too low, " + name + " will now go unused.");
- return null;
- }
- final MultiSpadeBase MP_Redstone = new MultiSpadeBase(
- name + " Multispade",
- (customMaterial),
- dur,
- Utils.rgbtoHexValue(rgb[0], rgb[1], rgb[2]));
-
- if (MP_Redstone.isValid) {
- return MP_Redstone;
- }
- return null;
- }
-
- public static BaseItemDecidust generateDecidust(final Materials material) {
- if (GT_OreDictUnificator.get(OrePrefixes.dust, material, 1L) != null) {
- final Material placeholder = MaterialUtils.generateMaterialFromGtENUM(material);
- if (placeholder != null) {
- generateDecidust(placeholder);
- }
- }
- return null;
- }
-
- public static BaseItemDecidust generateDecidust(final Material material) {
- if ((material.getDust(1) != null) && MaterialUtils.hasValidRGBA(material.getRGBA())) {
- final BaseItemDecidust Decidust = new BaseItemDecidust(material);
- return Decidust;
- }
- return null;
- }
-
- public static BaseItemCentidust generateCentidust(final Materials material) {
- if (GT_OreDictUnificator.get(OrePrefixes.dust, material, 1L) != null) {
- final Material placeholder = MaterialUtils.generateMaterialFromGtENUM(material);
- if (placeholder != null) {
- generateCentidust(placeholder);
- }
- }
- return null;
- }
-
- public static BaseItemCentidust generateCentidust(final Material material) {
- if ((material.getDust(1) != null) && MaterialUtils.hasValidRGBA(material.getRGBA())) {
- final BaseItemCentidust Centidust = new BaseItemCentidust(material);
- return Centidust;
- }
- return null;
- }
-
public static boolean isRadioactive(final String materialName) {
int sRadiation = 0;
if (materialName.toLowerCase().contains("uranium")) {
diff --git a/src/main/java/gtPlusPlus/core/util/minecraft/MaterialUtils.java b/src/main/java/gtPlusPlus/core/util/minecraft/MaterialUtils.java
index 3fdef9f94f..36c630051b 100644
--- a/src/main/java/gtPlusPlus/core/util/minecraft/MaterialUtils.java
+++ b/src/main/java/gtPlusPlus/core/util/minecraft/MaterialUtils.java
@@ -22,7 +22,6 @@ import gtPlusPlus.core.client.CustomTextureSet.TextureSets;
import gtPlusPlus.core.item.base.BaseItemComponent;
import gtPlusPlus.core.item.base.BaseItemComponent.ComponentTypes;
import gtPlusPlus.core.item.base.foil.BaseItemFoil;
-import gtPlusPlus.core.item.base.plates.BaseItemPlateHeavy;
import gtPlusPlus.core.item.base.wire.BaseItemFineWire;
import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.material.Material;
@@ -382,9 +381,7 @@ public class MaterialUtils {
public static void generateComponentAndAssignToAMaterial(ComponentTypes aType, Material aMaterial,
boolean generateRecipes) {
Item aGC;
- if (aType == ComponentTypes.PLATEHEAVY) {
- aGC = new BaseItemPlateHeavy(aMaterial);
- } else if (aType == ComponentTypes.FINEWIRE) {
+ if (aType == ComponentTypes.FINEWIRE) {
aGC = new BaseItemFineWire(aMaterial);
} else if (aType == ComponentTypes.FOIL) {
aGC = new BaseItemFoil(aMaterial);
diff --git a/src/main/java/gtPlusPlus/core/util/minecraft/PlayerUtils.java b/src/main/java/gtPlusPlus/core/util/minecraft/PlayerUtils.java
index 74b0ad6a62..2be3f781a3 100644
--- a/src/main/java/gtPlusPlus/core/util/minecraft/PlayerUtils.java
+++ b/src/main/java/gtPlusPlus/core/util/minecraft/PlayerUtils.java
@@ -194,24 +194,6 @@ public class PlayerUtils {
return null;
}
- @SideOnly(Side.CLIENT)
- public static final boolean isPlayerAlkalus() {
- if (Utils.isServer()) {
- return false;
- }
- return isPlayerAlkalus(Minecraft.getMinecraft().thePlayer);
- }
-
- public static final boolean isPlayerAlkalus(EntityPlayer player) {
- if (player != null) {
- if (player.getDisplayName().toLowerCase().equals("draknyte1")
- || player.getDisplayName().toLowerCase().equals("alkalus")) {
- return true;
- }
- }
- return false;
- }
-
public static void messageAllPlayers(String string) {
Utils.sendServerMessage(string);
}