From 8ecc28d1317e01036a6d0f1cefa34b0aacd2d16a Mon Sep 17 00:00:00 2001 From: Jason Mitchell Date: Sun, 24 Jan 2021 00:37:23 -0800 Subject: Selectable ores on electronic prospector * Cleaned up some class/file names * Removed unused code/comments * Cached other mods being loaded * Various optimizations --- .../java/com/detrav/items/tools/DetravProPick.java | 37 ---- .../com/detrav/items/tools/DetravProspector.java | 33 ++++ .../items/tools/DetravToolElectricProPick.java | 34 ---- .../items/tools/DetravToolElectricProPickBase.java | 189 --------------------- .../items/tools/DetravToolElectricProspector.java | 34 ++++ .../tools/DetravToolElectricProspectorBase.java | 189 +++++++++++++++++++++ 6 files changed, 256 insertions(+), 260 deletions(-) delete mode 100644 src/main/java/com/detrav/items/tools/DetravProPick.java create mode 100644 src/main/java/com/detrav/items/tools/DetravProspector.java delete mode 100644 src/main/java/com/detrav/items/tools/DetravToolElectricProPick.java delete mode 100644 src/main/java/com/detrav/items/tools/DetravToolElectricProPickBase.java create mode 100644 src/main/java/com/detrav/items/tools/DetravToolElectricProspector.java create mode 100644 src/main/java/com/detrav/items/tools/DetravToolElectricProspectorBase.java (limited to 'src/main/java/com/detrav/items/tools') diff --git a/src/main/java/com/detrav/items/tools/DetravProPick.java b/src/main/java/com/detrav/items/tools/DetravProPick.java deleted file mode 100644 index 9d3b2de50c..0000000000 --- a/src/main/java/com/detrav/items/tools/DetravProPick.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.detrav.items.tools; - -import com.detrav.enums.Textures01; -import com.detrav.items.behaviours.BehaviourDetravToolProPick; - -import cpw.mods.fml.common.FMLLog; -import gregtech.api.interfaces.IIconContainer; -import gregtech.api.items.GT_MetaGenerated_Tool; -import net.minecraft.item.ItemStack; - -public class DetravProPick extends DetravToolElectricProPickBase { - - private int tier; - - public DetravProPick(int tier) { - this.tier=tier; - } - - public int getBaseQuality() { - return tier; - } - public float getMaxDurabilityMultiplier() { - /*if (tier == 0) - return 0.02F; - return ((float) Math.pow(tier,((float)tier/5F)))/24F;*/ - double x = tier+1; - return (float) (((float) 0.005D+Math.tanh(Math.pow(x,(x/8D))/25D)*(x/6D))*1.25); - } - - public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) { - return Textures01.mTextures[0]; - } - - public void onStatsAddedToTool(GT_MetaGenerated_Tool aItem, int aID) { - aItem.addItemBehavior(aID, new BehaviourDetravToolProPick(100)); - } -} diff --git a/src/main/java/com/detrav/items/tools/DetravProspector.java b/src/main/java/com/detrav/items/tools/DetravProspector.java new file mode 100644 index 0000000000..38fb9dcd10 --- /dev/null +++ b/src/main/java/com/detrav/items/tools/DetravProspector.java @@ -0,0 +1,33 @@ +package com.detrav.items.tools; + +import com.detrav.enums.Textures01; +import com.detrav.items.behaviours.BehaviourDetravToolProPick; + +import gregtech.api.interfaces.IIconContainer; +import gregtech.api.items.GT_MetaGenerated_Tool; +import net.minecraft.item.ItemStack; + +public class DetravProspector extends DetravToolElectricProspectorBase { + + private final int tier; + + public DetravProspector(int tier) { + this.tier=tier; + } + + public int getBaseQuality() { + return tier; + } + public float getMaxDurabilityMultiplier() { + double x = tier + 1; + return (float) (((float) 0.005D+Math.tanh(Math.pow(x,(x/8D))/25D)*(x/6D))*1.25); + } + + public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) { + return Textures01.mTextures[0]; + } + + public void onStatsAddedToTool(GT_MetaGenerated_Tool aItem, int aID) { + aItem.addItemBehavior(aID, new BehaviourDetravToolProPick(100)); + } +} diff --git a/src/main/java/com/detrav/items/tools/DetravToolElectricProPick.java b/src/main/java/com/detrav/items/tools/DetravToolElectricProPick.java deleted file mode 100644 index 6d1140038b..0000000000 --- a/src/main/java/com/detrav/items/tools/DetravToolElectricProPick.java +++ /dev/null @@ -1,34 +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 DetravToolElectricProPick extends DetravToolElectricProPickBase { - - private int tier; - - public DetravToolElectricProPick(int tier) { - this.tier=tier; - } - public int getBaseQuality() { - return tier-6; - } - public float getMaxDurabilityMultiplier() { - if (tier-6 == 0) - return (float) Math.pow(((float)((tier-6F)*2F)),0.0D); - else - return (float)((tier-6F)*2F); - } - - public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) { - - if (tier<=9 && tier >= 6) - return Textures01.mTextures[tier-5]; - else - return Textures01.mTextures[1]; - } -} diff --git a/src/main/java/com/detrav/items/tools/DetravToolElectricProPickBase.java b/src/main/java/com/detrav/items/tools/DetravToolElectricProPickBase.java deleted file mode 100644 index 12a28e343c..0000000000 --- a/src/main/java/com/detrav/items/tools/DetravToolElectricProPickBase.java +++ /dev/null @@ -1,189 +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. - * modified by bartimaeusnek on 05.06.2018 - */ -public class DetravToolElectricProPickBase 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/DetravToolElectricProspector.java b/src/main/java/com/detrav/items/tools/DetravToolElectricProspector.java new file mode 100644 index 0000000000..5e057fb738 --- /dev/null +++ b/src/main/java/com/detrav/items/tools/DetravToolElectricProspector.java @@ -0,0 +1,34 @@ +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 DetravToolElectricProspector extends DetravToolElectricProspectorBase { + + private int tier; + + public DetravToolElectricProspector(int tier) { + this.tier=tier; + } + public int getBaseQuality() { + return tier-6; + } + public float getMaxDurabilityMultiplier() { + if (tier-6 == 0) + return (float) Math.pow(((float)((tier-6F)*2F)),0.0D); + else + return (float)((tier-6F)*2F); + } + + public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) { + + if (tier<=9 && tier >= 6) + return Textures01.mTextures[tier-5]; + else + return Textures01.mTextures[1]; + } +} diff --git a/src/main/java/com/detrav/items/tools/DetravToolElectricProspectorBase.java b/src/main/java/com/detrav/items/tools/DetravToolElectricProspectorBase.java new file mode 100644 index 0000000000..89b363f328 --- /dev/null +++ b/src/main/java/com/detrav/items/tools/DetravToolElectricProspectorBase.java @@ -0,0 +1,189 @@ +package com.detrav.items.tools; + +import com.detrav.enums.Textures01; +import com.detrav.items.behaviours.BehaviourDetravToolElectricProspector; +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. + * modified by bartimaeusnek on 05.06.2018 + */ +public class DetravToolElectricProspectorBase 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 BehaviourDetravToolElectricProspector(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 -- cgit From ce502c9bb54946f2ea1725ec4c92de4a8863e2d7 Mon Sep 17 00:00:00 2001 From: Jason Mitchell Date: Sun, 24 Jan 2021 12:35:45 -0800 Subject: One more rename, and fix oredict names --- src/main/java/com/detrav/items/tools/DetravProspector.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/main/java/com/detrav/items/tools') diff --git a/src/main/java/com/detrav/items/tools/DetravProspector.java b/src/main/java/com/detrav/items/tools/DetravProspector.java index 38fb9dcd10..b06d083a87 100644 --- a/src/main/java/com/detrav/items/tools/DetravProspector.java +++ b/src/main/java/com/detrav/items/tools/DetravProspector.java @@ -1,7 +1,7 @@ package com.detrav.items.tools; import com.detrav.enums.Textures01; -import com.detrav.items.behaviours.BehaviourDetravToolProPick; +import com.detrav.items.behaviours.BehaviourDetravToolProspector; import gregtech.api.interfaces.IIconContainer; import gregtech.api.items.GT_MetaGenerated_Tool; @@ -28,6 +28,6 @@ public class DetravProspector extends DetravToolElectricProspectorBase { } public void onStatsAddedToTool(GT_MetaGenerated_Tool aItem, int aID) { - aItem.addItemBehavior(aID, new BehaviourDetravToolProPick(100)); + aItem.addItemBehavior(aID, new BehaviourDetravToolProspector(100)); } } -- cgit From be085ce9d3cc51633152325ba96c53eb034b2835 Mon Sep 17 00:00:00 2001 From: Jason Mitchell Date: Sun, 24 Jan 2021 13:41:14 -0800 Subject: Java cleanups --- src/main/java/com/detrav/items/tools/DetravToolElectricProspector.java | 2 +- .../java/com/detrav/items/tools/DetravToolElectricProspectorBase.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/main/java/com/detrav/items/tools') diff --git a/src/main/java/com/detrav/items/tools/DetravToolElectricProspector.java b/src/main/java/com/detrav/items/tools/DetravToolElectricProspector.java index 5e057fb738..d2bc52b61b 100644 --- a/src/main/java/com/detrav/items/tools/DetravToolElectricProspector.java +++ b/src/main/java/com/detrav/items/tools/DetravToolElectricProspector.java @@ -9,7 +9,7 @@ import net.minecraft.item.ItemStack; */ public class DetravToolElectricProspector extends DetravToolElectricProspectorBase { - private int tier; + private final int tier; public DetravToolElectricProspector(int tier) { this.tier=tier; diff --git a/src/main/java/com/detrav/items/tools/DetravToolElectricProspectorBase.java b/src/main/java/com/detrav/items/tools/DetravToolElectricProspectorBase.java index 89b363f328..d2d3cd108a 100644 --- a/src/main/java/com/detrav/items/tools/DetravToolElectricProspectorBase.java +++ b/src/main/java/com/detrav/items/tools/DetravToolElectricProspectorBase.java @@ -81,7 +81,7 @@ public class DetravToolElectricProspectorBase implements IToolStats { } public String getBreakingSound() { - return (String) GregTech_API.sSoundList.get(Integer.valueOf(0)); + return (String) GregTech_API.sSoundList.get(0); } @Override -- cgit