diff options
Diffstat (limited to 'src/Java/miscutil/core/util')
| -rw-r--r-- | src/Java/miscutil/core/util/Utils.java | 36 | ||||
| -rw-r--r-- | src/Java/miscutil/core/util/debug/DEBUG_ScreenOverlay.java | 5 | ||||
| -rw-r--r-- | src/Java/miscutil/core/util/item/UtilsItems.java | 24 |
3 files changed, 62 insertions, 3 deletions
diff --git a/src/Java/miscutil/core/util/Utils.java b/src/Java/miscutil/core/util/Utils.java index cbd488afab..24236b0e0a 100644 --- a/src/Java/miscutil/core/util/Utils.java +++ b/src/Java/miscutil/core/util/Utils.java @@ -1,5 +1,6 @@ package miscutil.core.util; +import gregtech.api.enums.Materials; import gregtech.api.enums.TC_Aspects; import gregtech.api.enums.TC_Aspects.TC_AspectStack; import ic2.core.IC2Potion; @@ -32,6 +33,7 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.EnumCreatureType; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.item.Item.ToolMaterial; import net.minecraft.item.ItemStack; import net.minecraft.server.MinecraftServer; import net.minecraft.util.MathHelper; @@ -496,6 +498,40 @@ public class Utils { } return null; } + + public static String sanitizeString(String input){ + String temp; + String output; + + temp = input.replace(" ", ""); + temp = temp.replace("-", ""); + temp = temp.replace("_", ""); + temp = temp.replace("?", ""); + temp = temp.replace("!", ""); + temp = temp.replace("@", ""); + temp = temp.replace("#", ""); + temp = temp.replace("(", ""); + temp = temp.replace(")", ""); + temp = temp.replace("{", ""); + temp = temp.replace("}", ""); + temp = temp.replace("[", ""); + temp = temp.replace("]", ""); + output = temp; + return output; + + } + + public static ToolMaterial generateMaterialFromGT(Materials gtMaterial){ + String name = gtMaterial.name(); + int harvestLevel = gtMaterial.mToolQuality; + int durability = gtMaterial.mDurability; + float damage = gtMaterial.mToolQuality; + int efficiency = (int) gtMaterial.mToolSpeed; + int enchantability = gtMaterial.mEnchantmentToolsLevel; + ToolMaterial temp = EnumHelper.addToolMaterial(name, harvestLevel, durability, efficiency, damage, enchantability); + return temp; + + } } diff --git a/src/Java/miscutil/core/util/debug/DEBUG_ScreenOverlay.java b/src/Java/miscutil/core/util/debug/DEBUG_ScreenOverlay.java index 9752127d73..aefe66fc04 100644 --- a/src/Java/miscutil/core/util/debug/DEBUG_ScreenOverlay.java +++ b/src/Java/miscutil/core/util/debug/DEBUG_ScreenOverlay.java @@ -1,6 +1,5 @@ package miscutil.core.util.debug; -import miscutil.core.item.tool.staballoy.StaballoyPickaxe; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.Gui; @@ -30,7 +29,7 @@ public class DEBUG_ScreenOverlay extends Gui { try{heldItem = mc.thePlayer.getHeldItem().getItem(); if (heldItem != null){ - if (heldItem instanceof StaballoyPickaxe){ + /*if (heldItem instanceof StaballoyPickaxe){ int dmg =((StaballoyPickaxe) heldItem).getDamage(((StaballoyPickaxe) heldItem).thisPickaxe); @@ -38,7 +37,7 @@ public class DEBUG_ScreenOverlay extends Gui { str = "DAMAGE: "+ dmg +" | FACING: "+((StaballoyPickaxe) heldItem).FACING+" | FACING_HORIZONTAL: "+((StaballoyPickaxe) heldItem).FACING_HORIZONTAL+" | LOOKING DIRECTION: "+((StaballoyPickaxe) heldItem).lookingDirection; drawString(fontRender, str, (this.width - fontRender.getStringWidth(str)) / 2, this.height / 10, 0xFFAA00); - } + }*/ } }catch(NullPointerException e){} diff --git a/src/Java/miscutil/core/util/item/UtilsItems.java b/src/Java/miscutil/core/util/item/UtilsItems.java index 401618df52..e46b49074f 100644 --- a/src/Java/miscutil/core/util/item/UtilsItems.java +++ b/src/Java/miscutil/core/util/item/UtilsItems.java @@ -1,5 +1,6 @@ package miscutil.core.util.item; +import gregtech.api.enums.Materials; import gregtech.api.util.GT_OreDictUnificator; import java.util.ArrayList; @@ -19,6 +20,7 @@ import miscutil.core.item.base.rods.BaseItemRod; import miscutil.core.item.base.rods.BaseItemRodLong; import miscutil.core.item.base.rotors.BaseItemRotor; import miscutil.core.item.base.screws.BaseItemScrew; +import miscutil.core.item.tool.staballoy.MultiPickaxeBase; import miscutil.core.lib.CORE; import miscutil.core.lib.LoadedMods; import miscutil.core.lib.MaterialInfo; @@ -27,6 +29,7 @@ import miscutil.core.util.wrapper.var; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.item.Item; +import net.minecraft.item.Item.ToolMaterial; import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; import cpw.mods.fml.common.registry.GameRegistry; @@ -313,6 +316,27 @@ public class UtilsItems { } + public static MultiPickaxeBase generateMultiPick(Materials material){ + ToolMaterial customMaterial = Utils.generateMaterialFromGT(material); + short[] rgb; + rgb = material.getRGBA(); + int dur = customMaterial.getMaxUses(); + + if (dur <= 0){ + dur = material.mDurability; + } + + MultiPickaxeBase MP_Redstone = new MultiPickaxeBase( + material.name()+" Multipick", + (customMaterial), + dur, + Utils.rgbtoHexValue(rgb[0],rgb[1],rgb[2]) + ); + + return MP_Redstone; + + } + public static String getArrayStackNames(ItemStack[] aStack){ String itemNames = "Item Array: "; for (ItemStack alph : aStack){ |