From 2def9acccdf30a88947943673fcd695f1e59cb77 Mon Sep 17 00:00:00 2001 From: Draknyte1 Date: Thu, 15 Sep 2016 14:12:33 +1000 Subject: $ Fixed the Skookum Choocher. $ Now it Renders properly and functions as a GT-esque type tool. - Removed static calls to excluded build classes. % Started changing things to final in all cases. (Apparently better Java practice) --- .../gregtech/common/tools/TOOL_Gregtech_Base.java | 5 ++-- .../common/tools/TOOL_Gregtech_Choocher.java | 30 +++++++++++++++------- 2 files changed, 23 insertions(+), 12 deletions(-) (limited to 'src/Java/gtPlusPlus/xmod/gregtech/common/tools') diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_Base.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_Base.java index 11e8a6b240..d46e777f47 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_Base.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_Base.java @@ -2,7 +2,7 @@ package gtPlusPlus.xmod.gregtech.common.tools; import gregtech.api.GregTech_API; import gregtech.api.damagesources.GT_DamageSources; -import gtPlusPlus.xmod.gregtech.api.interfaces.internal.Interface_ToolStats; +import gregtech.api.interfaces.IToolStats; import gtPlusPlus.xmod.gregtech.api.items.Gregtech_MetaTool; import java.util.List; @@ -20,7 +20,7 @@ import net.minecraft.util.IChatComponent; import net.minecraftforge.event.world.BlockEvent; public abstract class TOOL_Gregtech_Base -implements Interface_ToolStats { +implements IToolStats { public static final Enchantment[] FORTUNE_ENCHANTMENT = {Enchantment.fortune}; public static final Enchantment[] LOOTING_ENCHANTMENT = {Enchantment.looting}; public static final Enchantment[] ZERO_ENCHANTMENTS = new Enchantment[0]; @@ -152,7 +152,6 @@ implements Interface_ToolStats { aPlayer.triggerAchievement(AchievementList.buildWorkBench); } - @Override public void onStatsAddedToTool(Gregtech_MetaTool aItem, int aID) { } diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_Choocher.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_Choocher.java index 42d8750f24..ce652bdda8 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_Choocher.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_Choocher.java @@ -2,14 +2,14 @@ package gtPlusPlus.xmod.gregtech.common.tools; import gregtech.GT_Mod; import gregtech.api.GregTech_API; -import gregtech.api.enums.OrePrefixes; import gregtech.api.interfaces.IIconContainer; +import gregtech.api.items.GT_MetaGenerated_Tool; import gregtech.api.util.GT_Recipe; import gregtech.api.util.GT_Utility; -import gtPlusPlus.xmod.gregtech.api.enums.CustomGtTextures; +import gregtech.common.items.behaviors.Behaviour_Prospecting; +import gregtech.common.items.behaviors.Behaviour_Wrench; import gtPlusPlus.xmod.gregtech.api.items.Gregtech_MetaTool; -import gtPlusPlus.xmod.gregtech.api.items.types.ToolType_HardHammer; -import gtPlusPlus.xmod.gregtech.api.items.types.ToolType_Wrench; +import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtTools; import java.util.Arrays; import java.util.List; @@ -157,8 +157,10 @@ public class TOOL_Gregtech_Choocher return null; } - public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) { - return aIsToolHead ? CustomGtTextures.ItemIcons.SKOOKUMCHOOCHER : Gregtech_MetaTool.getSecondaryMaterial(aStack).mIconSet.mTextures[OrePrefixes.stick.mTextureIndex]; + @Override + public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) { + //Utils.LOG_INFO("Texture: "+TexturesGtTools.SKOOKUM_CHOOCHER.getTextureFile()); + return TexturesGtTools.SKOOKUM_CHOOCHER; } /* @Override @@ -176,13 +178,13 @@ public class TOOL_Gregtech_Choocher @Override public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) { - return aIsToolHead ? Gregtech_MetaTool.getPrimaryMaterial(aStack).mRGBa : null; + return GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa; } @Override public void onStatsAddedToTool(Gregtech_MetaTool aItem, int aID) { - aItem.addItemBehavior(aID, new ToolType_Wrench(150)); - aItem.addItemBehavior(aID, new ToolType_HardHammer(1, 1250)); + aItem.addItemBehavior(aID, new Behaviour_Wrench(150)); + aItem.addItemBehavior(aID, new Behaviour_Prospecting(1, 1250)); } @Override @@ -200,4 +202,14 @@ public class TOOL_Gregtech_Choocher public IChatComponent getDeathMessage(EntityLivingBase aPlayer, EntityLivingBase aEntity) { return new ChatComponentText(EnumChatFormatting.RED + aEntity.getCommandSenderName() + EnumChatFormatting.WHITE + " has been Choochered by " + EnumChatFormatting.GREEN + aPlayer.getCommandSenderName() + EnumChatFormatting.WHITE); } + + @Override + public void onStatsAddedToTool(GT_MetaGenerated_Tool aItem, int aID) { + + } + + @Override + public boolean isGrafter() { + return false; + } } -- cgit From a3aa117da7b7daedff109f826ec1e95cafaaad03 Mon Sep 17 00:00:00 2001 From: Draknyte1 Date: Thu, 15 Sep 2016 15:50:54 +1000 Subject: $ Fixed the Skookum Choocher, not it: > Behaves like a wrench unless you hold shift > While shift is held, it prospects like a Hard Hammer. > It functions as a wrench when mining machines and a Hard Hammer when mining anything else. > There are over 100 types available from GT's materials. + Added in the FluidItemBlock.class --- .../common/tools/TOOL_Gregtech_Choocher.java | 30 +++++----------------- 1 file changed, 7 insertions(+), 23 deletions(-) (limited to 'src/Java/gtPlusPlus/xmod/gregtech/common/tools') diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_Choocher.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_Choocher.java index ce652bdda8..d2338c264e 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_Choocher.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_Choocher.java @@ -6,10 +6,8 @@ import gregtech.api.interfaces.IIconContainer; import gregtech.api.items.GT_MetaGenerated_Tool; import gregtech.api.util.GT_Recipe; import gregtech.api.util.GT_Utility; -import gregtech.common.items.behaviors.Behaviour_Prospecting; -import gregtech.common.items.behaviors.Behaviour_Wrench; -import gtPlusPlus.xmod.gregtech.api.items.Gregtech_MetaTool; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtTools; +import gtPlusPlus.xmod.gregtech.common.items.behaviours.Behaviour_Choocher; import java.util.Arrays; import java.util.List; @@ -83,12 +81,12 @@ public class TOOL_Gregtech_Choocher @Override public String getCraftingSound() { - return null; + return (String) GregTech_API.sSoundList.get(Integer.valueOf(1)); } @Override public String getEntityHitSound() { - return null; + return (String) GregTech_API.sSoundList.get(Integer.valueOf(2)); } @Override @@ -163,29 +161,15 @@ public class TOOL_Gregtech_Choocher return TexturesGtTools.SKOOKUM_CHOOCHER; } - /* @Override - public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) { - return aIsToolHead ? Textures.ItemIcons.WIRE_CUTTER : Textures.ItemIcons.VOID; - }*/ - - -/* @Override - public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) { - return aIsToolHead ? Textures.class..ItemIcons.SKOOKUMCHOOCHER : null; - } -*/ - // - @Override public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) { return GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa; } - @Override + /*@Override public void onStatsAddedToTool(Gregtech_MetaTool aItem, int aID) { - aItem.addItemBehavior(aID, new Behaviour_Wrench(150)); - aItem.addItemBehavior(aID, new Behaviour_Prospecting(1, 1250)); - } + aItem.addItemBehavior(aID, new Behaviour_Choocher()); + }*/ @Override public void onToolCrafted(ItemStack aStack, EntityPlayer aPlayer) { @@ -205,7 +189,7 @@ public class TOOL_Gregtech_Choocher @Override public void onStatsAddedToTool(GT_MetaGenerated_Tool aItem, int aID) { - + aItem.addItemBehavior(aID, new Behaviour_Choocher()); } @Override -- cgit From 96b958e8f7435e071310a7b7607e9eb6552145ef Mon Sep 17 00:00:00 2001 From: Draknyte1 Date: Sat, 17 Sep 2016 17:39:59 +1000 Subject: % Had to remove some overrides as the methods I use probably are renamed in GT 5.9 (ToDo) - Removed two unused classes. --- .../gregtech/common/tools/TOOL_Gregtech_Base.java | 11 ++++- .../tools/TOOL_Gregtech_BaseMultiblockItem.java | 49 ---------------------- .../TOOL_Gregtech_MaxEfficiencyMultiBlockItem.java | 27 ------------ 3 files changed, 10 insertions(+), 77 deletions(-) delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_BaseMultiblockItem.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_MaxEfficiencyMultiBlockItem.java (limited to 'src/Java/gtPlusPlus/xmod/gregtech/common/tools') diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_Base.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_Base.java index d46e777f47..5a2e1dd522 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_Base.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_Base.java @@ -115,8 +115,17 @@ implements IToolStats { public boolean isMiningTool() { return true; } - + + public boolean isChainsaw(){ + return false; + } + @Override + public boolean isGrafter(){ + return false; + } + + 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); } diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_BaseMultiblockItem.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_BaseMultiblockItem.java deleted file mode 100644 index d4f566dcd4..0000000000 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_BaseMultiblockItem.java +++ /dev/null @@ -1,49 +0,0 @@ -package gtPlusPlus.xmod.gregtech.common.tools; - -import gregtech.api.interfaces.IIconContainer; -import gtPlusPlus.xmod.gregtech.api.items.Gregtech_MetaTool; -import net.minecraft.block.Block; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.item.ItemStack; -import net.minecraft.util.ChatComponentText; -import net.minecraft.util.EnumChatFormatting; -import net.minecraft.util.IChatComponent; - -public abstract class TOOL_Gregtech_BaseMultiblockItem extends TOOL_Gregtech_Base { - @Override - public abstract float getBaseDamage(); - - @Override - public boolean isMinableBlock(Block aBlock, byte aMetaData) { - return false; - } - - @Override - public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) { - return aIsToolHead ? getTurbineIcon() : null; - } - - @Override - public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) { - return aIsToolHead ? Gregtech_MetaTool.getPrimaryMaterial(aStack).mRGBa : null; - } - - @Override - public IChatComponent getDeathMessage(EntityLivingBase aPlayer, EntityLivingBase aEntity) { - return new ChatComponentText(EnumChatFormatting.GREEN + aPlayer.getCommandSenderName() + EnumChatFormatting.WHITE + " put " + EnumChatFormatting.RED + - aEntity.getCommandSenderName() + "s" + EnumChatFormatting.WHITE + " head into a turbine"); - } - - public abstract IIconContainer getTurbineIcon(); - - @Override - public abstract float getSpeedMultiplier(); - - @Override - public abstract float getMaxDurabilityMultiplier(); - - @Override - public ItemStack getBrokenItem(ItemStack aStack) { - return null; - } -} diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_MaxEfficiencyMultiBlockItem.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_MaxEfficiencyMultiBlockItem.java deleted file mode 100644 index a9a43a9444..0000000000 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_MaxEfficiencyMultiBlockItem.java +++ /dev/null @@ -1,27 +0,0 @@ -package gtPlusPlus.xmod.gregtech.common.tools; - -import gregtech.api.enums.Textures; -import gregtech.api.interfaces.IIconContainer; - -public class TOOL_Gregtech_MaxEfficiencyMultiBlockItem extends TOOL_Gregtech_BaseMultiblockItem { - @Override - public float getSpeedMultiplier() { - return 4.0F; - } - - @Override - public float getMaxDurabilityMultiplier() { - return 4.0F; - } - - @Override - public float getBaseDamage() { - return 3.0F; - } - - @Override - public IIconContainer getTurbineIcon() { - return Textures.ItemIcons.TURBINE_HUGE; - } - -} -- cgit