From 7492b8b74ccf09ddfb1ce1da50945f1c139a1915 Mon Sep 17 00:00:00 2001 From: Dream-Master Date: Sat, 30 Dec 2017 19:37:56 +0100 Subject: Import unused imports rename all Textures and Files to Luv, ZPM and UV --- src/main/java/com/detrav/DetravScannerMod.java | 4 +- .../com/detrav/Detrav_AfterGTPreload_Loader.java | 6 +- .../com/detrav/commands/DetravScannerCommand.java | 3 - src/main/java/com/detrav/enums/Textures01.java | 10 +- .../com/detrav/events/DetravLoginEventHandler.java | 5 - .../detrav/items/DetravMetaGeneratedTool01.java | 12 +- .../BehaviourDetravToolElectricProPick.java | 6 +- .../behaviours/BehaviourDetravToolProPick.java | 8 +- .../processing/ProcessingDetravToolProPick.java | 3 +- .../items/tools/DetravToolHVElectricProPick.java | 22 --- .../items/tools/DetravToolLVElectricProPick.java | 187 --------------------- .../items/tools/DetravToolLuVElectricProPick.java | 187 +++++++++++++++++++++ .../items/tools/DetravToolMVElectricProPick.java | 21 --- .../items/tools/DetravToolUVElectricProPick.java | 22 +++ .../items/tools/DetravToolZPMElectricProPick.java | 21 +++ .../java/com/detrav/net/DetravProPickPacket00.java | 3 - src/main/java/com/detrav/proxies/ClientProxy.java | 2 - src/main/java/com/detrav/proxies/CommonProxy.java | 11 -- .../ELECTRIC_HV_PRO_PICK_HEAD.png | Bin 192 -> 0 bytes .../ELECTRIC_HV_PRO_PICK_HEAD_OVERLAY.png | Bin 281 -> 0 bytes .../ELECTRIC_LV_PRO_PICK_HEAD.png | Bin 192 -> 0 bytes .../ELECTRIC_LV_PRO_PICK_HEAD_OVERLAY.png | Bin 270 -> 0 bytes .../ELECTRIC_LuV_PRO_PICK_HEAD.png | Bin 0 -> 192 bytes .../ELECTRIC_LuV_PRO_PICK_HEAD_OVERLAY.png | Bin 0 -> 270 bytes .../ELECTRIC_MV_PRO_PICK_HEAD.png | Bin 192 -> 0 bytes .../ELECTRIC_MV_PRO_PICK_HEAD_OVERLAY.png | Bin 281 -> 0 bytes .../ELECTRIC_UV_PRO_PICK_HEAD.png | Bin 0 -> 192 bytes .../ELECTRIC_UV_PRO_PICK_HEAD_OVERLAY.png | Bin 0 -> 281 bytes .../ELECTRIC_ZPM_PRO_PICK_HEAD.png | Bin 0 -> 192 bytes .../ELECTRIC_ZPM_PRO_PICK_HEAD_OVERLAY.png | Bin 0 -> 281 bytes src/main/resources/mcmod.info | 2 +- 31 files changed, 246 insertions(+), 289 deletions(-) delete mode 100644 src/main/java/com/detrav/items/tools/DetravToolHVElectricProPick.java delete mode 100644 src/main/java/com/detrav/items/tools/DetravToolLVElectricProPick.java create mode 100644 src/main/java/com/detrav/items/tools/DetravToolLuVElectricProPick.java delete mode 100644 src/main/java/com/detrav/items/tools/DetravToolMVElectricProPick.java create mode 100644 src/main/java/com/detrav/items/tools/DetravToolUVElectricProPick.java create mode 100644 src/main/java/com/detrav/items/tools/DetravToolZPMElectricProPick.java delete mode 100644 src/main/resources/assets/gregtech/textures/items/gt.detrav.metatool.01/ELECTRIC_HV_PRO_PICK_HEAD.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/gt.detrav.metatool.01/ELECTRIC_HV_PRO_PICK_HEAD_OVERLAY.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/gt.detrav.metatool.01/ELECTRIC_LV_PRO_PICK_HEAD.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/gt.detrav.metatool.01/ELECTRIC_LV_PRO_PICK_HEAD_OVERLAY.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.detrav.metatool.01/ELECTRIC_LuV_PRO_PICK_HEAD.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.detrav.metatool.01/ELECTRIC_LuV_PRO_PICK_HEAD_OVERLAY.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/gt.detrav.metatool.01/ELECTRIC_MV_PRO_PICK_HEAD.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/gt.detrav.metatool.01/ELECTRIC_MV_PRO_PICK_HEAD_OVERLAY.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.detrav.metatool.01/ELECTRIC_UV_PRO_PICK_HEAD.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.detrav.metatool.01/ELECTRIC_UV_PRO_PICK_HEAD_OVERLAY.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.detrav.metatool.01/ELECTRIC_ZPM_PRO_PICK_HEAD.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.detrav.metatool.01/ELECTRIC_ZPM_PRO_PICK_HEAD_OVERLAY.png (limited to 'src/main') diff --git a/src/main/java/com/detrav/DetravScannerMod.java b/src/main/java/com/detrav/DetravScannerMod.java index b18575fdf4..a74e435141 100644 --- a/src/main/java/com/detrav/DetravScannerMod.java +++ b/src/main/java/com/detrav/DetravScannerMod.java @@ -1,6 +1,5 @@ package com.detrav; -import com.detrav.events.DetravLoginEventHandler; import com.detrav.proxies.CommonProxy; import com.detrav.utils.DetravCreativeTab; import com.detrav.net.DetravNetwork; @@ -10,7 +9,6 @@ import cpw.mods.fml.common.SidedProxy; import cpw.mods.fml.common.event.FMLInitializationEvent; import cpw.mods.fml.common.event.FMLPostInitializationEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent; -import cpw.mods.fml.common.event.FMLServerStartingEvent; import cpw.mods.fml.common.network.NetworkRegistry; import gregtech.api.GregTech_API; import net.minecraft.creativetab.CreativeTabs; @@ -20,7 +18,7 @@ import net.minecraftforge.common.config.Configuration; public class DetravScannerMod { public static final String MODID = "detravscannermod"; - public static final String VERSION = "1.1"; + public static final String VERSION = "1.3"; public static final CreativeTabs TAB_DETRAV = new DetravCreativeTab(); diff --git a/src/main/java/com/detrav/Detrav_AfterGTPreload_Loader.java b/src/main/java/com/detrav/Detrav_AfterGTPreload_Loader.java index 2af2d2a8e5..db9011b1c8 100644 --- a/src/main/java/com/detrav/Detrav_AfterGTPreload_Loader.java +++ b/src/main/java/com/detrav/Detrav_AfterGTPreload_Loader.java @@ -1,11 +1,7 @@ package com.detrav; import com.detrav.items.DetravMetaGeneratedTool01; -import com.detrav.items.processing.*; -import cpw.mods.fml.common.registry.GameRegistry; -import gregtech.api.enums.Materials; -import gregtech.api.enums.OrePrefixes; -import gregtech.api.util.GT_ModHandler; +import com.detrav.items.processing.ProcessingDetravToolProPick; /** * Created by wital_000 on 18.03.2016. diff --git a/src/main/java/com/detrav/commands/DetravScannerCommand.java b/src/main/java/com/detrav/commands/DetravScannerCommand.java index 374bc5fa65..7b0c22fb3a 100644 --- a/src/main/java/com/detrav/commands/DetravScannerCommand.java +++ b/src/main/java/com/detrav/commands/DetravScannerCommand.java @@ -5,14 +5,11 @@ import gregtech.api.enums.Materials; import gregtech.api.util.GT_LanguageManager; import gregtech.common.blocks.GT_TileEntity_Ores; import net.minecraft.block.Block; -import net.minecraft.client.Minecraft; import net.minecraft.command.ICommand; import net.minecraft.command.ICommandSender; -import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ChatComponentText; import net.minecraft.util.ChunkCoordinates; -import net.minecraft.world.World; import net.minecraft.world.chunk.Chunk; import java.util.ArrayList; diff --git a/src/main/java/com/detrav/enums/Textures01.java b/src/main/java/com/detrav/enums/Textures01.java index 742a7f9756..3c35f730d6 100644 --- a/src/main/java/com/detrav/enums/Textures01.java +++ b/src/main/java/com/detrav/enums/Textures01.java @@ -1,11 +1,7 @@ package com.detrav.enums; -import gregtech.api.GregTech_API; import gregtech.api.enums.Textures; import gregtech.api.interfaces.IIconContainer; -import net.minecraft.client.renderer.texture.TextureMap; -import net.minecraft.util.IIcon; -import net.minecraft.util.ResourceLocation; /** * Created by wital_000 on 19.03.2016. @@ -13,8 +9,8 @@ import net.minecraft.util.ResourceLocation; public class Textures01 { public static final IIconContainer[] mTextures = new IIconContainer[] { - new Textures.ItemIcons.CustomIcon("gt.detrav.metatool.01/ELECTRIC_LV_PRO_PICK_HEAD"), - new Textures.ItemIcons.CustomIcon("gt.detrav.metatool.01/ELECTRIC_MV_PRO_PICK_HEAD"), - new Textures.ItemIcons.CustomIcon("gt.detrav.metatool.01/ELECTRIC_HV_PRO_PICK_HEAD"), + new Textures.ItemIcons.CustomIcon("gt.detrav.metatool.01/ELECTRIC_LuV_PRO_PICK_HEAD"), + new Textures.ItemIcons.CustomIcon("gt.detrav.metatool.01/ELECTRIC_ZPM_PRO_PICK_HEAD"), + new Textures.ItemIcons.CustomIcon("gt.detrav.metatool.01/ELECTRIC_UV_PRO_PICK_HEAD"), }; } \ No newline at end of file diff --git a/src/main/java/com/detrav/events/DetravLoginEventHandler.java b/src/main/java/com/detrav/events/DetravLoginEventHandler.java index 09b4390459..2307db4cee 100644 --- a/src/main/java/com/detrav/events/DetravLoginEventHandler.java +++ b/src/main/java/com/detrav/events/DetravLoginEventHandler.java @@ -1,12 +1,7 @@ package com.detrav.events; -import com.detrav.net.DetravNetwork; import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.EntityPlayerMP; import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.event.entity.EntityJoinWorldEvent; /** * Created by wital_000 on 18.04.2016. diff --git a/src/main/java/com/detrav/items/DetravMetaGeneratedTool01.java b/src/main/java/com/detrav/items/DetravMetaGeneratedTool01.java index 26c7188e21..d50e19d0d7 100644 --- a/src/main/java/com/detrav/items/DetravMetaGeneratedTool01.java +++ b/src/main/java/com/detrav/items/DetravMetaGeneratedTool01.java @@ -2,8 +2,9 @@ package com.detrav.items; import com.detrav.DetravScannerMod; import com.detrav.enums.DetravToolDictNames; -import com.detrav.items.tools.*; -import com.detrav.utils.DetravCreativeTab; +import com.detrav.items.tools.DetravToolLuVElectricProPick; +import com.detrav.items.tools.DetravToolUVElectricProPick; +import com.detrav.items.tools.DetravToolZPMElectricProPick; import gregtech.api.enums.Materials; import gregtech.api.enums.TC_Aspects; import gregtech.api.interfaces.IToolStats; @@ -14,7 +15,6 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumChatFormatting; -import net.minecraft.util.ObjectIntIdentityMap; import net.minecraftforge.fluids.FluidStack; import java.util.List; @@ -28,9 +28,9 @@ public class DetravMetaGeneratedTool01 extends GT_MetaGenerated_Tool { public DetravMetaGeneratedTool01() { super("detrav.metatool.01"); INSTANCE = this; - addTool(100, "Electric Prospector's Scanner (LuV)", "", new DetravToolLVElectricProPick(), new Object[]{DetravToolDictNames.craftingToolElectricProPick, new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 4L)}, new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 4L)); - addTool(102, "Electric Prospector's Scanner (ZPM)", "", new DetravToolMVElectricProPick(), new Object[]{DetravToolDictNames.craftingToolElectricProPick, new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 4L)}, new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 4L)); - addTool(104, "Electric Prospector's Scanner (UV)", "", new DetravToolHVElectricProPick(), new Object[]{DetravToolDictNames.craftingToolElectricProPick, new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 4L)}, new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 4L)); + addTool(100, "Electric Prospector's Scanner (LuV)", "", new DetravToolLuVElectricProPick(), new Object[]{DetravToolDictNames.craftingToolElectricProPick, new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 4L)}, new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 4L)); + addTool(102, "Electric Prospector's Scanner (ZPM)", "", new DetravToolZPMElectricProPick(), new Object[]{DetravToolDictNames.craftingToolElectricProPick, new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 4L)}, new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 4L)); + addTool(104, "Electric Prospector's Scanner (UV)", "", new DetravToolUVElectricProPick(), new Object[]{DetravToolDictNames.craftingToolElectricProPick, new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 4L)}, new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 4L)); setCreativeTab(DetravScannerMod.TAB_DETRAV); } diff --git a/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolElectricProPick.java b/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolElectricProPick.java index f352767466..7ddbc243a5 100644 --- a/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolElectricProPick.java +++ b/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolElectricProPick.java @@ -3,24 +3,20 @@ package com.detrav.items.behaviours; import com.detrav.items.DetravMetaGeneratedTool01; import com.detrav.net.DetravNetwork; import com.detrav.net.DetravProPickPacket00; -import gregtech.api.GregTech_API; import gregtech.api.items.GT_MetaBase_Item; import gregtech.api.objects.ItemData; import gregtech.api.util.GT_LanguageManager; import gregtech.api.util.GT_OreDictUnificator; -import gregtech.api.util.GT_Utility; +import gregtech.common.GT_UndergroundOil; import gregtech.common.blocks.GT_Block_Ores_Abstract; import gregtech.common.blocks.GT_TileEntity_Ores; -import gregtech.common.GT_UndergroundOil; import net.minecraft.block.Block; -import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ChatComponentText; -import net.minecraft.world.ChunkPosition; import net.minecraft.world.World; import net.minecraft.world.chunk.Chunk; import net.minecraftforge.fluids.FluidStack; diff --git a/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolProPick.java b/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolProPick.java index 4bf6119930..60d61155c5 100644 --- a/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolProPick.java +++ b/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolProPick.java @@ -7,13 +7,11 @@ import gregtech.api.items.GT_MetaBase_Item; import gregtech.api.objects.ItemData; import gregtech.api.util.GT_LanguageManager; import gregtech.api.util.GT_OreDictUnificator; -import gregtech.api.util.GT_Utility; -import gregtech.common.GT_Proxy; +import gregtech.common.GT_Pollution; +import gregtech.common.GT_UndergroundOil; import gregtech.common.blocks.GT_Block_Ores_Abstract; import gregtech.common.blocks.GT_TileEntity_Ores; import gregtech.common.items.behaviors.Behaviour_None; -import gregtech.common.GT_UndergroundOil; -import gregtech.common.GT_Pollution; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; @@ -21,10 +19,8 @@ import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ChatComponentText; -import net.minecraft.world.ChunkPosition; import net.minecraft.world.World; import net.minecraft.world.chunk.Chunk; -import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; import java.util.HashMap; diff --git a/src/main/java/com/detrav/items/processing/ProcessingDetravToolProPick.java b/src/main/java/com/detrav/items/processing/ProcessingDetravToolProPick.java index 3de9fc5776..79acd999e3 100644 --- a/src/main/java/com/detrav/items/processing/ProcessingDetravToolProPick.java +++ b/src/main/java/com/detrav/items/processing/ProcessingDetravToolProPick.java @@ -1,13 +1,12 @@ package com.detrav.items.processing; import com.detrav.items.DetravMetaGeneratedTool01; +import com.dreammaster.gthandler.CustomItemList; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; import gregtech.api.util.GT_ModHandler; -import gregtech.common.items.GT_MetaGenerated_Tool_01; import net.minecraft.item.ItemStack; -import com.dreammaster.gthandler.CustomItemList; /** * Created by wital_000 on 18.03.2016. diff --git a/src/main/java/com/detrav/items/tools/DetravToolHVElectricProPick.java b/src/main/java/com/detrav/items/tools/DetravToolHVElectricProPick.java deleted file mode 100644 index 071416763c..0000000000 --- a/src/main/java/com/detrav/items/tools/DetravToolHVElectricProPick.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.detrav.items.tools; - -import com.detrav.enums.Textures01; -import gregtech.api.interfaces.IIconContainer; -import net.minecraft.item.ItemStack; - -/** - * Created by wital_000 on 19.03.2016. - */ -public class DetravToolHVElectricProPick extends DetravToolMVElectricProPick { - public int getBaseQuality() { - return 2; - } - - public float getMaxDurabilityMultiplier() { - return 4.0F; - } - - public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) { - return Textures01.mTextures[2]; - } -} diff --git a/src/main/java/com/detrav/items/tools/DetravToolLVElectricProPick.java b/src/main/java/com/detrav/items/tools/DetravToolLVElectricProPick.java deleted file mode 100644 index 7be34f23d6..0000000000 --- a/src/main/java/com/detrav/items/tools/DetravToolLVElectricProPick.java +++ /dev/null @@ -1,187 +0,0 @@ -package com.detrav.items.tools; - -import com.detrav.enums.Textures01; -import com.detrav.items.behaviours.BehaviourDetravToolElectricProPick; -import gregtech.GT_Mod; -import gregtech.api.GregTech_API; -import gregtech.api.damagesources.GT_DamageSources; -import gregtech.api.interfaces.IIconContainer; -import gregtech.api.interfaces.IToolStats; -import gregtech.api.items.GT_MetaGenerated_Tool; -import net.minecraft.block.Block; -import net.minecraft.enchantment.Enchantment; -import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.stats.AchievementList; -import net.minecraft.util.ChatComponentText; -import net.minecraft.util.DamageSource; -import net.minecraft.util.EnumChatFormatting; -import net.minecraft.util.IChatComponent; -import net.minecraft.world.World; -import net.minecraftforge.event.world.BlockEvent; - -import java.util.List; - -/** - * Created by wital_000 on 19.03.2016. - */ -public class DetravToolLVElectricProPick implements IToolStats { - public int getToolDamagePerBlockBreak() { - return GT_Mod.gregtechproxy.mHardRock ? 50 : 100; - } - - public int getToolDamagePerDropConversion() { - return 100; - } - - public int getToolDamagePerContainerCraft() { - return 100; - } - - public int getToolDamagePerEntityAttack() { - return 2000; - } - - public int getBaseQuality() { - return 0; - } - - public float getBaseDamage() { - return 1.0F; - } - - @Override - public int getHurtResistanceTime(int i, Entity entity) { - return i; - } - - public float getSpeedMultiplier() { - return 1.0F; - } - - public float getMaxDurabilityMultiplier() { - return 1.0F; - } - - @Override - public DamageSource getDamageSource(EntityLivingBase aPlayer, Entity aEntity) { - return GT_DamageSources.getCombatDamage((aPlayer instanceof EntityPlayer) ? "player" : "mob", aPlayer, (aEntity instanceof EntityLivingBase) ? getDeathMessage(aPlayer, (EntityLivingBase) aEntity) : null); - } - - public String getCraftingSound() { - return null; - } - - public String getEntityHitSound() { - return null; - } - - public String getBreakingSound() { - return (String) GregTech_API.sSoundList.get(Integer.valueOf(0)); - } - - @Override - public Enchantment[] getEnchantments(ItemStack itemStack) { - return new Enchantment[0]; - } - - @Override - public int[] getEnchantmentLevels(ItemStack itemStack) { - return new int[0]; - } - - public String getMiningSound() { - return null; - } - - public boolean canBlock() { - return false; - } - - public boolean isCrowbar() { - return false; - } - - @Override - public boolean isGrafter() { - return false; - } - - @Override - public boolean isChainsaw() { - return false; - } - - @Override - public boolean isWrench() { - return false; - } - - @Override - public boolean isWeapon() { - return false; - } - - @Override - public boolean isRangedWeapon() { - return false; - } - - @Override - public boolean isMiningTool() { - return false; - } - - public boolean isMinableBlock(Block aBlock, byte aMetaData) { - - return false; - } - - @Override - public int convertBlockDrops(List list, ItemStack itemStack, EntityPlayer entityPlayer, Block block, int i, int i1, int i2, byte b, int i3, boolean b1, BlockEvent.HarvestDropsEvent harvestDropsEvent) { - return 0; - } - - public ItemStack getBrokenItem(ItemStack aStack) { - return null; - } - - @Override - public float getNormalDamageAgainstEntity(float v, Entity entity, ItemStack itemStack, EntityPlayer entityPlayer) { - return v; - } - - @Override - public float getMagicDamageAgainstEntity(float v, Entity entity, ItemStack itemStack, EntityPlayer entityPlayer) { - return v; - } - - public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) { - return Textures01.mTextures[0]; - } - - public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) { - return aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa : GT_MetaGenerated_Tool.getSecondaryMaterial(aStack).mRGBa; - } - - public void onStatsAddedToTool(GT_MetaGenerated_Tool aItem, int aID) { - aItem.addItemBehavior(aID, new BehaviourDetravToolElectricProPick(getToolDamagePerBlockBreak())); - } - - public void onToolCrafted(ItemStack aStack, EntityPlayer aPlayer) { - - aPlayer.triggerAchievement(AchievementList.openInventory); - aPlayer.triggerAchievement(AchievementList.mineWood); - aPlayer.triggerAchievement(AchievementList.buildWorkBench); - } - - public IChatComponent getDeathMessage(EntityLivingBase aPlayer, EntityLivingBase aEntity) { - return new ChatComponentText(EnumChatFormatting.RED + aEntity.getCommandSenderName() + EnumChatFormatting.WHITE + " got Pick Up'ed by " + EnumChatFormatting.GREEN + aPlayer.getCommandSenderName() + EnumChatFormatting.WHITE); - } - - public float getMiningSpeed(Block aBlock, byte aMetaData, float aDefault, EntityPlayer aPlayer, World aWorld, int aX, int aY, int aZ) { - return aDefault; - } -} \ No newline at end of file diff --git a/src/main/java/com/detrav/items/tools/DetravToolLuVElectricProPick.java b/src/main/java/com/detrav/items/tools/DetravToolLuVElectricProPick.java new file mode 100644 index 0000000000..6ccbff924e --- /dev/null +++ b/src/main/java/com/detrav/items/tools/DetravToolLuVElectricProPick.java @@ -0,0 +1,187 @@ +package com.detrav.items.tools; + +import com.detrav.enums.Textures01; +import com.detrav.items.behaviours.BehaviourDetravToolElectricProPick; +import gregtech.GT_Mod; +import gregtech.api.GregTech_API; +import gregtech.api.damagesources.GT_DamageSources; +import gregtech.api.interfaces.IIconContainer; +import gregtech.api.interfaces.IToolStats; +import gregtech.api.items.GT_MetaGenerated_Tool; +import net.minecraft.block.Block; +import net.minecraft.enchantment.Enchantment; +import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.stats.AchievementList; +import net.minecraft.util.ChatComponentText; +import net.minecraft.util.DamageSource; +import net.minecraft.util.EnumChatFormatting; +import net.minecraft.util.IChatComponent; +import net.minecraft.world.World; +import net.minecraftforge.event.world.BlockEvent; + +import java.util.List; + +/** + * Created by wital_000 on 19.03.2016. + */ +public class DetravToolLuVElectricProPick implements IToolStats { + public int getToolDamagePerBlockBreak() { + return GT_Mod.gregtechproxy.mHardRock ? 50 : 100; + } + + public int getToolDamagePerDropConversion() { + return 100; + } + + public int getToolDamagePerContainerCraft() { + return 100; + } + + public int getToolDamagePerEntityAttack() { + return 2000; + } + + public int getBaseQuality() { + return 0; + } + + public float getBaseDamage() { + return 1.0F; + } + + @Override + public int getHurtResistanceTime(int i, Entity entity) { + return i; + } + + public float getSpeedMultiplier() { + return 1.0F; + } + + public float getMaxDurabilityMultiplier() { + return 1.0F; + } + + @Override + public DamageSource getDamageSource(EntityLivingBase aPlayer, Entity aEntity) { + return GT_DamageSources.getCombatDamage((aPlayer instanceof EntityPlayer) ? "player" : "mob", aPlayer, (aEntity instanceof EntityLivingBase) ? getDeathMessage(aPlayer, (EntityLivingBase) aEntity) : null); + } + + public String getCraftingSound() { + return null; + } + + public String getEntityHitSound() { + return null; + } + + public String getBreakingSound() { + return (String) GregTech_API.sSoundList.get(Integer.valueOf(0)); + } + + @Override + public Enchantment[] getEnchantments(ItemStack itemStack) { + return new Enchantment[0]; + } + + @Override + public int[] getEnchantmentLevels(ItemStack itemStack) { + return new int[0]; + } + + public String getMiningSound() { + return null; + } + + public boolean canBlock() { + return false; + } + + public boolean isCrowbar() { + return false; + } + + @Override + public boolean isGrafter() { + return false; + } + + @Override + public boolean isChainsaw() { + return false; + } + + @Override + public boolean isWrench() { + return false; + } + + @Override + public boolean isWeapon() { + return false; + } + + @Override + public boolean isRangedWeapon() { + return false; + } + + @Override + public boolean isMiningTool() { + return false; + } + + public boolean isMinableBlock(Block aBlock, byte aMetaData) { + + return false; + } + + @Override + public int convertBlockDrops(List list, ItemStack itemStack, EntityPlayer entityPlayer, Block block, int i, int i1, int i2, byte b, int i3, boolean b1, BlockEvent.HarvestDropsEvent harvestDropsEvent) { + return 0; + } + + public ItemStack getBrokenItem(ItemStack aStack) { + return null; + } + + @Override + public float getNormalDamageAgainstEntity(float v, Entity entity, ItemStack itemStack, EntityPlayer entityPlayer) { + return v; + } + + @Override + public float getMagicDamageAgainstEntity(float v, Entity entity, ItemStack itemStack, EntityPlayer entityPlayer) { + return v; + } + + public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) { + return Textures01.mTextures[0]; + } + + public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) { + return aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa : GT_MetaGenerated_Tool.getSecondaryMaterial(aStack).mRGBa; + } + + public void onStatsAddedToTool(GT_MetaGenerated_Tool aItem, int aID) { + aItem.addItemBehavior(aID, new BehaviourDetravToolElectricProPick(getToolDamagePerBlockBreak())); + } + + public void onToolCrafted(ItemStack aStack, EntityPlayer aPlayer) { + + aPlayer.triggerAchievement(AchievementList.openInventory); + aPlayer.triggerAchievement(AchievementList.mineWood); + aPlayer.triggerAchievement(AchievementList.buildWorkBench); + } + + public IChatComponent getDeathMessage(EntityLivingBase aPlayer, EntityLivingBase aEntity) { + return new ChatComponentText(EnumChatFormatting.RED + aEntity.getCommandSenderName() + EnumChatFormatting.WHITE + " got Pick Up'ed by " + EnumChatFormatting.GREEN + aPlayer.getCommandSenderName() + EnumChatFormatting.WHITE); + } + + public float getMiningSpeed(Block aBlock, byte aMetaData, float aDefault, EntityPlayer aPlayer, World aWorld, int aX, int aY, int aZ) { + return aDefault; + } +} \ No newline at end of file diff --git a/src/main/java/com/detrav/items/tools/DetravToolMVElectricProPick.java b/src/main/java/com/detrav/items/tools/DetravToolMVElectricProPick.java deleted file mode 100644 index 05d719c2d3..0000000000 --- a/src/main/java/com/detrav/items/tools/DetravToolMVElectricProPick.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.detrav.items.tools; - -import com.detrav.enums.Textures01; -import gregtech.api.interfaces.IIconContainer; -import net.minecraft.item.ItemStack; - -/** - * Created by wital_000 on 19.03.2016. - */ -public class DetravToolMVElectricProPick extends DetravToolLVElectricProPick { - public int getBaseQuality() { - return 1; - } - public float getMaxDurabilityMultiplier() { - return 2.0F; - } - - public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) { - return Textures01.mTextures[1]; - } -} diff --git a/src/main/java/com/detrav/items/tools/DetravToolUVElectricProPick.java b/src/main/java/com/detrav/items/tools/DetravToolUVElectricProPick.java new file mode 100644 index 0000000000..7711a8901d --- /dev/null +++ b/src/main/java/com/detrav/items/tools/DetravToolUVElectricProPick.java @@ -0,0 +1,22 @@ +package com.detrav.items.tools; + +import com.detrav.enums.Textures01; +import gregtech.api.interfaces.IIconContainer; +import net.minecraft.item.ItemStack; + +/** + * Created by wital_000 on 19.03.2016. + */ +public class DetravToolUVElectricProPick extends DetravToolZPMElectricProPick { + public int getBaseQuality() { + return 2; + } + + public float getMaxDurabilityMultiplier() { + return 4.0F; + } + + public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) { + return Textures01.mTextures[2]; + } +} diff --git a/src/main/java/com/detrav/items/tools/DetravToolZPMElectricProPick.java b/src/main/java/com/detrav/items/tools/DetravToolZPMElectricProPick.java new file mode 100644 index 0000000000..c04747f529 --- /dev/null +++ b/src/main/java/com/detrav/items/tools/DetravToolZPMElectricProPick.java @@ -0,0 +1,21 @@ +package com.detrav.items.tools; + +import com.detrav.enums.Textures01; +import gregtech.api.interfaces.IIconContainer; +import net.minecraft.item.ItemStack; + +/** + * Created by wital_000 on 19.03.2016. + */ +public class DetravToolZPMElectricProPick extends DetravToolLuVElectricProPick { + public int getBaseQuality() { + return 1; + } + public float getMaxDurabilityMultiplier() { + return 2.0F; + } + + public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) { + return Textures01.mTextures[1]; + } +} diff --git a/src/main/java/com/detrav/net/DetravProPickPacket00.java b/src/main/java/com/detrav/net/DetravProPickPacket00.java index c910b3a4b2..385ad71e95 100644 --- a/src/main/java/com/detrav/net/DetravProPickPacket00.java +++ b/src/main/java/com/detrav/net/DetravProPickPacket00.java @@ -9,9 +9,6 @@ import com.google.common.io.ByteStreams; import gregtech.api.GregTech_API; import gregtech.api.enums.Materials; import gregtech.api.util.GT_LanguageManager; -import gregtech.api.util.GT_Utility; -import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidStack; import java.awt.image.BufferedImage; import java.awt.image.WritableRaster; diff --git a/src/main/java/com/detrav/proxies/ClientProxy.java b/src/main/java/com/detrav/proxies/ClientProxy.java index 2848b80ba8..f13dafdbc1 100644 --- a/src/main/java/com/detrav/proxies/ClientProxy.java +++ b/src/main/java/com/detrav/proxies/ClientProxy.java @@ -3,10 +3,8 @@ package com.detrav.proxies; import com.detrav.DetravScannerMod; import com.detrav.enums.Textures01; import com.detrav.gui.DetravGuiProPick; -import gregtech.api.enums.Textures; import net.minecraft.client.Minecraft; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.util.ChatComponentText; /** * Created by wital_000 on 19.03.2016. diff --git a/src/main/java/com/detrav/proxies/CommonProxy.java b/src/main/java/com/detrav/proxies/CommonProxy.java index d75e3deee8..5ba04beab6 100644 --- a/src/main/java/com/detrav/proxies/CommonProxy.java +++ b/src/main/java/com/detrav/proxies/CommonProxy.java @@ -1,20 +1,9 @@ package com.detrav.proxies; -import com.detrav.DetravScannerMod; - import com.detrav.events.DetravLoginEventHandler; import com.detrav.gui.DetravGuiProPick; -import com.detrav.items.DetravMetaGeneratedTool01; import cpw.mods.fml.common.network.IGuiHandler; -import gregtech.api.GregTech_API; -import gregtech.api.enums.*; -import gregtech.api.util.GT_ModHandler; -import gregtech.api.util.GT_OreDictUnificator; -import ic2.core.Ic2Items; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; import net.minecraft.world.World; /** diff --git a/src/main/resources/assets/gregtech/textures/items/gt.detrav.metatool.01/ELECTRIC_HV_PRO_PICK_HEAD.png b/src/main/resources/assets/gregtech/textures/items/gt.detrav.metatool.01/ELECTRIC_HV_PRO_PICK_HEAD.png deleted file mode 100644 index 57706b0457..0000000000 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.detrav.metatool.01/ELECTRIC_HV_PRO_PICK_HEAD.png and /dev/null differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.detrav.metatool.01/ELECTRIC_HV_PRO_PICK_HEAD_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/gt.detrav.metatool.01/ELECTRIC_HV_PRO_PICK_HEAD_OVERLAY.png deleted file mode 100644 index f42b2213a3..0000000000 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.detrav.metatool.01/ELECTRIC_HV_PRO_PICK_HEAD_OVERLAY.png and /dev/null differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.detrav.metatool.01/ELECTRIC_LV_PRO_PICK_HEAD.png b/src/main/resources/assets/gregtech/textures/items/gt.detrav.metatool.01/ELECTRIC_LV_PRO_PICK_HEAD.png deleted file mode 100644 index b97d245942..0000000000 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.detrav.metatool.01/ELECTRIC_LV_PRO_PICK_HEAD.png and /dev/null differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.detrav.metatool.01/ELECTRIC_LV_PRO_PICK_HEAD_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/gt.detrav.metatool.01/ELECTRIC_LV_PRO_PICK_HEAD_OVERLAY.png deleted file mode 100644 index c7eff4b666..0000000000 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.detrav.metatool.01/ELECTRIC_LV_PRO_PICK_HEAD_OVERLAY.png and /dev/null differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.detrav.metatool.01/ELECTRIC_LuV_PRO_PICK_HEAD.png b/src/main/resources/assets/gregtech/textures/items/gt.detrav.metatool.01/ELECTRIC_LuV_PRO_PICK_HEAD.png new file mode 100644 index 0000000000..b97d245942 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/gt.detrav.metatool.01/ELECTRIC_LuV_PRO_PICK_HEAD.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.detrav.metatool.01/ELECTRIC_LuV_PRO_PICK_HEAD_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/gt.detrav.metatool.01/ELECTRIC_LuV_PRO_PICK_HEAD_OVERLAY.png new file mode 100644 index 0000000000..c7eff4b666 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/gt.detrav.metatool.01/ELECTRIC_LuV_PRO_PICK_HEAD_OVERLAY.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.detrav.metatool.01/ELECTRIC_MV_PRO_PICK_HEAD.png b/src/main/resources/assets/gregtech/textures/items/gt.detrav.metatool.01/ELECTRIC_MV_PRO_PICK_HEAD.png deleted file mode 100644 index 7864cf9036..0000000000 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.detrav.metatool.01/ELECTRIC_MV_PRO_PICK_HEAD.png and /dev/null differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.detrav.metatool.01/ELECTRIC_MV_PRO_PICK_HEAD_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/gt.detrav.metatool.01/ELECTRIC_MV_PRO_PICK_HEAD_OVERLAY.png deleted file mode 100644 index 04e3157a47..0000000000 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.detrav.metatool.01/ELECTRIC_MV_PRO_PICK_HEAD_OVERLAY.png and /dev/null differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.detrav.metatool.01/ELECTRIC_UV_PRO_PICK_HEAD.png b/src/main/resources/assets/gregtech/textures/items/gt.detrav.metatool.01/ELECTRIC_UV_PRO_PICK_HEAD.png new file mode 100644 index 0000000000..57706b0457 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/gt.detrav.metatool.01/ELECTRIC_UV_PRO_PICK_HEAD.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.detrav.metatool.01/ELECTRIC_UV_PRO_PICK_HEAD_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/gt.detrav.metatool.01/ELECTRIC_UV_PRO_PICK_HEAD_OVERLAY.png new file mode 100644 index 0000000000..f42b2213a3 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/gt.detrav.metatool.01/ELECTRIC_UV_PRO_PICK_HEAD_OVERLAY.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.detrav.metatool.01/ELECTRIC_ZPM_PRO_PICK_HEAD.png b/src/main/resources/assets/gregtech/textures/items/gt.detrav.metatool.01/ELECTRIC_ZPM_PRO_PICK_HEAD.png new file mode 100644 index 0000000000..7864cf9036 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/gt.detrav.metatool.01/ELECTRIC_ZPM_PRO_PICK_HEAD.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.detrav.metatool.01/ELECTRIC_ZPM_PRO_PICK_HEAD_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/gt.detrav.metatool.01/ELECTRIC_ZPM_PRO_PICK_HEAD_OVERLAY.png new file mode 100644 index 0000000000..04e3157a47 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/gt.detrav.metatool.01/ELECTRIC_ZPM_PRO_PICK_HEAD_OVERLAY.png differ diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info index 5773c69e2d..4d3750bd65 100644 --- a/src/main/resources/mcmod.info +++ b/src/main/resources/mcmod.info @@ -3,7 +3,7 @@ "modid": "detravscannermod", "name": "GT Scanner Mod", "description": "To locate ores deep underground.", - "version": "1.1", + "version": "1.3", "mcversion": "1.7.10", "url": "https://github.com/GTNewHorizons/GTScannerMod", "updateUrl": "", -- cgit