diff options
Diffstat (limited to 'src/main/java')
9 files changed, 209 insertions, 75 deletions
diff --git a/src/main/java/com/detrav/Detrav_AfterGTPreload_Loader.java b/src/main/java/com/detrav/Detrav_AfterGTPreload_Loader.java index 9f119260ea..e83c808926 100644 --- a/src/main/java/com/detrav/Detrav_AfterGTPreload_Loader.java +++ b/src/main/java/com/detrav/Detrav_AfterGTPreload_Loader.java @@ -11,6 +11,9 @@ import com.detrav.tileentities.Detrav_MetaTileEntity_Boiler_Solar_Low; import com.detrav.tileentities.Detrav_MetaTileEntity_Boiler_Solar_Medium; import com.detrav.utils.DetravRepairRecipe; import cpw.mods.fml.common.registry.GameRegistry; +import gregtech.api.enums.Materials; +import gregtech.api.enums.OrePrefixes; +import gregtech.api.util.GT_ModHandler; /** * Created by wital_000 on 18.03.2016. @@ -30,6 +33,10 @@ public class Detrav_AfterGTPreload_Loader implements Runnable { //new Detrav_MetaGenerated_Tool_01(); //new ProcessingDetravToolProPick(); + + GT_ModHandler.addCraftingRecipe(DetravMetaGeneratedTool01.INSTANCE.getToolWithStats(2, 1, Materials.Iron, Materials._NULL,null) + , GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"IBI", " I ", "III", Character.valueOf('I'), OrePrefixes.ingot.get(Materials.Iron), Character.valueOf('B'), OrePrefixes.block.get(Materials.Iron)}); + //ItemList.Machine_Bronze_Boiler_Solar.set(new GT_MetaTileEntity_Boiler_Solar(105, "boiler.solar", "Simple Solar Boiler").getStackForm(1L)); DetravItemList.Solar_Boiler_Low.set(new Detrav_MetaTileEntity_Boiler_Solar_Low(2051,"boiler.bronze.solar", "Bronze Solar Boiler").getStackForm(1L)); DetravItemList.Solar_Boiler_Medium.set(new Detrav_MetaTileEntity_Boiler_Solar_Medium(2052,"boiler.steel.solar", "Steel Solar Boiler").getStackForm(1L)); diff --git a/src/main/java/com/detrav/blocks/DetravBlockAnvil.java b/src/main/java/com/detrav/blocks/DetravBlockAnvil.java deleted file mode 100644 index 2704ac635c..0000000000 --- a/src/main/java/com/detrav/blocks/DetravBlockAnvil.java +++ /dev/null @@ -1,55 +0,0 @@ -package com.detrav.blocks; - -/** - * Created by Detrav on 30.10.2016. - */ -import com.detrav.DetravScannerMod; -import com.detrav.utils.DetravCreativeTab; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import java.util.List; - -import net.minecraft.block.Block; -import net.minecraft.block.BlockAnvil; -import net.minecraft.block.BlockFalling; -import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.item.EntityFallingBlock; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.ChatComponentText; -import net.minecraft.util.IIcon; -import net.minecraft.util.MathHelper; -import net.minecraft.world.IBlockAccess; -import net.minecraft.world.World; - -public class DetravBlockAnvil extends BlockAnvil -{ - - public DetravBlockAnvil() - { - super(); - setBlockName("detrav_anvil"); - this.setCreativeTab(DetravScannerMod.TAB_DETRAV); - } - - @Override - public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int p_149727_6_, float p_149727_7_, float p_149727_8_, float p_149727_9_) - { - if (world.isRemote) - { - player.addChatMessage(new ChatComponentText("is remote")); - return true; - } - else - { - //p_149727_5_.displayGUIAnvil(p_149727_2_, p_149727_3_, p_149727_4_); - player.addChatMessage(new ChatComponentText("not remote")); - return true; - } - } - -}
\ No newline at end of file diff --git a/src/main/java/com/detrav/enums/DetravBlockList.java b/src/main/java/com/detrav/enums/DetravBlockList.java deleted file mode 100644 index 4c33d527cf..0000000000 --- a/src/main/java/com/detrav/enums/DetravBlockList.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.detrav.enums; - -import com.detrav.blocks.DetravBlockAnvil; -import cpw.mods.fml.common.registry.GameRegistry; -import net.minecraft.block.Block; - -/** - * Created by Detrav on 30.10.2016. - */ -public class DetravBlockList { - public static Block Anvil; - public static void createBlocks() { - GameRegistry.registerBlock(Anvil = new DetravBlockAnvil(),"detrav_anvil"); - } -} diff --git a/src/main/java/com/detrav/enums/DetravToolDictNames.java b/src/main/java/com/detrav/enums/DetravToolDictNames.java index f208714a58..d28041578d 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, + craftingToolPortableAnvil; } diff --git a/src/main/java/com/detrav/enums/Textures01.java b/src/main/java/com/detrav/enums/Textures01.java index 4cfb866ba1..6f230d8799 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/ANVIL_TOOL") }; }
\ No newline at end of file diff --git a/src/main/java/com/detrav/items/DetravMetaGeneratedTool01.java b/src/main/java/com/detrav/items/DetravMetaGeneratedTool01.java index fb41a24a93..f42289f205 100644 --- a/src/main/java/com/detrav/items/DetravMetaGeneratedTool01.java +++ b/src/main/java/com/detrav/items/DetravMetaGeneratedTool01.java @@ -14,6 +14,7 @@ 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 java.util.List; @@ -27,6 +28,7 @@ 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, "Portable Anvil", "", new DetravToolPortableAnvil(), new Object[] {DetravToolDictNames.craftingToolPortableAnvil}, new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM,10)); 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)); diff --git a/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolPortableAnvil.java b/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolPortableAnvil.java new file mode 100644 index 0000000000..d6fbc6b326 --- /dev/null +++ b/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolPortableAnvil.java @@ -0,0 +1,9 @@ +package com.detrav.items.behaviours; + +import gregtech.common.items.behaviors.Behaviour_None; + +/** + * Created by Detrav on 30.10.2016. + */ +public class BehaviourDetravToolPortableAnvil extends Behaviour_None { +} diff --git a/src/main/java/com/detrav/items/tools/DetravToolPortableAnvil.java b/src/main/java/com/detrav/items/tools/DetravToolPortableAnvil.java new file mode 100644 index 0000000000..f7073ed2f8 --- /dev/null +++ b/src/main/java/com/detrav/items/tools/DetravToolPortableAnvil.java @@ -0,0 +1,186 @@ +package com.detrav.items.tools; + +import com.detrav.enums.DetravSimpleItems; +import com.detrav.enums.Textures01; +import com.detrav.items.behaviours.BehaviourDetravToolPortableAnvil; +import com.detrav.items.behaviours.BehaviourDetravToolProPick; +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.block.material.Material; +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 Detrav on 30.10.2016. + */ +public class DetravToolPortableAnvil implements IToolStats { + public int getToolDamagePerBlockBreak() { + return 0; + } + + public int getToolDamagePerDropConversion() { + return 0; + } + + public int getToolDamagePerContainerCraft() { + return 0; + } + + public int getToolDamagePerEntityAttack() { + return 0; + } + + public int getBaseQuality() { + return 0; + } + + public float getBaseDamage() { + return 3.0F; + } + + @Override + public int getHurtResistanceTime(int i, Entity entity) { + return i; + } + + public float getSpeedMultiplier() { + return 0F; + } + + public float getMaxDurabilityMultiplier() { + return 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<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 aIsToolHead ? + Textures01.mTextures[6] : null; + } + + public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) { + return GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa; + } + + public void onStatsAddedToTool(GT_MetaGenerated_Tool aItem, int aID) { + aItem.addItemBehavior(aID, new BehaviourDetravToolPortableAnvil()); + } + + 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 Anviled 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 4795fb3de1..74eed0a3cf 100644 --- a/src/main/java/com/detrav/proxies/CommonProxy.java +++ b/src/main/java/com/detrav/proxies/CommonProxy.java @@ -1,10 +1,8 @@ package com.detrav.proxies; import com.detrav.DetravScannerMod; -import com.detrav.enums.DetravBlockList; import com.detrav.enums.DetravItemList; import com.detrav.enums.DetravSimpleItems; -import com.detrav.events.DetravCraftingEventHandler; import com.detrav.events.DetravEntityDropEvent; import com.detrav.gui.DetravGuiProPick; import com.detrav.gui.containers.DetravPortableChargerContainer; @@ -97,7 +95,7 @@ public class CommonProxy implements IGuiHandler { public void onPreInit() { - DetravBlockList.createBlocks(); + } public void sendPlayerExeption(String s) { |