diff options
Diffstat (limited to 'src')
11 files changed, 426 insertions, 10 deletions
diff --git a/src/main/java/com/detrav/enums/DetravToolDictNames.java b/src/main/java/com/detrav/enums/DetravToolDictNames.java index f208714a58..13e0f2529a 100644 --- a/src/main/java/com/detrav/enums/DetravToolDictNames.java +++ b/src/main/java/com/detrav/enums/DetravToolDictNames.java @@ -6,5 +6,6 @@ package com.detrav.enums; public enum DetravToolDictNames { craftingToolProPick, craftingToolElectricProPick, - craftingToolPortableCharger + craftingToolPortableCharger, + craftingRepairTool } diff --git a/src/main/java/com/detrav/enums/Textures01.java b/src/main/java/com/detrav/enums/Textures01.java index fb9ba37bc4..5ba619c090 100644 --- a/src/main/java/com/detrav/enums/Textures01.java +++ b/src/main/java/com/detrav/enums/Textures01.java @@ -18,6 +18,7 @@ public class Textures01 { 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/PORTABE_CHARGER"), - new Textures.ItemIcons.CustomIcon("gt.detrav.metatool.01/PORTABE_CHARGER_BORDER") + new Textures.ItemIcons.CustomIcon("gt.detrav.metatool.01/PORTABE_CHARGER_BORDER"), + new Textures.ItemIcons.CustomIcon("gt.detrav.metatool.01/REPAIR_TOOL") }; -} +}
\ No newline at end of file diff --git a/src/main/java/com/detrav/gui/DetravPortableChargerGui.java b/src/main/java/com/detrav/gui/DetravPortableChargerGui.java index 858b6dc09e..2b174abc6a 100644 --- a/src/main/java/com/detrav/gui/DetravPortableChargerGui.java +++ b/src/main/java/com/detrav/gui/DetravPortableChargerGui.java @@ -18,7 +18,7 @@ import static gregtech.api.enums.GT_Values.RES_PATH_GUI; * Created by wital_000 on 07.04.2016. */ public class DetravPortableChargerGui extends GuiContainer { - public static final int GUI_ID = 30; + public static final int GUI_ID = 30; ResourceLocation location = null; private String mName = "Portable Charger"; diff --git a/src/main/java/com/detrav/gui/DetravRepairToolGui.java b/src/main/java/com/detrav/gui/DetravRepairToolGui.java new file mode 100644 index 0000000000..8e55982aca --- /dev/null +++ b/src/main/java/com/detrav/gui/DetravRepairToolGui.java @@ -0,0 +1,69 @@ +package com.detrav.gui; + +import com.detrav.gui.containers.DetravPortableChargerContainer; +import com.detrav.gui.containers.DetravRepairToolContainer; +import com.detrav.items.DetravMetaGeneratedTool01; +import gregtech.api.GregTech_API; +import gregtech.api.util.GT_Utility; +import net.minecraft.client.gui.inventory.GuiContainer; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; +import net.minecraft.world.World; +import org.lwjgl.opengl.GL11; + +import static gregtech.api.enums.GT_Values.RES_PATH_GUI; +import static gregtech.api.enums.GT_Values.V; + +/** + * Created by wital_000 on 08.04.2016. + */ +public class DetravRepairToolGui extends GuiContainer { + public static final int GUI_ID = 40; + + ResourceLocation location = null; + private String mName = "Repair tools"; + //public static long charge = 0; + //ItemStack mItem = null; + //DetravPortableChargerContainer container = null; + private ItemStack mItem; + + public DetravRepairToolGui(InventoryPlayer player, World aWorld, ItemStack aStack) { + super(new DetravRepairToolContainer(player, aWorld, aStack)); + //container = (DetravPortableChargerContainer) inventorySlots; + location = new ResourceLocation(RES_PATH_GUI + "1by1.png"); + mItem = aStack; + //if (mItem != null) { +// charge = DetravMetaGeneratedTool01.INSTANCE.getRealCharge(mItem); +// } + } + + @Override + protected void drawGuiContainerForegroundLayer(int par1, int par2) { + fontRendererObj.drawString(mName, 8, 4, 4210752); + fontRendererObj.drawString("Click with Tool to repair.", 8, 12, 4210752); + /*if (mItem != null) { + //GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + //EnumChatFormatting.AQUA + "" + + EnumChatFormatting.GRAY); + + Long[] tStats = DetravMetaGeneratedTool01.INSTANCE.getElectricStats(mItem); + if (tStats == null) return; + //long tCharge = DetravMetaGeneratedTool01.INSTANCE.getRealCharge(mItem); + long loss = DetravMetaGeneratedTool01.INSTANCE.getElectricStatsLoss(mItem); + fontRendererObj.drawString(GT_Utility.formatNumbers(charge) + " / " + GT_Utility.formatNumbers(Math.abs(tStats[0])) + " EU", 8, 14, 4210752); + fontRendererObj.drawString("Voltage/Loss: " + V[(int) (tStats[2] >= 0 ? tStats[2] < V.length ? tStats[2] : V.length - 1 : 1)] + " / " + loss, 8, 24, 4210752); + }*/ + } + + @Override + protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) { + mc.renderEngine.bindTexture(location); + if (GregTech_API.sColoredGUI && mItem != null && DetravMetaGeneratedTool01.getPrimaryMaterial(mItem) != null) { + short[] tColors = DetravMetaGeneratedTool01.getPrimaryMaterial(mItem).mColor.getRGBA(); + GL11.glColor4f(tColors[0] / 255F, tColors[1] / 255F, tColors[2] / 255F, 1F); + } else GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + int x = (width - xSize) / 2; + int y = (height - ySize) / 2; + drawTexturedModalRect(x, y, 0, 0, xSize, ySize); + } +}
\ No newline at end of file diff --git a/src/main/java/com/detrav/gui/containers/DetravRepairToolContainer.java b/src/main/java/com/detrav/gui/containers/DetravRepairToolContainer.java new file mode 100644 index 0000000000..95c48117de --- /dev/null +++ b/src/main/java/com/detrav/gui/containers/DetravRepairToolContainer.java @@ -0,0 +1,107 @@ +package com.detrav.gui.containers; + +import com.detrav.items.DetravMetaGeneratedTool01; +import forestry.core.gui.slots.SlotLocked; +import gregtech.api.items.GT_MetaBase_Item; +import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Maintenance; +import net.minecraft.entity.Entity; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.inventory.Container; +import net.minecraft.inventory.IInventory; +import net.minecraft.inventory.InventoryCrafting; +import net.minecraft.inventory.Slot; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; + +/** + * Created by wital_000 on 08.04.2016. + */ +public class DetravRepairToolContainer extends Container { + public IInventory slots = new InventoryCrafting(this, 1, 1); + public ItemStack mItem; + private World worldObj; + + public DetravRepairToolContainer(InventoryPlayer inventoryPlayer, World aWorld, ItemStack aStack) { + this.worldObj = aWorld; + this.addSlotToContainer(new Slot(slots, 0, 80, 35)); + mItem = aStack; + //new Slot() + bindPlayerInventory(inventoryPlayer); + + //DetravMetaGeneratedTool01.INSTANCE.getToolStats(mItem). + } + + protected void bindPlayerInventory(InventoryPlayer inventoryPlayer) { + for (int i = 0; i < 3; i++) { + for (int j = 0; j < 9; j++) { + addSlotToContainer(new Slot(inventoryPlayer, j + i * 9 + 9, + 8 + j * 18, 84 + i * 18)); + } + } + + + for (int i = 0; i < 9; i++) { + ItemStack stackInSlot = inventoryPlayer.getStackInSlot(i); + if (mItem!=null && stackInSlot!=null && mItem == stackInSlot) { + addSlotToContainer(new SlotLocked(inventoryPlayer, i, 8 + i * 18, 142)); + } else { + addSlotToContainer(new Slot(inventoryPlayer, i, 8 + i * 18, 142)); + } + } + } + + @Override + public boolean canInteractWith(EntityPlayer p_75145_1_) { + return true; + } + + public void onContainerClosed(EntityPlayer p_75134_1_) { + super.onContainerClosed(p_75134_1_); + if (!this.worldObj.isRemote) { + //for (int i = 0; i < 9; ++i) + //{ + ItemStack itemstack = this.slots.getStackInSlotOnClosing(0); + + if (itemstack != null) { + p_75134_1_.dropPlayerItemWithRandomChoice(itemstack, false); + } + //} + } + } + + @Override + public ItemStack transferStackInSlot(EntityPlayer par1EntityPlayer, int par2) { + return null; + } + + @Override + public ItemStack slotClick(int aSlotIndex, int aMouseclick, int aShifthold, EntityPlayer aPlayer) { + if (aSlotIndex != 0) return super.slotClick(aSlotIndex, aMouseclick, aShifthold, aPlayer); + if(DetravMetaGeneratedTool01.getToolDamage(mItem) >= DetravMetaGeneratedTool01.getToolMaxDamage(mItem)) + return null; + ItemStack tStack = aPlayer.inventory.getItemStack(); + if (tStack != null) { + if(tStack.getUnlocalizedName()!="gt.detrav.metatool.01.2") { + if (DetravMetaGeneratedTool01.getToolMaxDamage(tStack) > 0) { + long damage = DetravMetaGeneratedTool01.getToolDamage(tStack); + damage /= 10; + DetravMetaGeneratedTool01.setToolDamage(tStack, damage); + DetravMetaGeneratedTool01.INSTANCE.doDamage(mItem, 1000L); + } + //((GT_MetaTileEntity_Hatch_Maintenance) mTileEntity.getMetaTileEntity()).onToolClick(tStack, aPlayer); + //if (tStack.stackSize <= 0) aPlayer.inventory.setItemStack(null); + } + } + return null; + } + + + /*@Override + public ItemStack transferStackInSlot(EntityPlayer par1EntityPlayer, int par2) { + ItemStack result = super.transferStackInSlot(par1EntityPlayer,par2); + par1EntityPlayer.addChatMessage(new ChatComponentText(result.getDisplayName())); + + return result; + }*/ +} diff --git a/src/main/java/com/detrav/items/DetravMetaGeneratedTool01.java b/src/main/java/com/detrav/items/DetravMetaGeneratedTool01.java index c90ff46ac9..32c879a1cc 100644 --- a/src/main/java/com/detrav/items/DetravMetaGeneratedTool01.java +++ b/src/main/java/com/detrav/items/DetravMetaGeneratedTool01.java @@ -3,13 +3,10 @@ package com.detrav.items; import com.detrav.DetravScannerMod; import com.detrav.enums.DetravToolDictNames; import com.detrav.items.tools.*; -import gregtech.api.enums.GT_Values; import gregtech.api.enums.Materials; import gregtech.api.enums.TC_Aspects; import gregtech.api.interfaces.IToolStats; import gregtech.api.items.GT_MetaGenerated_Tool; -import gregtech.api.util.GT_LanguageManager; -import gregtech.api.util.GT_ModHandler; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -27,10 +24,12 @@ public class DetravMetaGeneratedTool01 extends GT_MetaGenerated_Tool { super("detrav.metatool.01"); INSTANCE = this; addTool(0, "Prospector's Pick", "", new DetravToolProPick(), new Object[]{DetravToolDictNames.craftingToolProPick, new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 4L)}); + addTool(2, "Repair tools","",new DetravRepairTool(),new Object[]{DetravToolDictNames.craftingRepairTool, new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 8L)}); addTool(100, "Electric Prospector's Scanner (LV)", "", 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 (MV)", "", 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 (HV)", "", 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(106, "Portable Charger","", new DetravToolPortableCharger(), new Object[]{DetravToolDictNames.craftingToolPortableCharger, new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.AURAM, 4L)}, new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 4L)); + setCreativeTab(DetravScannerMod.TAB_DETRAV); } @@ -58,6 +57,13 @@ public class DetravMetaGeneratedTool01 extends GT_MetaGenerated_Tool { aList.add(tOffset + 7, "Large: 60-99"); aList.add(tOffset + 8, "Very large: 100-***"); break; + case 2: + aList.add(tOffset + 0, EnumChatFormatting.GRAY + "Can repair some tools"); + aList.add(tOffset + 1, EnumChatFormatting.WHITE + "Durability: " + EnumChatFormatting.GREEN + (tMaxDamage - getToolDamage(aStack)) + " / " + tMaxDamage + EnumChatFormatting.GRAY); + aList.add(tOffset + 2, EnumChatFormatting.WHITE + "Efficiency 90%" + EnumChatFormatting.GRAY); + aList.add(tOffset + 3, EnumChatFormatting.WHITE + "Cost 1k per operation" + EnumChatFormatting.GRAY); + aList.add(tOffset + 4, "Right click to open GUI"); + break; case 100: case 101: case 102: @@ -90,16 +96,19 @@ public class DetravMetaGeneratedTool01 extends GT_MetaGenerated_Tool { } return 0L; } - public final ItemStack getToolWithStatsPlus(int aToolID, int aAmount, Materials aPrimaryMaterial, Materials aSecondaryMaterial, long[] aElectricArray,long aLoss) { + return getToolWithStatsPlus(aToolID,aAmount,aPrimaryMaterial,aSecondaryMaterial,aElectricArray,aLoss,10000L); + } + + public final ItemStack getToolWithStatsPlus(int aToolID, int aAmount, Materials aPrimaryMaterial, Materials aSecondaryMaterial, long[] aElectricArray,long aLoss,long durability) { ItemStack result = getToolWithStats(aToolID,aAmount,aPrimaryMaterial,aSecondaryMaterial,aElectricArray); NBTTagCompound aNBT = result.getTagCompound(); if (aNBT != null) { aNBT = aNBT.getCompoundTag("GT.ToolStats"); if (aNBT != null && aNBT.getBoolean("Electric")) { aNBT.setLong("Loss", aLoss); - aNBT.setLong("MaxDamage", 10000L); } + aNBT.setLong("MaxDamage", durability); } return result; } diff --git a/src/main/java/com/detrav/items/behaviours/BehaviourDetravRepairTool.java b/src/main/java/com/detrav/items/behaviours/BehaviourDetravRepairTool.java new file mode 100644 index 0000000000..ab23490fa3 --- /dev/null +++ b/src/main/java/com/detrav/items/behaviours/BehaviourDetravRepairTool.java @@ -0,0 +1,31 @@ +package com.detrav.items.behaviours; + +import com.detrav.DetravScannerMod; +import com.detrav.items.DetravMetaGeneratedTool01; +import gregtech.api.enums.SubTag; +import gregtech.api.interfaces.IItemBehaviour; +import gregtech.api.items.GT_MetaBase_Item; +import gregtech.common.items.behaviors.Behaviour_None; +import net.minecraft.dispenser.IBlockSource; +import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.projectile.EntityArrow; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; + +import java.util.List; + +/** + * Created by wital_000 on 08.04.2016. + */ +public class BehaviourDetravRepairTool extends Behaviour_None { + public ItemStack onItemRightClick(GT_MetaBase_Item aItem, ItemStack aStack, World aWorld, EntityPlayer aPlayer) { + if(DetravMetaGeneratedTool01.getToolDamage(aStack)< DetravMetaGeneratedTool01.INSTANCE.getToolMaxDamage(aStack)-1) { + DetravScannerMod.proxy.openRepairToolGui(aPlayer); + } else DetravMetaGeneratedTool01.INSTANCE.doDamage(aStack,1000); + + return super.onItemRightClick(aItem, aStack, aWorld, aPlayer); + //aPlayer.openContainer + } +} diff --git a/src/main/java/com/detrav/items/tools/DetravRepairTool.java b/src/main/java/com/detrav/items/tools/DetravRepairTool.java new file mode 100644 index 0000000000..65868ce963 --- /dev/null +++ b/src/main/java/com/detrav/items/tools/DetravRepairTool.java @@ -0,0 +1,180 @@ +package com.detrav.items.tools; + +import com.detrav.enums.Textures01; +import com.detrav.items.behaviours.BehaviourDetravRepairTool; +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.minecraftforge.event.world.BlockEvent; + +import java.util.List; + +/** + * Created by wital_000 on 08.04.2016. + */ +public class DetravRepairTool implements IToolStats { + public int getToolDamagePerBlockBreak() { + return 100; + } + + public int getToolDamagePerDropConversion() { + return 100; + } + + public int getToolDamagePerContainerCraft() { + return 100; + } + + public int getToolDamagePerEntityAttack() { + return 100; + } + + 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 0.5F; + } + + public float getMaxDurabilityMultiplier() { + return 0.5F; + } + + @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<ItemStack> 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[6]; + } + + 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 BehaviourDetravRepairTool()); + } + + 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 ProPicked by " + EnumChatFormatting.GREEN + aPlayer.getCommandSenderName() + EnumChatFormatting.WHITE); + } +} diff --git a/src/main/java/com/detrav/proxies/CommonProxy.java b/src/main/java/com/detrav/proxies/CommonProxy.java index c9fb3ca5ab..a21f41d37c 100644 --- a/src/main/java/com/detrav/proxies/CommonProxy.java +++ b/src/main/java/com/detrav/proxies/CommonProxy.java @@ -3,9 +3,13 @@ package com.detrav.proxies; import com.detrav.DetravScannerMod; import com.detrav.enums.DetravSimpleItems; import com.detrav.gui.DetravGuiProPick; +import com.detrav.gui.DetravRepairToolGui; import com.detrav.gui.containers.DetravPortableChargerContainer; import com.detrav.gui.DetravPortableChargerGui; +import com.detrav.gui.containers.DetravRepairToolContainer; +import com.detrav.items.DetravMetaGeneratedTool01; import cpw.mods.fml.common.network.IGuiHandler; +import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; import gregtech.api.enums.SubTag; @@ -35,6 +39,11 @@ public class CommonProxy implements IGuiHandler { } } } + ; + GT_ModHandler.addCraftingRecipe( + DetravMetaGeneratedTool01.INSTANCE.getToolWithStatsPlus(2,1,Materials._NULL,Materials._NULL,null,0), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, + new Object[]{"dwx", "hMc", "fsr", Character.valueOf('M'), ItemList.Hatch_Maintenance}); } @Override @@ -44,6 +53,8 @@ public class CommonProxy implements IGuiHandler { return null; case DetravPortableChargerGui.GUI_ID: return new DetravPortableChargerContainer(player.inventory,world,player.getCurrentEquippedItem()); + case DetravRepairToolGui.GUI_ID: + return new DetravRepairToolContainer(player.inventory,world,player.getCurrentEquippedItem()); default: return null; } @@ -56,6 +67,8 @@ public class CommonProxy implements IGuiHandler { return new DetravGuiProPick(); case DetravPortableChargerGui.GUI_ID: return new DetravPortableChargerGui(player.inventory,world,player.getCurrentEquippedItem()); + case DetravRepairToolGui.GUI_ID: + return new DetravRepairToolGui(player.inventory,world,player.getCurrentEquippedItem()); default: return null; } @@ -64,11 +77,16 @@ public class CommonProxy implements IGuiHandler { public void openProPickGui() { - + //just Client code } public void openPortableChargerGui(EntityPlayer player) { player.openGui(DetravScannerMod.instance, DetravPortableChargerGui.GUI_ID,player.worldObj,(int)player.posX,(int)player.posY,(int)player.posZ); } + + public void openRepairToolGui(EntityPlayer player) + { + player.openGui(DetravScannerMod.instance, DetravRepairToolGui.GUI_ID,player.worldObj,(int)player.posX,(int)player.posY,(int)player.posZ); + } } diff --git a/src/main/resources/assets/gregtech/textures/items/gt.detrav.metatool.01/REPAIR_TOOL.png b/src/main/resources/assets/gregtech/textures/items/gt.detrav.metatool.01/REPAIR_TOOL.png Binary files differnew file mode 100644 index 0000000000..80aafc8640 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.detrav.metatool.01/REPAIR_TOOL.png diff --git a/src/main/resources/assets/gregtech/textures/items/gt.detrav.metatool.01/REPAIR_TOOL_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/gt.detrav.metatool.01/REPAIR_TOOL_OVERLAY.png Binary files differnew file mode 100644 index 0000000000..e3a55b747d --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.detrav.metatool.01/REPAIR_TOOL_OVERLAY.png |
