diff options
| author | Martin Robertz <dream-master@gmx.net> | 2017-07-23 21:30:48 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-23 21:30:48 +0200 |
| commit | 8d04f403d2b51cbb6557f7bf420737fa2e6e503d (patch) | |
| tree | 0c904489c8de621df8980ec6715e19ae6517080e /src/main/java/com | |
| parent | 6b5540c9a943eab1803857c3c83912cebac5fa37 (diff) | |
| parent | 8dc796e16ca4fbf3d5acf94c7446902a086c6569 (diff) | |
| download | GT5-Unofficial-8d04f403d2b51cbb6557f7bf420737fa2e6e503d.tar.gz GT5-Unofficial-8d04f403d2b51cbb6557f7bf420737fa2e6e503d.tar.bz2 GT5-Unofficial-8d04f403d2b51cbb6557f7bf420737fa2e6e503d.zip | |
Merge pull request #3 from Ethryan/master
GT Scanner
Diffstat (limited to 'src/main/java/com')
51 files changed, 19 insertions, 6082 deletions
diff --git a/src/main/java/com/detrav/DetravScannerMod.java b/src/main/java/com/detrav/DetravScannerMod.java index 6b8736034c..73b1d88581 100644 --- a/src/main/java/com/detrav/DetravScannerMod.java +++ b/src/main/java/com/detrav/DetravScannerMod.java @@ -1,7 +1,5 @@ package com.detrav; -import com.detrav.commands.DetravBiomeScannerCommand; -import com.detrav.commands.DetravLevelUpCommand; import com.detrav.events.DetravLoginEventHandler; import com.detrav.proxies.CommonProxy; import com.detrav.utils.DetravCreativeTab; @@ -22,7 +20,7 @@ import net.minecraftforge.common.config.Configuration; public class DetravScannerMod { public static final String MODID = "detravscannermod"; - public static final String VERSION = "0.5"; + public static final String VERSION = "0.6"; public static final CreativeTabs TAB_DETRAV = new DetravCreativeTab(); @@ -70,11 +68,4 @@ public class DetravScannerMod proxy.onPostLoad(); } - @EventHandler - public void serverLoad(FMLServerStartingEvent event) - { - //event.registerServerCommand(new DetravScannerCommand()); - event.registerServerCommand(new DetravBiomeScannerCommand()); - //event.registerServerCommand(new DetravLevelUpCommand()); - } } diff --git a/src/main/java/com/detrav/Detrav_AfterGTPreload_Loader.java b/src/main/java/com/detrav/Detrav_AfterGTPreload_Loader.java index 76b25b6672..2af2d2a8e5 100644 --- a/src/main/java/com/detrav/Detrav_AfterGTPreload_Loader.java +++ b/src/main/java/com/detrav/Detrav_AfterGTPreload_Loader.java @@ -1,14 +1,7 @@ package com.detrav; -import com.detrav.enums.DetravItemList; -import com.detrav.items.DetravMetaGeneratedItem01; import com.detrav.items.DetravMetaGeneratedTool01; import com.detrav.items.processing.*; -import com.detrav.tileentities.Detrav_MetaTileEntity_AdvMiner2; -import com.detrav.tileentities.Detrav_MetaTileEntity_Boiler_Solar_High; -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; @@ -22,30 +15,10 @@ public class Detrav_AfterGTPreload_Loader implements Runnable { public void run() { //items - new DetravMetaGeneratedItem01(); new DetravMetaGeneratedTool01(); //recipes and etc new ProcessingDetravToolProPick(); - new ProcessingDetravShaping(); - new ProcessingDetravPortableCharger(); - new ProcessingDetravSmartPlunger(); - //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)); - DetravItemList.Solar_Boiler_High.set(new Detrav_MetaTileEntity_Boiler_Solar_High(2053,"boiler.stainless.steel.solar", "Stainless Steel Solar Boiler").getStackForm(1L)); - DetravItemList.DetravAdvancedMiner2.set(new Detrav_MetaTileEntity_AdvMiner2(2054, "multimachine.advminer2.detrav", "Ore Drilling Plant V").getStackForm(1)); - - //DetravItemList.Anvil.set() - - // GameRegistry.addRecipe(new DetravRepairRecipe()); } } diff --git a/src/main/java/com/detrav/commands/DetravBiomeScannerCommand.java b/src/main/java/com/detrav/commands/DetravBiomeScannerCommand.java deleted file mode 100644 index 9ac6deef47..0000000000 --- a/src/main/java/com/detrav/commands/DetravBiomeScannerCommand.java +++ /dev/null @@ -1,119 +0,0 @@ -package com.detrav.commands; - -import net.minecraft.command.ICommand; -import net.minecraft.command.ICommandSender; -import net.minecraft.util.ChatComponentText; -import net.minecraft.util.ChunkCoordinates; -import net.minecraft.world.World; -import net.minecraft.world.biome.BiomeGenBase; -import scala.Int; - -import javax.imageio.ImageIO; -import java.awt.image.BufferedImage; -import java.awt.image.WritableRaster; -import java.io.File; -import java.io.FileWriter; -import java.io.PrintWriter; -import java.util.ArrayList; -import java.util.Dictionary; -import java.util.HashMap; -import java.util.List; - -/** - * Created by wital_000 on 25.03.2016. - */ -public class DetravBiomeScannerCommand implements ICommand { - private List aliases; - - public DetravBiomeScannerCommand() - { - this.aliases = new ArrayList<String>(); - this.aliases.add("DetravBiomeScanner"); - this.aliases.add("dbscan"); - } - - @Override - public String getCommandName() { - return "DetravBiomeScanner"; - } - - @Override - public String getCommandUsage(ICommandSender sender) { - return "DetravBiomeScanner radius [name]"; - } - - @Override - public List getCommandAliases() { - return this.aliases; - } - - @Override - public void processCommand(ICommandSender sender, String[] args) { - try { - if(args.length>0) { - int aXaZ = Integer.parseInt(args[0]); - String name = null; - if(args.length>1) - name = args[1].toLowerCase(); - else - name = ""; - int step = aXaZ * 2 / 512; - if (step < 1) step = 1; - World w = sender.getEntityWorld(); - ChunkCoordinates cor = sender.getPlayerCoordinates(); - BufferedImage image = new BufferedImage(512, 512, BufferedImage.TYPE_INT_ARGB); - WritableRaster r = image.getRaster(); - HashMap<String, Integer> colors = new HashMap<String, Integer>(); - for (int i = cor.posX - aXaZ, ii = 0; ii < 512; i += step, ii++) - for (int j = cor.posZ - aXaZ, jj = 0; jj < 512; j += step, jj++) { - BiomeGenBase biome = w.getBiomeGenForCoords(i, j); - if(name.length()==0 || biome.biomeName.toLowerCase().contains(name)) { - r.setSample(ii, jj, 0, (biome.color >> 16) & 0xFF ); - r.setSample(ii, jj, 1, (biome.color >> 8) & 0xFF); - r.setSample(ii, jj, 2, biome.color & 0xFF); - r.setSample(ii, jj, 3, 0xFF); - if (!colors.containsKey(biome.biomeName)) - colors.put(biome.biomeName, biome.color); - } - } - File outfile = new File("biomes.png"); - ImageIO.write(image, "png", outfile); - File outfileTxt = new File("biomes.txt"); - PrintWriter fw = new PrintWriter(outfileTxt); - for (String key : colors.keySet()) { - fw.println(String.format("Biome: %s , Color: %d", key, colors.get(key))); - } - fw.println(String.format("From (%d,%d) to (%d,%d)", cor.posX - aXaZ, cor.posZ - aXaZ, cor.posX - aXaZ + step * 512, cor.posZ - aXaZ + step * 512)); - fw.flush(); - fw.close(); - return; - } - } - catch (Exception e) - { - sender.addChatMessage(new ChatComponentText("catch ERROR")); - return; - } - sender.addChatMessage(new ChatComponentText("ERROR")); - } - - @Override - public boolean canCommandSenderUseCommand(ICommandSender p_71519_1_) { - return true; - } - - @Override - public List addTabCompletionOptions(ICommandSender p_71516_1_, String[] p_71516_2_) { - return null; - } - - @Override - public boolean isUsernameIndex(String[] p_82358_1_, int p_82358_2_) { - return false; - } - - @Override - public int compareTo(Object o) { - return 0; - } -} diff --git a/src/main/java/com/detrav/commands/DetravLevelUpCommand.java b/src/main/java/com/detrav/commands/DetravLevelUpCommand.java deleted file mode 100644 index 432aac54fe..0000000000 --- a/src/main/java/com/detrav/commands/DetravLevelUpCommand.java +++ /dev/null @@ -1,97 +0,0 @@ -package com.detrav.commands; - -import com.google.common.collect.HashMultimap; -import net.minecraft.command.ICommand; -import net.minecraft.command.ICommandSender; -import net.minecraft.entity.SharedMonsterAttributes; -import net.minecraft.entity.ai.attributes.AttributeModifier; -import net.minecraft.entity.ai.attributes.BaseAttributeMap; -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.item.ItemStack; -import net.minecraft.util.ChatComponentText; - -import java.util.ArrayList; -import java.util.List; -import java.util.UUID; - -/** - * Created by Detrav on 26.03.2017. - */ -public class DetravLevelUpCommand implements ICommand { - - private List aliases; - - public DetravLevelUpCommand() - { - this.aliases = new ArrayList<String>(); - this.aliases.add("DetravLevelUp"); - this.aliases.add("dlup"); - } - - @Override - public String getCommandName() { - return "DetravLevelUp"; - } - - @Override - public String getCommandUsage(ICommandSender p_71518_1_) { - return "DetravLevelUp"; - } - - @Override - public List getCommandAliases() { - return aliases; - } - - static int level = 0; - - static UUID id = UUID.randomUUID(); - - @Override - public void processCommand(ICommandSender player, String[] p_71515_2_) { - if(player instanceof EntityPlayerMP) - { - - level++; - AttributeModifier mod = new AttributeModifier(id,"detravlevelup",level,0); - ((EntityPlayerMP) player).getEntityAttribute( - SharedMonsterAttributes.maxHealth - ).removeModifier(mod); - ((EntityPlayerMP) player).getEntityAttribute( - SharedMonsterAttributes.maxHealth - ).applyModifier(mod); - - - - /*BaseAttributeMap attrMap = ((EntityPlayerMP) player).getAttributeMap(); - HashMultimap map = HashMultimap.create(); - map.put() - attrMap.applyAttributeModifiers(map);*/ - } - } - - private void sendHelpMessage(ICommandSender sender) - { - sender.addChatMessage(new ChatComponentText(getCommandUsage(sender))); - } - - @Override - public boolean canCommandSenderUseCommand(ICommandSender p_71519_1_) { - return true; - } - - @Override - public List addTabCompletionOptions(ICommandSender p_71516_1_, String[] p_71516_2_) { - return null; - } - - @Override - public boolean isUsernameIndex(String[] p_82358_1_, int p_82358_2_) { - return false; - } - - @Override - public int compareTo(Object o) { - return 0; - } -} diff --git a/src/main/java/com/detrav/enums/DetravItemList.java b/src/main/java/com/detrav/enums/DetravItemList.java deleted file mode 100644 index 3c5ae29991..0000000000 --- a/src/main/java/com/detrav/enums/DetravItemList.java +++ /dev/null @@ -1,147 +0,0 @@ -package com.detrav.enums; - -import gregtech.api.interfaces.IItemContainer; -import gregtech.api.util.GT_ModHandler; -import gregtech.api.util.GT_OreDictUnificator; -import gregtech.api.util.GT_Utility; -import net.minecraft.block.Block; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; - -import static gregtech.api.enums.GT_Values.W; - -/** - * Created by wital_000 on 20.03.2016. - */ -public enum DetravItemList implements IItemContainer { - Shape_Extruder_ProPick, - //Solar_Boiler_Low, - Solar_Boiler_Medium, - Solar_Boiler_High, - DetravAdvancedMiner2, - ConfiguredCircuit; - - - private ItemStack mStack; - private boolean mHasNotBeenSet = true; - - @Override - public IItemContainer set(Item aItem) { - mHasNotBeenSet = false; - if (aItem == null) return this; - ItemStack aStack = new ItemStack(aItem, 1, 0); - mStack = GT_Utility.copyAmount(1, aStack); - return this; - } - - @Override - public IItemContainer set(ItemStack aStack) { - mHasNotBeenSet = false; - mStack = GT_Utility.copyAmount(1, aStack); - return this; - } - - @Override - public Item getItem() { - if (mHasNotBeenSet) - throw new IllegalAccessError("The Enum '" + name() + "' has not been set to an Item at this time!"); - if (GT_Utility.isStackInvalid(mStack)) return null; - return mStack.getItem(); - } - - @Override - public Block getBlock() { - if (mHasNotBeenSet) - throw new IllegalAccessError("The Enum '" + name() + "' has not been set to an Item at this time!"); - return GT_Utility.getBlockFromItem(getItem()); - } - - @Override - public final boolean hasBeenSet() { - return !mHasNotBeenSet; - } - - @Override - public boolean isStackEqual(Object aStack) { - return isStackEqual(aStack, false, false); - } - - @Override - public boolean isStackEqual(Object aStack, boolean aWildcard, boolean aIgnoreNBT) { - if (GT_Utility.isStackInvalid(aStack)) return false; - return GT_Utility.areUnificationsEqual((ItemStack) aStack, aWildcard ? getWildcard(1) : get(1), aIgnoreNBT); - } - - @Override - public ItemStack get(long aAmount, Object... aReplacements) { - if (mHasNotBeenSet) - throw new IllegalAccessError("The Enum '" + name() + "' has not been set to an Item at this time!"); - if (GT_Utility.isStackInvalid(mStack)) return GT_Utility.copyAmount(aAmount, aReplacements); - return GT_Utility.copyAmount(aAmount, GT_OreDictUnificator.get(mStack)); - } - - @Override - public ItemStack getWildcard(long aAmount, Object... aReplacements) { - if (mHasNotBeenSet) - throw new IllegalAccessError("The Enum '" + name() + "' has not been set to an Item at this time!"); - if (GT_Utility.isStackInvalid(mStack)) return GT_Utility.copyAmount(aAmount, aReplacements); - return GT_Utility.copyAmountAndMetaData(aAmount, W, GT_OreDictUnificator.get(mStack)); - } - - @Override - public ItemStack getUndamaged(long aAmount, Object... aReplacements) { - if (mHasNotBeenSet) - throw new IllegalAccessError("The Enum '" + name() + "' has not been set to an Item at this time!"); - if (GT_Utility.isStackInvalid(mStack)) return GT_Utility.copyAmount(aAmount, aReplacements); - return GT_Utility.copyAmountAndMetaData(aAmount, 0, GT_OreDictUnificator.get(mStack)); - } - - @Override - public ItemStack getAlmostBroken(long aAmount, Object... aReplacements) { - if (mHasNotBeenSet) - throw new IllegalAccessError("The Enum '" + name() + "' has not been set to an Item at this time!"); - if (GT_Utility.isStackInvalid(mStack)) return GT_Utility.copyAmount(aAmount, aReplacements); - return GT_Utility.copyAmountAndMetaData(aAmount, mStack.getMaxDamage() - 1, GT_OreDictUnificator.get(mStack)); - } - - @Override - public ItemStack getWithName(long aAmount, String aDisplayName, Object... aReplacements) { - ItemStack rStack = get(1, aReplacements); - if (GT_Utility.isStackInvalid(rStack)) return null; - rStack.setStackDisplayName(aDisplayName); - return GT_Utility.copyAmount(aAmount, rStack); - } - - @Override - public ItemStack getWithCharge(long aAmount, int aEnergy, Object... aReplacements) { - ItemStack rStack = get(1, aReplacements); - if (GT_Utility.isStackInvalid(rStack)) return null; - GT_ModHandler.chargeElectricItem(rStack, aEnergy, Integer.MAX_VALUE, true, false); - return GT_Utility.copyAmount(aAmount, rStack); - } - - @Override - public ItemStack getWithDamage(long aAmount, long aMetaValue, Object... aReplacements) { - if (mHasNotBeenSet) - throw new IllegalAccessError("The Enum '" + name() + "' has not been set to an Item at this time!"); - if (GT_Utility.isStackInvalid(mStack)) return GT_Utility.copyAmount(aAmount, aReplacements); - return GT_Utility.copyAmountAndMetaData(aAmount, aMetaValue, GT_OreDictUnificator.get(mStack)); - } - - @Override - public IItemContainer registerOre(Object... aOreNames) { - if (mHasNotBeenSet) - throw new IllegalAccessError("The Enum '" + name() + "' has not been set to an Item at this time!"); - for (Object tOreName : aOreNames) GT_OreDictUnificator.registerOre(tOreName, get(1)); - return this; - } - - @Override - public IItemContainer registerWildcardAsOre(Object... aOreNames) { - if (mHasNotBeenSet) - throw new IllegalAccessError("The Enum '" + name() + "' has not been set to an Item at this time!"); - for (Object tOreName : aOreNames) GT_OreDictUnificator.registerOre(tOreName, getWildcard(1)); - return this; - } - -} diff --git a/src/main/java/com/detrav/enums/DetravSimpleItems.java b/src/main/java/com/detrav/enums/DetravSimpleItems.java deleted file mode 100644 index 5db1977650..0000000000 --- a/src/main/java/com/detrav/enums/DetravSimpleItems.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.detrav.enums; - -import gregtech.api.enums.Materials; -import gregtech.api.enums.OrePrefixes; -import net.minecraft.item.ItemStack; - -/** - * Created by wital_000 on 19.03.2016. - */ -public enum DetravSimpleItems { - toolHeadProPick(OrePrefixes.toolHeadPickaxe,"Prospector's Pick Heads",""," Prospector's Pick Head",0); - - static { - - - } - - private final String mLocalName; - private final OrePrefixes parent; - private final String mPrefix; - private final String mPostFix; - public ItemStack mContainerItem; - public int mDefaultStackSize = 64; - public boolean mIsUnificatable = false; - public int mTextureIndex; - - - DetravSimpleItems(OrePrefixes orePrefixes, String s,String aPrefix, String aPostfix, int aTextureIndex) { - parent = orePrefixes; - mLocalName = s; - mPrefix = aPrefix; - mPostFix = aPostfix; - mTextureIndex = aTextureIndex; - } - - public OrePrefixes getOrePrefixes() - { - return parent; - } - - public String getDefaultLocalNameForItem(Materials aMaterial) { - String result = mPrefix + aMaterial.toString() + mPostFix; - return result; - } - - public Object get(Materials tMaterial) { - Object result = toString()+tMaterial.toString(); - return result; - } -} diff --git a/src/main/java/com/detrav/enums/DetravToolDictNames.java b/src/main/java/com/detrav/enums/DetravToolDictNames.java index 50cfc9c882..21c4396720 100644 --- a/src/main/java/com/detrav/enums/DetravToolDictNames.java +++ b/src/main/java/com/detrav/enums/DetravToolDictNames.java @@ -4,11 +4,5 @@ package com.detrav.enums; * Created by wital_000 on 19.03.2016. */ public enum DetravToolDictNames { - craftingToolProPick, craftingToolElectricProPick, - craftingToolPortableCharger, - //craftingToolPortableAnvil, - craftingToolSmartPlunger, - craftingToolSmartTreeTap, - craftingToolCictuitConfigurator; } diff --git a/src/main/java/com/detrav/enums/Textures01.java b/src/main/java/com/detrav/enums/Textures01.java index a65f181456..742a7f9756 100644 --- a/src/main/java/com/detrav/enums/Textures01.java +++ b/src/main/java/com/detrav/enums/Textures01.java @@ -13,14 +13,8 @@ import net.minecraft.util.ResourceLocation; public class Textures01 { public static final IIconContainer[] mTextures = new IIconContainer[] { - new Textures.ItemIcons.CustomIcon("gt.detrav.metaitem.01/PRO_PICK_HEAD"), 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/PORTABE_CHARGER"), - new Textures.ItemIcons.CustomIcon("gt.detrav.metatool.01/PORTABE_CHARGER_BORDER"), - new Textures.ItemIcons.CustomIcon("gt.detrav.metatool.01/ANVIL_TOOL"), - new Textures.ItemIcons.CustomIcon("gt.detrav.metatool.01/TOOL_TREE_TAP"), - new Textures.ItemIcons.CustomIcon("gt.detrav.metatool.01/CONFIGURATOR") }; }
\ No newline at end of file diff --git a/src/main/java/com/detrav/events/DetravCraftingEventHandler.java b/src/main/java/com/detrav/events/DetravCraftingEventHandler.java deleted file mode 100644 index 0350b9b7b7..0000000000 --- a/src/main/java/com/detrav/events/DetravCraftingEventHandler.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.detrav.events; - -import com.detrav.utils.DetravRepairRecipe; -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.common.gameevent.PlayerEvent; -import gregtech.api.util.GT_Utility; -import net.minecraft.inventory.InventoryCrafting; -import net.minecraft.item.ItemStack; -import net.minecraftforge.common.MinecraftForge; - -/** - * Created by Detrav on 02.10.2016. - */ -public class DetravCraftingEventHandler { - @SubscribeEvent - public void onCrafting(PlayerEvent.ItemCraftedEvent e) { - if(DetravRepairRecipe.INSTANCE == null) return; - if(!(e.craftMatrix instanceof InventoryCrafting)) return; - if(DetravRepairRecipe.INSTANCE.matches((InventoryCrafting) e.craftMatrix,null)) - { - if(!GT_Utility.areStacksEqual(e.crafting, e.craftMatrix.getStackInSlot(4),true)) return; - for(int i =0; i<e.craftMatrix.getSizeInventory(); i++) { - ItemStack stack = e.craftMatrix.getStackInSlot(i); - if(stack == null) continue; - if (stack.stackSize < 2) - e.craftMatrix.setInventorySlotContents(i, null); - else { - //stack.stackSize -= 1; - //e.craftMatrix.setInventorySlotContents(i,stack); - } - } - } - } - - static boolean inited = false; - - public static void register() { - if (!inited) { - inited = true; - DetravCraftingEventHandler handler = new DetravCraftingEventHandler(); - MinecraftForge.EVENT_BUS.register(handler); - FMLCommonHandler.instance().bus().register(handler); - } - } -} diff --git a/src/main/java/com/detrav/events/DetravDrawBlockHighlightEventHandler.java b/src/main/java/com/detrav/events/DetravDrawBlockHighlightEventHandler.java deleted file mode 100644 index 25b29c8e96..0000000000 --- a/src/main/java/com/detrav/events/DetravDrawBlockHighlightEventHandler.java +++ /dev/null @@ -1,268 +0,0 @@ -package com.detrav.events; - -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import net.minecraft.block.Block; -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; -import net.minecraft.item.ItemStack; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.MovingObjectPosition; -import net.minecraftforge.client.event.DrawBlockHighlightEvent; -import net.minecraftforge.common.MinecraftForge; -import org.lwjgl.opengl.GL11; - -import static org.lwjgl.opengl.GL11.GL_TRIANGLES; -//import net.minecraftforge.client.event.RenderWorldLastEvent; - -/** - * Created by wital_000 on 18.04.2016. - */ -public class DetravDrawBlockHighlightEventHandler { - - public static long modeBlockBreak = 0L; - public static boolean disableDepthBuffer = false; - public static float thickness = 4F; - public static float offset = 0.01F; - public static float red = 1F;//0.1F; - public static float green = 1F; - public static float blue = 1F;//0.1F; - public static float alpha = 0.1F; - - @SubscribeEvent - public void onDrawBlockHighlight(DrawBlockHighlightEvent e) { - if (drawMoreSelectionBox(e.player, e.target, 0, e.currentItem, e.partialTicks)) - e.setCanceled(true); - } - - public static boolean drawMoreSelectionBox(EntityPlayer player, MovingObjectPosition mouseHit, int par3, ItemStack par4ItemStack, float par5) { - switch ((int) modeBlockBreak) { - //case 0: Просто рисуем без экспанда - case 0: - //drawSelectionBox(player, mouseHit.typeOfHit, mouseHit.blockX , mouseHit.blockY, mouseHit.blockZ , par3, par4ItemStack, par5); - return false; - case 1: - switch (mouseHit.sideHit) {//Рисуеи по моусхиту - case 0: - case 1://x,z - for (int i = -1; i <= 1; i++) - for (int j = -1; j <= 1; j++) - drawSelectionBox(player, mouseHit.typeOfHit, mouseHit.blockX + i, mouseHit.blockY, mouseHit.blockZ + j, par3, par4ItemStack, par5); - break; - case 2: - case 3://x,y - for (int i = -1; i <= 1; i++) - for (int j = -1; j <= 1; j++) - drawSelectionBox(player, mouseHit.typeOfHit, mouseHit.blockX + i, mouseHit.blockY + j, mouseHit.blockZ, par3, par4ItemStack, par5); - break; - case 4: - case 5://y,z - for (int i = -1; i <= 1; i++) - for (int j = -1; j <= 1; j++) - drawSelectionBox(player, mouseHit.typeOfHit, mouseHit.blockX, mouseHit.blockY + i, mouseHit.blockZ + j, par3, par4ItemStack, par5); - break; - } - break; - case 2://x,z - for (int i = -1; i <= 1; i++) - for (int j = -1; j <= 1; j++) - drawSelectionBox(player, mouseHit.typeOfHit, mouseHit.blockX + i, mouseHit.blockY, mouseHit.blockZ + j, par3, par4ItemStack, par5); - break; - case 3: - float rotationYaw = player.rotationYaw; - while (rotationYaw > 0) rotationYaw -= 360F; - while (rotationYaw < -360) rotationYaw += 360F; - if ((-135 <= rotationYaw && rotationYaw <= -45) || (-315 <= rotationYaw && rotationYaw <= -225)) { - //y,z - for (int i = -1; i <= 1; i++) - for (int j = -1; j <= 1; j++) - drawSelectionBox(player, mouseHit.typeOfHit, mouseHit.blockX, mouseHit.blockY + i, mouseHit.blockZ + j, par3, par4ItemStack, par5); - } else if ((-225 <= rotationYaw && rotationYaw <= -135) || -45 <= rotationYaw || rotationYaw <= -315) { - //x,y - for (int i = -1; i <= 1; i++) - for (int j = -1; j <= 1; j++) - drawSelectionBox(player, mouseHit.typeOfHit, mouseHit.blockX + i, mouseHit.blockY + j, mouseHit.blockZ, par3, par4ItemStack, par5); - } - break; - case 4: - //x,y,z - for (int i = -1; i <= 1; i++) - for (int j = -1; j <= 1; j++) - for (int k = -1; k <= 1; k++) - drawSelectionBox(player, mouseHit.typeOfHit, mouseHit.blockX + i, mouseHit.blockY + j, mouseHit.blockZ + k, par3, par4ItemStack, par5); - break; - } - return false; - } - - public static void drawSelectionBox(EntityPlayer player,MovingObjectPosition.MovingObjectType typeOfHit, int blockX,int blockY, int blockZ, int par3, ItemStack par4ItemStack, float par5) { - if ((par3 == 0) && (typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK)) { - //float breakProgress = getBlockDamage(player, block); - if (disableDepthBuffer) { - GL11.glDisable(2929); - } - GL11.glEnable(3042); - GL11.glBlendFunc(770, 771); - GL11.glLineWidth(thickness); - GL11.glDisable(3553); - GL11.glDepthMask(false); - float f1 = offset; - - Minecraft mc = Minecraft.getMinecraft(); - Block b = mc.theWorld.getBlock(blockX, blockY, blockZ); - if (b != Blocks.air && b!= null) { - b.setBlockBoundsBasedOnState(mc.theWorld, blockX, blockY, blockZ); - - double xOffset = player.lastTickPosX + (player.posX - player.lastTickPosX) * par5; - double yOffset = player.lastTickPosY + (player.posY - player.lastTickPosY) * par5; - double zOffset = player.lastTickPosZ + (player.posZ - player.lastTickPosZ) * par5; - - float xExpand = 0F; - float yExpand = 0F; - float zExpand = 0F; - - - - try { - AxisAlignedBB bb = b.getSelectedBoundingBoxFromPool(mc.theWorld, blockX, blockY, blockZ).expand(xExpand + f1, yExpand + f1, zExpand + f1).getOffsetBoundingBox(-xOffset, -yOffset, -zOffset); - GL11.glColor4f(red, green, blue, alpha); - //drawOutlinedBoundingBox(bb); - drawBlock(bb); - }catch(Exception e) { - - } - - } - GL11.glDepthMask(true); - GL11.glEnable(3553); - GL11.glDisable(3042); - if (disableDepthBuffer) { - GL11.glEnable(2929); - } - } - } - - private static void drawBlock(AxisAlignedBB par1AxisAlignedBB) { - //Tessellator tessellator = Tessellator.instance; - if(alpha > 0.0F) { - - - renderDown(par1AxisAlignedBB); - renderUp(par1AxisAlignedBB); - renderNorth(par1AxisAlignedBB); - renderSouth(par1AxisAlignedBB); - renderWest(par1AxisAlignedBB); - renderEast(par1AxisAlignedBB); - } - - } - - - public static void renderUp(AxisAlignedBB par1AxisAlignedBB) { - Tessellator tessellator = Tessellator.instance; - tessellator.startDrawingQuads(); - tessellator.addVertex(par1AxisAlignedBB.minX, par1AxisAlignedBB.minY, par1AxisAlignedBB.minZ); - tessellator.addVertex(par1AxisAlignedBB.maxX, par1AxisAlignedBB.minY, par1AxisAlignedBB.minZ); - tessellator.addVertex(par1AxisAlignedBB.maxX, par1AxisAlignedBB.minY, par1AxisAlignedBB.maxZ); - tessellator.addVertex(par1AxisAlignedBB.minX, par1AxisAlignedBB.minY, par1AxisAlignedBB.maxZ); - tessellator.addVertex(par1AxisAlignedBB.minX, par1AxisAlignedBB.minY, par1AxisAlignedBB.minZ); - tessellator.draw(); - } - - public static void renderDown(AxisAlignedBB par1AxisAlignedBB) { - Tessellator tessellator = Tessellator.instance; - tessellator.startDrawingQuads(); - tessellator.addVertex(par1AxisAlignedBB.minX, par1AxisAlignedBB.maxY, par1AxisAlignedBB.minZ); - tessellator.addVertex(par1AxisAlignedBB.minX, par1AxisAlignedBB.maxY, par1AxisAlignedBB.maxZ); - tessellator.addVertex(par1AxisAlignedBB.maxX, par1AxisAlignedBB.maxY, par1AxisAlignedBB.maxZ); - tessellator.addVertex(par1AxisAlignedBB.maxX, par1AxisAlignedBB.maxY, par1AxisAlignedBB.minZ); - tessellator.addVertex(par1AxisAlignedBB.minX, par1AxisAlignedBB.maxY, par1AxisAlignedBB.minZ); - tessellator.draw(); - } - - public static void renderNorth(AxisAlignedBB par1AxisAlignedBB) { - Tessellator tessellator = Tessellator.instance; - tessellator.startDrawingQuads(); - tessellator.addVertex(par1AxisAlignedBB.minX, par1AxisAlignedBB.minY, par1AxisAlignedBB.minZ); - tessellator.addVertex(par1AxisAlignedBB.minX, par1AxisAlignedBB.maxY, par1AxisAlignedBB.minZ); - tessellator.addVertex(par1AxisAlignedBB.maxX, par1AxisAlignedBB.maxY, par1AxisAlignedBB.minZ); - tessellator.addVertex(par1AxisAlignedBB.maxX, par1AxisAlignedBB.minY, par1AxisAlignedBB.minZ); - tessellator.addVertex(par1AxisAlignedBB.minX, par1AxisAlignedBB.minY, par1AxisAlignedBB.minZ); - tessellator.draw(); - } - - public static void renderSouth(AxisAlignedBB par1AxisAlignedBB) { - Tessellator tessellator = Tessellator.instance; - tessellator.startDrawingQuads(); - tessellator.addVertex(par1AxisAlignedBB.minX, par1AxisAlignedBB.minY, par1AxisAlignedBB.maxZ); - tessellator.addVertex(par1AxisAlignedBB.maxX, par1AxisAlignedBB.minY, par1AxisAlignedBB.maxZ); - tessellator.addVertex(par1AxisAlignedBB.maxX, par1AxisAlignedBB.maxY, par1AxisAlignedBB.maxZ); - tessellator.addVertex(par1AxisAlignedBB.minX, par1AxisAlignedBB.maxY, par1AxisAlignedBB.maxZ); - tessellator.addVertex(par1AxisAlignedBB.minX, par1AxisAlignedBB.minY, par1AxisAlignedBB.maxZ); - tessellator.draw(); - } - - public static void renderWest(AxisAlignedBB par1AxisAlignedBB) { - Tessellator tessellator = Tessellator.instance; - tessellator.startDrawingQuads(); - tessellator.addVertex(par1AxisAlignedBB.minX, par1AxisAlignedBB.minY, par1AxisAlignedBB.minZ); - tessellator.addVertex(par1AxisAlignedBB.minX, par1AxisAlignedBB.minY, par1AxisAlignedBB.maxZ); - tessellator.addVertex(par1AxisAlignedBB.minX, par1AxisAlignedBB.maxY, par1AxisAlignedBB.maxZ); - tessellator.addVertex(par1AxisAlignedBB.minX, par1AxisAlignedBB.maxY, par1AxisAlignedBB.minZ); - tessellator.addVertex(par1AxisAlignedBB.minX, par1AxisAlignedBB.minY, par1AxisAlignedBB.minZ); - tessellator.draw(); - } - - public static void renderEast(AxisAlignedBB par1AxisAlignedBB) { - Tessellator tessellator = Tessellator.instance; - tessellator.startDrawingQuads(); - tessellator.addVertex(par1AxisAlignedBB.maxX, par1AxisAlignedBB.minY, par1AxisAlignedBB.minZ); - tessellator.addVertex(par1AxisAlignedBB.maxX, par1AxisAlignedBB.maxY, par1AxisAlignedBB.minZ); - tessellator.addVertex(par1AxisAlignedBB.maxX, par1AxisAlignedBB.maxY, par1AxisAlignedBB.maxZ); - tessellator.addVertex(par1AxisAlignedBB.maxX, par1AxisAlignedBB.minY, par1AxisAlignedBB.maxZ); - tessellator.addVertex(par1AxisAlignedBB.maxX, par1AxisAlignedBB.minY, par1AxisAlignedBB.minZ); - tessellator.draw(); - } - - private static void drawOutlinedBoundingBox(AxisAlignedBB par1AxisAlignedBB) { - Tessellator tessellator = Tessellator.instance; - tessellator.startDrawing(3); - tessellator.addVertex(par1AxisAlignedBB.minX, par1AxisAlignedBB.minY, par1AxisAlignedBB.minZ); - tessellator.addVertex(par1AxisAlignedBB.maxX, par1AxisAlignedBB.minY, par1AxisAlignedBB.minZ); - tessellator.addVertex(par1AxisAlignedBB.maxX, par1AxisAlignedBB.minY, par1AxisAlignedBB.maxZ); - tessellator.addVertex(par1AxisAlignedBB.minX, par1AxisAlignedBB.minY, par1AxisAlignedBB.maxZ); - tessellator.addVertex(par1AxisAlignedBB.minX, par1AxisAlignedBB.minY, par1AxisAlignedBB.minZ); - tessellator.draw(); - tessellator.startDrawing(3); - tessellator.addVertex(par1AxisAlignedBB.minX, par1AxisAlignedBB.maxY, par1AxisAlignedBB.minZ); - tessellator.addVertex(par1AxisAlignedBB.maxX, par1AxisAlignedBB.maxY, par1AxisAlignedBB.minZ); - tessellator.addVertex(par1AxisAlignedBB.maxX, par1AxisAlignedBB.maxY, par1AxisAlignedBB.maxZ); - tessellator.addVertex(par1AxisAlignedBB.minX, par1AxisAlignedBB.maxY, par1AxisAlignedBB.maxZ); - tessellator.addVertex(par1AxisAlignedBB.minX, par1AxisAlignedBB.maxY, par1AxisAlignedBB.minZ); - tessellator.draw(); - tessellator.startDrawing(1); - tessellator.addVertex(par1AxisAlignedBB.minX, par1AxisAlignedBB.minY, par1AxisAlignedBB.minZ); - tessellator.addVertex(par1AxisAlignedBB.minX, par1AxisAlignedBB.maxY, par1AxisAlignedBB.minZ); - tessellator.addVertex(par1AxisAlignedBB.maxX, par1AxisAlignedBB.minY, par1AxisAlignedBB.minZ); - tessellator.addVertex(par1AxisAlignedBB.maxX, par1AxisAlignedBB.maxY, par1AxisAlignedBB.minZ); - tessellator.addVertex(par1AxisAlignedBB.maxX, par1AxisAlignedBB.minY, par1AxisAlignedBB.maxZ); - tessellator.addVertex(par1AxisAlignedBB.maxX, par1AxisAlignedBB.maxY, par1AxisAlignedBB.maxZ); - tessellator.addVertex(par1AxisAlignedBB.minX, par1AxisAlignedBB.minY, par1AxisAlignedBB.maxZ); - tessellator.addVertex(par1AxisAlignedBB.minX, par1AxisAlignedBB.maxY, par1AxisAlignedBB.maxZ); - tessellator.draw(); - } - - - static boolean inited = false; - - public static void register() { - if (!inited) { - inited = true; - DetravDrawBlockHighlightEventHandler handler = new DetravDrawBlockHighlightEventHandler(); - MinecraftForge.EVENT_BUS.register(handler); - FMLCommonHandler.instance().bus().register(handler); - } - } -}
\ No newline at end of file diff --git a/src/main/java/com/detrav/events/DetravEntityDropEvent.java b/src/main/java/com/detrav/events/DetravEntityDropEvent.java deleted file mode 100644 index 6c84ab31c2..0000000000 --- a/src/main/java/com/detrav/events/DetravEntityDropEvent.java +++ /dev/null @@ -1,90 +0,0 @@ -package com.detrav.events; - -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import gregtech.api.enums.ItemList; -import gregtech.api.items.GT_MetaGenerated_Item_X01; -import ic2.core.Ic2Items; -import net.minecraft.entity.EnumCreatureType; -import net.minecraft.entity.item.EntityItem; -import net.minecraft.entity.monster.EntityEnderman; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; -import net.minecraft.util.ChatComponentText; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.event.entity.living.LivingDropsEvent; - -import java.util.Random; - -/** - * Created by Detrav on 02.10.2016. - */ -public class DetravEntityDropEvent { - - final static int baseShance = 70; - static Random random = new Random(); - - @SubscribeEvent - public void onLivingDropsEvent(LivingDropsEvent event) { - if(event.entity.isCreatureType(EnumCreatureType.monster, false)) { - - float shance = (baseShance + event.entityLiving.getMaxHealth()); - if(event.entity instanceof EntityEnderman) shance -= event.entityLiving.getMaxHealth()/2f; - int count = 0; - while (shance > 100) { - count++; - shance -= 100; - } - - if(count>0) - { - count = (int)(Math.pow(count,event.lootingLevel+1)*1.57f + 1); - - while (count>Ic2Items.coin.getMaxStackSize()) { - ItemStack itemStackToDrop = Ic2Items.coin.copy(); - itemStackToDrop.stackSize = itemStackToDrop.getMaxStackSize(); - event.drops.add(new EntityItem(event.entity.worldObj, event.entity.posX, - event.entity.posY, event.entity.posZ, itemStackToDrop)); - count -= itemStackToDrop.getMaxStackSize(); - } - ItemStack itemStackToDrop = Ic2Items.coin.copy(); - itemStackToDrop.stackSize = count; - event.drops.add(new EntityItem(event.entity.worldObj, event.entity.posX, - event.entity.posY, event.entity.posZ, itemStackToDrop)); - } - - count = 0; - shance += baseShance; - - shance = shance*(event.lootingLevel*1.57f +1); - while (shance > 100) { - count++; - shance -= 100; - } - if(random.nextInt(100) < shance) count ++; - ItemStack itemStackToDrop = ItemList.Credit_Copper.get(count); - event.drops.add(new EntityItem(event.entity.worldObj, event.entity.posX, - event.entity.posY, event.entity.posZ, itemStackToDrop)); - } - /*if(event.source.getEntity() instanceof EntityPlayer) - { - - ((EntityPlayer)event.source.getEntity()).addChatComponentMessage( - new ChatComponentText(event.entity.toString()) - ); - }*/ - } - - - static boolean inited = false; - - public static void register() { - if (!inited) { - inited = true; - DetravEntityDropEvent handler = new DetravEntityDropEvent(); - MinecraftForge.EVENT_BUS.register(handler); - FMLCommonHandler.instance().bus().register(handler); - } - } -} diff --git a/src/main/java/com/detrav/events/DetravLevelUpEvent.java b/src/main/java/com/detrav/events/DetravLevelUpEvent.java deleted file mode 100644 index 6dbcf4bfca..0000000000 --- a/src/main/java/com/detrav/events/DetravLevelUpEvent.java +++ /dev/null @@ -1,1873 +0,0 @@ -package com.detrav.events; - -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import net.minecraft.entity.SharedMonsterAttributes; -import net.minecraft.entity.ai.attributes.AttributeModifier; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.event.entity.player.PlayerPickupXpEvent; - -import java.util.UUID; - -/** - * Created by Detrav on 26.03.2017. - */ -public class DetravLevelUpEvent { - - public static UUID mod_id = UUID.fromString("9a090263-953b-4d9f-947e-d4636cf3cd7e"); - - - - @SubscribeEvent - public void onPlayerPickupXpEvent(PlayerPickupXpEvent ev) { - EntityPlayer player = ev.entityPlayer; - if (player != null) { - if (!player.getEntityWorld().isRemote) { - if ((player.experience + ev.orb.xpValue*2) >= player.xpBarCap()) { - UpdateHealthAttribute(player,1); - } - } - } - } - - public static void UpdateHealthAttribute(EntityPlayer player) - { - UpdateHealthAttribute(player,0); - } - - public static void UpdateHealthAttribute(EntityPlayer player,int bonus) - { - if (!player.getEntityWorld().isRemote) { - AttributeModifier mod = GetAttributeModifier(player.experienceLevel+bonus); - player.getEntityAttribute( - SharedMonsterAttributes.maxHealth - ).removeModifier(mod); - player.getEntityAttribute( - SharedMonsterAttributes.maxHealth - ).applyModifier(mod); - player.heal(player.getMaxHealth()); - } - } - - public static AttributeModifier GetAttributeModifier(int level) { - int hp_boost = 0; - switch (level) { - case 0: - hp_boost = 0; - break; - case 1: - hp_boost = 1; - break; - case 2: - hp_boost = 2; - break; - case 3: - hp_boost = 2; - break; - case 4: - hp_boost = 3; - break; - case 5: - hp_boost = 3; - break; - case 6: - hp_boost = 4; - break; - case 7: - hp_boost = 4; - break; - case 8: - hp_boost = 5; - break; - case 9: - hp_boost = 5; - break; - case 10: - hp_boost = 6; - break; - case 11: - hp_boost = 6; - break; - case 12: - hp_boost = 7; - break; - case 13: - hp_boost = 7; - break; - case 14: - hp_boost = 8; - break; - case 15: - hp_boost = 8; - break; - case 16: - hp_boost = 9; - break; - case 17: - hp_boost = 9; - break; - case 18: - hp_boost = 10; - break; - case 19: - hp_boost = 10; - break; - case 20: - hp_boost = 11; - break; - case 21: - hp_boost = 11; - break; - case 22: - hp_boost = 11; - break; - case 23: - hp_boost = 12; - break; - case 24: - hp_boost = 12; - break; - case 25: - hp_boost = 12; - break; - case 26: - hp_boost = 13; - break; - case 27: - hp_boost = 13; - break; - case 28: - hp_boost = 13; - break; - case 29: - hp_boost = 14; - break; - case 30: - hp_boost = 14; - break; - case 31: - hp_boost = 14; - break; - case 32: - hp_boost = 15; - break; - case 33: - hp_boost = 15; - break; - case 34: - hp_boost = 15; - break; - case 35: - hp_boost = 16; - break; - case 36: - hp_boost = 16; - break; - case 37: - hp_boost = 16; - break; - case 38: - hp_boost = 17; - break; - case 39: - hp_boost = 17; - break; - case 40: - hp_boost = 17; - break; - case 41: - hp_boost = 18; - break; - case 42: - hp_boost = 18; - break; - case 43: - hp_boost = 18; - break; - case 44: - hp_boost = 18; - break; - case 45: - hp_boost = 19; - break; - case 46: - hp_boost = 19; - break; - case 47: - hp_boost = 19; - break; - case 48: - hp_boost = 19; - break; - case 49: - hp_boost = 20; - break; - case 50: - hp_boost = 20; - break; - case 51: - hp_boost = 20; - break; - case 52: - hp_boost = 20; - break; - case 53: - hp_boost = 21; - break; - case 54: - hp_boost = 21; - break; - case 55: - hp_boost = 21; - break; - case 56: - hp_boost = 21; - break; - case 57: - hp_boost = 22; - break; - case 58: - hp_boost = 22; - break; - case 59: - hp_boost = 22; - break; - case 60: - hp_boost = 22; - break; - case 61: - hp_boost = 23; - break; - case 62: - hp_boost = 23; - break; - case 63: - hp_boost = 23; - break; - case 64: - hp_boost = 23; - break; - case 65: - hp_boost = 23; - break; - case 66: - hp_boost = 24; - break; - case 67: - hp_boost = 24; - break; - case 68: - hp_boost = 24; - break; - case 69: - hp_boost = 24; - break; - case 70: - hp_boost = 24; - break; - case 71: - hp_boost = 25; - break; - case 72: - hp_boost = 25; - break; - case 73: - hp_boost = 25; - break; - case 74: - hp_boost = 25; - break; - case 75: - hp_boost = 25; - break; - case 76: - hp_boost = 26; - break; - case 77: - hp_boost = 26; - break; - case 78: - hp_boost = 26; - break; - case 79: - hp_boost = 26; - break; - case 80: - hp_boost = 26; - break; - case 81: - hp_boost = 26; - break; - case 82: - hp_boost = 27; - break; - case 83: - hp_boost = 27; - break; - case 84: - hp_boost = 27; - break; - case 85: - hp_boost = 27; - break; - case 86: - hp_boost = 27; - break; - case 87: - hp_boost = 27; - break; - case 88: - hp_boost = 28; - break; - case 89: - hp_boost = 28; - break; - case 90: - hp_boost = 28; - break; - case 91: - hp_boost = 28; - break; - case 92: - hp_boost = 28; - break; - case 93: - hp_boost = 28; - break; - case 94: - hp_boost = 29; - break; - case 95: - hp_boost = 29; - break; - case 96: - hp_boost = 29; - break; - case 97: - hp_boost = 29; - break; - case 98: - hp_boost = 29; - break; - case 99: - hp_boost = 29; - break; - case 100: - hp_boost = 30; - break; - case 101: - hp_boost = 30; - break; - case 102: - hp_boost = 30; - break; - case 103: - hp_boost = 30; - break; - case 104: - hp_boost = 30; - break; - case 105: - hp_boost = 30; - break; - case 106: - hp_boost = 30; - break; - case 107: - hp_boost = 31; - break; - case 108: - hp_boost = 31; - break; - case 109: - hp_boost = 31; - break; - case 110: - hp_boost = 31; - break; - case 111: - hp_boost = 31; - break; - case 112: - hp_boost = 31; - break; - case 113: - hp_boost = 31; - break; - case 114: - hp_boost = 31; - break; - case 115: - hp_boost = 32; - break; - case 116: - hp_boost = 32; - break; - case 117: - hp_boost = 32; - break; - case 118: - hp_boost = 32; - break; - case 119: - hp_boost = 32; - break; - case 120: - hp_boost = 32; - break; - case 121: - hp_boost = 32; - break; - case 122: - hp_boost = 33; - break; - case 123: - hp_boost = 33; - break; - case 124: - hp_boost = 33; - break; - case 125: - hp_boost = 33; - break; - case 126: - hp_boost = 33; - break; - case 127: - hp_boost = 33; - break; - case 128: - hp_boost = 33; - break; - case 129: - hp_boost = 33; - break; - case 130: - hp_boost = 34; - break; - case 131: - hp_boost = 34; - break; - case 132: - hp_boost = 34; - break; - case 133: - hp_boost = 34; - break; - case 134: - hp_boost = 34; - break; - case 135: - hp_boost = 34; - break; - case 136: - hp_boost = 34; - break; - case 137: - hp_boost = 34; - break; - case 138: - hp_boost = 34; - break; - case 139: - hp_boost = 35; - break; - case 140: - hp_boost = 35; - break; - case 141: - hp_boost = 35; - break; - case 142: - hp_boost = 35; - break; - case 143: - hp_boost = 35; - break; - case 144: - hp_boost = 35; - break; - case 145: - hp_boost = 35; - break; - case 146: - hp_boost = 35; - break; - case 147: - hp_boost = 35; - break; - case 148: - hp_boost = 36; - break; - case 149: - hp_boost = 36; - break; - case 150: - hp_boost = 36; - break; - case 151: - hp_boost = 36; - break; - case 152: - hp_boost = 36; - break; - case 153: - hp_boost = 36; - break; - case 154: - hp_boost = 36; - break; - case 155: - hp_boost = 36; - break; - case 156: - hp_boost = 36; - break; - case 157: - hp_boost = 37; - break; - case 158: - hp_boost = 37; - break; - case 159: - hp_boost = 37; - break; - case 160: - hp_boost = 37; - break; - case 161: - hp_boost = 37; - break; - case 162: - hp_boost = 37; - break; - case 163: - hp_boost = 37; - break; - case 164: - hp_boost = 37; - break; - case 165: - hp_boost = 37; - break; - case 166: - hp_boost = 37; - break; - case 167: - hp_boost = 37; - break; - case 168: - hp_boost = 38; - break; - case 169: - hp_boost = 38; - break; - case 170: - hp_boost = 38; - break; - case 171: - hp_boost = 38; - break; - case 172: - hp_boost = 38; - break; - case 173: - hp_boost = 38; - break; - case 174: - hp_boost = 38; - break; - case 175: - hp_boost = 38; - break; - case 176: - hp_boost = 38; - break; - case 177: - hp_boost = 38; - break; - case 178: - hp_boost = 39; - break; - case 179: - hp_boost = 39; - break; - case 180: - hp_boost = 39; - break; - case 181: - hp_boost = 39; - break; - case 182: - hp_boost = 39; - break; - case 183: - hp_boost = 39; - break; - case 184: - hp_boost = 39; - break; - case 185: - hp_boost = 39; - break; - case 186: - hp_boost = 39; - break; - case 187: - hp_boost = 39; - break; - case 188: - hp_boost = 39; - break; - case 189: - hp_boost = 40; - break; - case 190: - hp_boost = 40; - break; - case 191: - hp_boost = 40; - break; - case 192: - hp_boost = 40; - break; - case 193: - hp_boost = 40; - break; - case 194: - hp_boost = 40; - break; - case 195: - hp_boost = 40; - break; - case 196: - hp_boost = 40; - break; - case 197: - hp_boost = 40; - break; - case 198: - hp_boost = 40; - break; - case 199: - hp_boost = 40; - break; - case 200: - hp_boost = 40; - break; - case 201: - hp_boost = 41; - break; - case 202: - hp_boost = 41; - break; - case 203: - hp_boost = 41; - break; - case 204: - hp_boost = 41; - break; - case 205: - hp_boost = 41; - break; - case 206: - hp_boost = 41; - break; - case 207: - hp_boost = 41; - break; - case 208: - hp_boost = 41; - break; - case 209: - hp_boost = 41; - break; - case 210: - hp_boost = 41; - break; - case 211: - hp_boost = 41; - break; - case 212: - hp_boost = 41; - break; - case 213: - hp_boost = 42; - break; - case 214: - hp_boost = 42; - break; - case 215: - hp_boost = 42; - break; - case 216: - hp_boost = 42; - break; - case 217: - hp_boost = 42; - break; - case 218: - hp_boost = 42; - break; - case 219: - hp_boost = 42; - break; - case 220: - hp_boost = 42; - break; - case 221: - hp_boost = 42; - break; - case 222: - hp_boost = 42; - break; - case 223: - hp_boost = 42; - break; - case 224: - hp_boost = 42; - break; - case 225: - hp_boost = 42; - break; - case 226: - hp_boost = 42; - break; - case 227: - hp_boost = 43; - break; - case 228: - hp_boost = 43; - break; - case 229: - hp_boost = 43; - break; - case 230: - hp_boost = 43; - break; - case 231: - hp_boost = 43; - break; - case 232: - hp_boost = 43; - break; - case 233: - hp_boost = 43; - break; - case 234: - hp_boost = 43; - break; - case 235: - hp_boost = 43; - break; - case 236: - hp_boost = 43; - break; - case 237: - hp_boost = 43; - break; - case 238: - hp_boost = 43; - break; - case 239: - hp_boost = 43; - break; - case 240: - hp_boost = 44; - break; - case 241: - hp_boost = 44; - break; - case 242: - hp_boost = 44; - break; - case 243: - hp_boost = 44; - break; - case 244: - hp_boost = 44; - break; - case 245: - hp_boost = 44; - break; - case 246: - hp_boost = 44; - break; - case 247: - hp_boost = 44; - break; - case 248: - hp_boost = 44; - break; - case 249: - hp_boost = 44; - break; - case 250: - hp_boost = 44; - break; - case 251: - hp_boost = 44; - break; - case 252: - hp_boost = 44; - break; - case 253: - hp_boost = 44; - break; - case 254: - hp_boost = 44; - break; - case 255: - hp_boost = 45; - break; - case 256: - hp_boost = 45; - break; - case 257: - hp_boost = 45; - break; - case 258: - hp_boost = 45; - break; - case 259: - hp_boost = 45; - break; - case 260: - hp_boost = 45; - break; - case 261: - hp_boost = 45; - break; - case 262: - hp_boost = 45; - break; - case 263: - hp_boost = 45; - break; - case 264: - hp_boost = 45; - break; - case 265: - hp_boost = 45; - break; - case 266: - hp_boost = 45; - break; - case 267: - hp_boost = 45; - break; - case 268: - hp_boost = 45; - break; - case 269: - hp_boost = 45; - break; - case 270: - hp_boost = 46; - break; - case 271: - hp_boost = 46; - break; - case 272: - hp_boost = 46; - break; - case 273: - hp_boost = 46; - break; - case 274: - hp_boost = 46; - break; - case 275: - hp_boost = 46; - break; - case 276: - hp_boost = 46; - break; - case 277: - hp_boost = 46; - break; - case 278: - hp_boost = 46; - break; - case 279: - hp_boost = 46; - break; - case 280: - hp_boost = 46; - break; - case 281: - hp_boost = 46; - break; - case 282: - hp_boost = 46; - break; - case 283: - hp_boost = 46; - break; - case 284: - hp_boost = 46; - break; - case 285: - hp_boost = 46; - break; - case 286: - hp_boost = 46; - break; - case 287: - hp_boost = 47; - break; - case 288: - hp_boost = 47; - break; - case 289: - hp_boost = 47; - break; - case 290: - hp_boost = 47; - break; - case 291: - hp_boost = 47; - break; - case 292: - hp_boost = 47; - break; - case 293: - hp_boost = 47; - break; - case 294: - hp_boost = 47; - break; - case 295: - hp_boost = 47; - break; - case 296: - hp_boost = 47; - break; - case 297: - hp_boost = 47; - break; - case 298: - hp_boost = 47; - break; - case 299: - hp_boost = 47; - break; - case 300: - hp_boost = 47; - break; - case 301: - hp_boost = 47; - break; - case 302: - hp_boost = 47; - break; - case 303: - hp_boost = 47; - break; - case 304: - hp_boost = 48; - break; - case 305: - hp_boost = 48; - break; - case 306: - hp_boost = 48; - break; - case 307: - hp_boost = 48; - break; - case 308: - hp_boost = 48; - break; - case 309: - hp_boost = 48; - break; - case 310: - hp_boost = 48; - break; - case 311: - hp_boost = 48; - break; - case 312: - hp_boost = 48; - break; - case 313: - hp_boost = 48; - break; - case 314: - hp_boost = 48; - break; - case 315: - hp_boost = 48; - break; - case 316: - hp_boost = 48; - break; - case 317: - hp_boost = 48; - break; - case 318: - hp_boost = 48; - break; - case 319: - hp_boost = 48; - break; - case 320: - hp_boost = 48; - break; - case 321: - hp_boost = 48; - break; - case 322: - hp_boost = 49; - break; - case 323: - hp_boost = 49; - break; - case 324: - hp_boost = 49; - break; - case 325: - hp_boost = 49; - break; - case 326: - hp_boost = 49; - break; - case 327: - hp_boost = 49; - break; - case 328: - hp_boost = 49; - break; - case 329: - hp_boost = 49; - break; - case 330: - hp_boost = 49; - break; - case 331: - hp_boost = 49; - break; - case 332: - hp_boost = 49; - break; - case 333: - hp_boost = 49; - break; - case 334: - hp_boost = 49; - break; - case 335: - hp_boost = 49; - break; - case 336: - hp_boost = 49; - break; - case 337: - hp_boost = 49; - break; - case 338: - hp_boost = 49; - break; - case 339: - hp_boost = 49; - break; - case 340: - hp_boost = 49; - break; - case 341: - hp_boost = 50; - break; - case 342: - hp_boost = 50; - break; - case 343: - hp_boost = 50; - break; - case 344: - hp_boost = 50; - break; - case 345: - hp_boost = 50; - break; - case 346: - hp_boost = 50; - break; - case 347: - hp_boost = 50; - break; - case 348: - hp_boost = 50; - break; - case 349: - hp_boost = 50; - break; - case 350: - hp_boost = 50; - break; - case 351: - hp_boost = 50; - break; - case 352: - hp_boost = 50; - break; - case 353: - hp_boost = 50; - break; - case 354: - hp_boost = 50; - break; - case 355: - hp_boost = 50; - break; - case 356: - hp_boost = 50; - break; - case 357: - hp_boost = 50; - break; - case 358: - hp_boost = 50; - break; - case 359: - hp_boost = 50; - break; - case 360: - hp_boost = 50; - break; - case 361: - hp_boost = 51; - break; - case 362: - hp_boost = 51; - break; - case 363: - hp_boost = 51; - break; - case 364: - hp_boost = 51; - break; - case 365: - hp_boost = 51; - break; - case 366: - hp_boost = 51; - break; - case 367: - hp_boost = 51; - break; - case 368: - hp_boost = 51; - break; - case 369: - hp_boost = 51; - break; - case 370: - hp_boost = 51; - break; - case 371: - hp_boost = 51; - break; - case 372: - hp_boost = 51; - break; - case 373: - hp_boost = 51; - break; - case 374: - hp_boost = 51; - break; - case 375: - hp_boost = 51; - break; - case 376: - hp_boost = 51; - break; - case 377: - hp_boost = 51; - break; - case 378: - hp_boost = 51; - break; - case 379: - hp_boost = 51; - break; - case 380: - hp_boost = 51; - break; - case 381: - hp_boost = 51; - break; - case 382: - hp_boost = 52; - break; - case 383: - hp_boost = 52; - break; - case 384: - hp_boost = 52; - break; - case 385: - hp_boost = 52; - break; - case 386: - hp_boost = 52; - break; - case 387: - hp_boost = 52; - break; - case 388: - hp_boost = 52; - break; - case 389: - hp_boost = 52; - break; - case 390: - hp_boost = 52; - break; - case 391: - hp_boost = 52; - break; - case 392: - hp_boost = 52; - break; - case 393: - hp_boost = 52; - break; - case 394: - hp_boost = 52; - break; - case 395: - hp_boost = 52; - break; - case 396: - hp_boost = 52; - break; - case 397: - hp_boost = 52; - break; - case 398: - hp_boost = 52; - break; - case 399: - hp_boost = 52; - break; - case 400: - hp_boost = 52; - break; - case 401: - hp_boost = 52; - break; - case 402: - hp_boost = 52; - break; - case 403: - hp_boost = 52; - break; - case 404: - hp_boost = 52; - break; - case 405: - hp_boost = 53; - break; - case 406: - hp_boost = 53; - break; - case 407: - hp_boost = 53; - break; - case 408: - hp_boost = 53; - break; - case 409: - hp_boost = 53; - break; - case 410: - hp_boost = 53; - break; - case 411: - hp_boost = 53; - break; - case 412: - hp_boost = 53; - break; - case 413: - hp_boost = 53; - break; - case 414: - hp_boost = 53; - break; - case 415: - hp_boost = 53; - break; - case 416: - hp_boost = 53; - break; - case 417: - hp_boost = 53; - break; - case 418: - hp_boost = 53; - break; - case 419: - hp_boost = 53; - break; - case 420: - hp_boost = 53; - break; - case 421: - hp_boost = 53; - break; - case 422: - hp_boost = 53; - break; - case 423: - hp_boost = 53; - break; - case 424: - hp_boost = 53; - break; - case 425: - hp_boost = 53; - break; - case 426: - hp_boost = 53; - break; - case 427: - hp_boost = 53; - break; - case 428: - hp_boost = 54; - break; - case 429: - hp_boost = 54; - break; - case 430: - hp_boost = 54; - break; - case 431: - hp_boost = 54; - break; - case 432: - hp_boost = 54; - break; - case 433: - hp_boost = 54; - break; - case 434: - hp_boost = 54; - break; - case 435: - hp_boost = 54; - break; - case 436: - hp_boost = 54; - break; - case 437: - hp_boost = 54; - break; - case 438: - hp_boost = 54; - break; - case 439: - hp_boost = 54; - break; - case 440: - hp_boost = 54; - break; - case 441: - hp_boost = 54; - break; - case 442: - hp_boost = 54; - break; - case 443: - hp_boost = 54; - break; - case 444: - hp_boost = 54; - break; - case 445: - hp_boost = 54; - break; - case 446: - hp_boost = 54; - break; - case 447: - hp_boost = 54; - break; - case 448: - hp_boost = 54; - break; - case 449: - hp_boost = 54; - break; - case 450: - hp_boost = 54; - break; - case 451: - hp_boost = 54; - break; - case 452: - hp_boost = 54; - break; - case 453: - hp_boost = 55; - break; - case 454: - hp_boost = 55; - break; - case 455: - hp_boost = 55; - break; - case 456: - hp_boost = 55; - break; - case 457: - hp_boost = 55; - break; - case 458: - hp_boost = 55; - break; - case 459: - hp_boost = 55; - break; - case 460: - hp_boost = 55; - break; - case 461: - hp_boost = 55; - break; - case 462: - hp_boost = 55; - break; - case 463: - hp_boost = 55; - break; - case 464: - hp_boost = 55; - break; - case 465: - hp_boost = 55; - break; - case 466: - hp_boost = 55; - break; - case 467: - hp_boost = 55; - break; - case 468: - hp_boost = 55; - break; - case 469: - hp_boost = 55; - break; - case 470: - hp_boost = 55; - break; - case 471: - hp_boost = 55; - break; - case 472: - hp_boost = 55; - break; - case 473: - hp_boost = 55; - break; - case 474: - hp_boost = 55; - break; - case 475: - hp_boost = 55; - break; - case 476: - hp_boost = 55; - break; - case 477: - hp_boost = 55; - break; - case 478: - hp_boost = 55; - break; - case 479: - hp_boost = 55; - break; - case 480: - hp_boost = 56; - break; - case 481: - hp_boost = 56; - break; - case 482: - hp_boost = 56; - break; - case 483: - hp_boost = 56; - break; - case 484: - hp_boost = 56; - break; - case 485: - hp_boost = 56; - break; - case 486: - hp_boost = 56; - break; - case 487: - hp_boost = 56; - break; - case 488: - hp_boost = 56; - break; - case 489: - hp_boost = 56; - break; - case 490: - hp_boost = 56; - break; - case 491: - hp_boost = 56; - break; - case 492: - hp_boost = 56; - break; - case 493: - hp_boost = 56; - break; - case 494: - hp_boost = 56; - break; - case 495: - hp_boost = 56; - break; - case 496: - hp_boost = 56; - break; - case 497: - hp_boost = 56; - break; - case 498: - hp_boost = 56; - break; - case 499: - hp_boost = 56; - break; - case 500: - hp_boost = 56; - break; - case 501: - hp_boost = 56; - break; - case 502: - hp_boost = 56; - break; - case 503: - hp_boost = 56; - break; - case 504: - hp_boost = 56; - break; - case 505: - hp_boost = 56; - break; - case 506: - hp_boost = 56; - break; - case 507: - hp_boost = 56; - break; - case 508: - hp_boost = 57; - break; - case 509: - hp_boost = 57; - break; - case 510: - hp_boost = 57; - break; - case 511: - hp_boost = 57; - break; - case 512: - hp_boost = 57; - break; - case 513: - hp_boost = 57; - break; - case 514: - hp_boost = 57; - break; - case 515: - hp_boost = 57; - break; - case 516: - hp_boost = 57; - break; - case 517: - hp_boost = 57; - break; - case 518: - hp_boost = 57; - break; - case 519: - hp_boost = 57; - break; - case 520: - hp_boost = 57; - break; - case 521: - hp_boost = 57; - break; - case 522: - hp_boost = 57; - break; - case 523: - hp_boost = 57; - break; - case 524: - hp_boost = 57; - break; - case 525: - hp_boost = 57; - break; - case 526: - hp_boost = 57; - break; - case 527: - hp_boost = 57; - break; - case 528: - hp_boost = 57; - break; - case 529: - hp_boost = 57; - break; - case 530: - hp_boost = 57; - break; - case 531: - hp_boost = 57; - break; - case 532: - hp_boost = 57; - break; - case 533: - hp_boost = 57; - break; - case 534: - hp_boost = 57; - break; - case 535: - hp_boost = 57; - break; - case 536: - hp_boost = 57; - break; - case 537: - hp_boost = 58; - break; - case 538: - hp_boost = 58; - break; - case 539: - hp_boost = 58; - break; - case 540: - hp_boost = 58; - break; - case 541: - hp_boost = 58; - break; - case 542: - hp_boost = 58; - break; - case 543: - hp_boost = 58; - break; - case 544: - hp_boost = 58; - break; - case 545: - hp_boost = 58; - break; - case 546: - hp_boost = 58; - break; - case 547: - hp_boost = 58; - break; - case 548: - hp_boost = 58; - break; - case 549: - hp_boost = 58; - break; - case 550: - hp_boost = 58; - break; - case 551: - hp_boost = 58; - break; - case 552: - hp_boost = 58; - break; - case 553: - hp_boost = 58; - break; - case 554: - hp_boost = 58; - break; - case 555: - hp_boost = 58; - break; - case 556: - hp_boost = 58; - break; - case 557: - hp_boost = 58; - break; - case 558: - hp_boost = 58; - break; - case 559: - hp_boost = 58; - break; - case 560: - hp_boost = 58; - break; - case 561: - hp_boost = 58; - break; - case 562: - hp_boost = 58; - break; - case 563: - hp_boost = 58; - break; - case 564: - hp_boost = 58; - break; - case 565: - hp_boost = 58; - break; - case 566: - hp_boost = 58; - break; - case 567: - hp_boost = 58; - break; - case 568: - hp_boost = 59; - break; - case 569: - hp_boost = 59; - break; - case 570: - hp_boost = 59; - break; - case 571: - hp_boost = 59; - break; - case 572: - hp_boost = 59; - break; - case 573: - hp_boost = 59; - break; - case 574: - hp_boost = 59; - break; - case 575: - hp_boost = 59; - break; - case 576: - hp_boost = 59; - break; - case 577: - hp_boost = 59; - break; - case 578: - hp_boost = 59; - break; - case 579: - hp_boost = 59; - break; - case 580: - hp_boost = 59; - break; - case 581: - hp_boost = 59; - break; - case 582: - hp_boost = 59; - break; - case 583: - hp_boost = 59; - break; - case 584: - hp_boost = 59; - break; - case 585: - hp_boost = 59; - break; - case 586: - hp_boost = 59; - break; - case 587: - hp_boost = 59; - break; - case 588: - hp_boost = 59; - break; - case 589: - hp_boost = 59; - break; - case 590: - hp_boost = 59; - break; - case 591: - hp_boost = 59; - break; - case 592: - hp_boost = 59; - break; - case 593: - hp_boost = 59; - break; - case 594: - hp_boost = 59; - break; - case 595: - hp_boost = 59; - break; - case 596: - hp_boost = 59; - break; - case 597: - hp_boost = 59; - break; - case 598: - hp_boost = 59; - break; - case 599: - hp_boost = 59; - break; - default: - hp_boost = 60; - break; - } - return new AttributeModifier(mod_id, "detravlevelup", hp_boost, 0); - } - - static boolean inited = false; - - public static void register() { - if (!inited) { - inited = true; - DetravLevelUpEvent handler = new DetravLevelUpEvent(); - MinecraftForge.EVENT_BUS.register(handler); - FMLCommonHandler.instance().bus().register(handler); - } - } -} diff --git a/src/main/java/com/detrav/gui/DetravPortableAnvilGui.java b/src/main/java/com/detrav/gui/DetravPortableAnvilGui.java deleted file mode 100644 index ba1f63562b..0000000000 --- a/src/main/java/com/detrav/gui/DetravPortableAnvilGui.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.detrav.gui; - -import com.detrav.gui.containers.DetravPortableAnvilContainer; -import net.minecraft.client.gui.inventory.GuiContainer; -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.Container; -import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; -import net.minecraft.world.World; -import org.lwjgl.opengl.GL11; - -/** - * Created by Detrav on 30.10.2016. - */ -public class DetravPortableAnvilGui extends GuiContainer { - public static final int GUI_ID = 40; - - private static final ResourceLocation field_147093_u = new ResourceLocation("textures/gui/container/anvil.png"); - - public DetravPortableAnvilGui(InventoryPlayer inventory, World world, ItemStack currentEquippedItem) { - super(new DetravPortableAnvilContainer(inventory,world,currentEquippedItem)); - } - - @Override - protected void drawGuiContainerBackgroundLayer(float p_146976_1_, int p_146976_2_, int p_146976_3_) { - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - this.mc.getTextureManager().bindTexture(field_147093_u); - int k = (this.width - this.xSize) / 2; - int l = (this.height - this.ySize) / 2; - this.drawTexturedModalRect(k, l, 0, 0, this.xSize, this.ySize); - } -} diff --git a/src/main/java/com/detrav/gui/DetravPortableChargerGui.java b/src/main/java/com/detrav/gui/DetravPortableChargerGui.java deleted file mode 100644 index 2b174abc6a..0000000000 --- a/src/main/java/com/detrav/gui/DetravPortableChargerGui.java +++ /dev/null @@ -1,68 +0,0 @@ -package com.detrav.gui; - -import com.detrav.gui.containers.DetravPortableChargerContainer; -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.V; -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; - - ResourceLocation location = null; - private String mName = "Portable Charger"; - public static long charge = 0; - //ItemStack mItem = null; - DetravPortableChargerContainer container = null; - private ItemStack mItem; - - public DetravPortableChargerGui(InventoryPlayer player, World aWorld, ItemStack aStack) { - super(new DetravPortableChargerContainer(player, aWorld, aStack)); - container = (DetravPortableChargerContainer) inventorySlots; - location = new ResourceLocation(RES_PATH_GUI + "1by1.png"); - mItem = container.mItem; - if (mItem != null) { - charge = DetravMetaGeneratedTool01.INSTANCE.getRealCharge(mItem); - } - } - - @Override - protected void drawGuiContainerForegroundLayer(int par1, int par2) { - fontRendererObj.drawString(mName, 8, 4, 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.getSecondaryMaterial(mItem) != null) { - short[] tColors = DetravMetaGeneratedTool01.getSecondaryMaterial(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); - } -} diff --git a/src/main/java/com/detrav/gui/containers/DetravPortableAnvilContainer.java b/src/main/java/com/detrav/gui/containers/DetravPortableAnvilContainer.java deleted file mode 100644 index 8ea738df2c..0000000000 --- a/src/main/java/com/detrav/gui/containers/DetravPortableAnvilContainer.java +++ /dev/null @@ -1,84 +0,0 @@ -package com.detrav.gui.containers; - -import com.detrav.items.DetravMetaGeneratedTool01; -import com.detrav.utils.PortableAnvilInventory; -import gregtech.api.gui.GT_Slot_Output; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.*; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; -import gregtech.common.items.armor.gui.SlotLocked; - -/** - * Created by Detrav on 30.10.2016. - */ -public class DetravPortableAnvilContainer extends Container { - - public InventoryPlayer inventoryPlayer; - public IInventory slots; - ItemStack stack; - World worldObj; - - public DetravPortableAnvilContainer(InventoryPlayer inventory, World world, ItemStack currentEquippedItem) { - worldObj = world; - inventoryPlayer = inventory; - stack = currentEquippedItem; - slots = new PortableAnvilInventory(stack,"Item", false, 3); - - this.addSlotToContainer(new Slot(this.slots, 0, 27, 47)); - this.addSlotToContainer(new Slot(this.slots, 1, 76, 47)); - this.addSlotToContainer(new GT_Slot_Output(this.slots, 2, 134, 47)); - - slots.setInventorySlotContents(1, DetravMetaGeneratedTool01.INSTANCE.getItemStackFromDetravData(stack)); - - - for (int i = 0; i < 3; ++i) { - for (int j = 0; j < 9; ++j) { - this.addSlotToContainer(new Slot(inventory, j + i * 9 + 9, 8 + j * 18, 84 + i * 18)); - } - } - - for (int i = 0; i < 9; ++i) { - ItemStack stackInSlot = inventoryPlayer.getStackInSlot(i); - if (currentEquippedItem != null && stackInSlot != null && currentEquippedItem == stackInSlot) { - addSlotToContainer(new SlotLocked(inventoryPlayer, i, 8 + i * 18, 142)); - } else { - this.addSlotToContainer(new Slot(inventory, i, 8 + i * 18, 142)); - } - } - } - - @Override - public ItemStack transferStackInSlot(EntityPlayer par1EntityPlayer, int par2) { - return null; - } - - public void onContainerClosed(EntityPlayer p_75134_1_) { - super.onContainerClosed(p_75134_1_); - if (!this.worldObj.isRemote) { - ItemStack itemstack = this.slots.getStackInSlot(0); - - if (itemstack != null) { - p_75134_1_.dropPlayerItemWithRandomChoice(itemstack, false); - } - itemstack = this.slots.getStackInSlot(1); - if (stack == null || !DetravMetaGeneratedTool01.INSTANCE.setItemStackToDetravData(stack, itemstack)) { - p_75134_1_.dropPlayerItemWithRandomChoice(itemstack, false); - } - itemstack = this.slots.getStackInSlot(2); - - if (itemstack != null) { - p_75134_1_.dropPlayerItemWithRandomChoice(itemstack, false); - } - //itemstack.writeToNBT() - } - } - - - - @Override - public boolean canInteractWith(EntityPlayer p_75145_1_) { - return true; - } -}
\ No newline at end of file diff --git a/src/main/java/com/detrav/gui/containers/DetravPortableChargerContainer.java b/src/main/java/com/detrav/gui/containers/DetravPortableChargerContainer.java deleted file mode 100644 index 6111a31418..0000000000 --- a/src/main/java/com/detrav/gui/containers/DetravPortableChargerContainer.java +++ /dev/null @@ -1,130 +0,0 @@ -package com.detrav.gui.containers; - -import com.detrav.items.DetravMetaGeneratedTool01; -import com.detrav.net.DetravNetwork; -import com.detrav.net.DetravPortableChargerPacket01; -import gregtech.api.items.GT_MetaBase_Item; -import gregtech.api.util.GT_ModHandler; -import gregtech.common.items.armor.gui.SlotLocked; -import net.minecraft.entity.Entity; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.EntityPlayerMP; -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 07.04.2016. - */ -public class DetravPortableChargerContainer extends Container { - public IInventory slots = new InventoryCrafting(this, 1, 1); - public ItemStack mItem; - private World worldObj; - - public DetravPortableChargerContainer(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; - } - - - public void onUpdate(GT_MetaBase_Item aItem, ItemStack aStack, World aWorld, Entity aPlayer, int aTimer) { - if(mItem==null) return; - - ItemStack item = this.slots.getStackInSlot(0); - if(item == null) return; - - if(GT_ModHandler.isElectricItem(item)); - - //GT_ModHandler.ch - - for(int forTry = 0; forTry<20;forTry++){ - Long[] selfStats = DetravMetaGeneratedTool01.INSTANCE.getElectricStats(mItem); - if (selfStats == null) return; - - long selfCharge = DetravMetaGeneratedTool01.INSTANCE.getRealCharge(mItem); - if (selfCharge <= 0) return; - - long loss = DetravMetaGeneratedTool01.INSTANCE.getElectricStatsLoss(mItem); - if (loss < 0) return; - - long energyToTransfer = (selfStats[1] - loss) * aTimer; - - int removeEnergy = GT_ModHandler.chargeElectricItem(item, (int) energyToTransfer, Integer.MAX_VALUE, false, false); - if (removeEnergy == 0) return; - GT_ModHandler.dischargeElectricItem(mItem, (int) (removeEnergy + loss * aTimer), Integer.MAX_VALUE, false, false, true); - - if (aWorld.isRemote) return; - if (aPlayer instanceof EntityPlayerMP) { - DetravPortableChargerPacket01 packet = new DetravPortableChargerPacket01(); - packet.charge = selfCharge - removeEnergy + loss * aTimer; - DetravNetwork.INSTANCE.sendToPlayer(packet, (EntityPlayerMP) aPlayer); - - //crafters - } - }; - //long max = DetravMetaGeneratedTool01.getToolMaxDamage(mItem); - //double p = ((double)selfCharge)/((double)selfStats[0]); - //DetravMetaGeneratedTool01.setToolDamage(mItem,(long) (max * p) + 200); - //long - } - - /*@Override - public ItemStack transferStackInSlot(EntityPlayer par1EntityPlayer, int par2) { - ItemStack result = super.transferStackInSlot(par1EntityPlayer,par2); - par1EntityPlayer.addChatMessage(new ChatComponentText(result.getDisplayName())); - - return result; - }*/ -}
\ No newline at end of file diff --git a/src/main/java/com/detrav/items/DetravMetaGeneratedItem.java b/src/main/java/com/detrav/items/DetravMetaGeneratedItem.java deleted file mode 100644 index 90c00fb8d7..0000000000 --- a/src/main/java/com/detrav/items/DetravMetaGeneratedItem.java +++ /dev/null @@ -1,175 +0,0 @@ -package com.detrav.items; - -/** - * Created by wital_000 on 19.03.2016. - */ -import com.detrav.enums.DetravSimpleItems; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import gregtech.api.GregTech_API; -import gregtech.api.enums.Materials; -//import gregtech.api.enums.OrePrefixes; -import gregtech.api.interfaces.IIconContainer; -import gregtech.api.items.GT_MetaGenerated_Item; -import gregtech.api.util.GT_LanguageManager; -import gregtech.api.util.GT_OreDictUnificator; -import gregtech.api.util.GT_Utility; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; - -import java.util.Arrays; -import java.util.List; - -import static gregtech.api.enums.GT_Values.M; - -/** - * @author Gregorius Techneticies - * <p/> - * One Item for everything! - * <p/> - * This brilliant Item Class is used for automatically generating all possible variations of Material Items, like Dusts, Ingots, Gems, Plates and similar. - * It saves me a ton of work, when adding Items, because I always have to make a new Item SubType for each OreDict Prefix, when adding a new Material. - * <p/> - * As you can see, up to 32766 Items can be generated using this Class. And the last 766 Items can be custom defined, just to save space and MetaData. - * <p/> - * These Items can also have special RightClick abilities, electric Charge or even be set to become a Food alike Item. - */ -public abstract class DetravMetaGeneratedItem extends GT_MetaGenerated_Item { - - protected final DetravSimpleItems[] mGeneratedItemList; - - - public DetravMetaGeneratedItem(String aUnlocalized, DetravSimpleItems... aGeneratedItemList) { - super(aUnlocalized, (short) 32000, (short) 766); - mGeneratedItemList = Arrays.copyOf(aGeneratedItemList, 32); - - for (int i = 0; i < 32000; i++) { - DetravSimpleItems tPrefix = mGeneratedItemList[i / 1000]; - if (tPrefix == null) continue; - Materials tMaterial = GregTech_API.sGeneratedMaterials[i % 1000]; - if (tMaterial == null) continue; - if (doesMaterialAllowGeneration(tPrefix, tMaterial)) { - ItemStack tStack = new ItemStack(this, 1, i); - GT_LanguageManager.addStringLocalization(getUnlocalizedName(tStack) + ".name", getDefaultLocalization(tPrefix, tMaterial, i)); - GT_LanguageManager.addStringLocalization(getUnlocalizedName(tStack) + ".tooltip", tMaterial.getToolTip(tPrefix.getOrePrefixes().mMaterialAmount / M)); - //Не знаю можно ли регистрировать, т.к. уже должен быть зареганы паренты с моего класса - if (tPrefix.mIsUnificatable) { - GT_OreDictUnificator.set(tPrefix.getOrePrefixes(), tMaterial, tStack); - } else { - GT_OreDictUnificator.registerOre(tPrefix.get(tMaterial), tStack); - }/* - if ((tPrefix == OrePrefixes.stick || tPrefix == OrePrefixes.wireFine || tPrefix == OrePrefixes.ingot) && (tMaterial == Materials.Lead || tMaterial == Materials.Tin || tMaterial == Materials.SolderingAlloy)) { - GregTech_API.sSolderingMetalList.add(tStack); - }*/ - } - } - } - - /* ---------- OVERRIDEABLE FUNCTIONS ---------- */ - - /** - * @return the Color Modulation the Material is going to be rendered with. - */ - @Override - public short[] getRGBa(ItemStack aStack) { - Materials tMaterial = GregTech_API.sGeneratedMaterials[getDamage(aStack) % 1000]; - return tMaterial == null ? Materials._NULL.mRGBa : tMaterial.mRGBa; - } - - /** - * @param aPrefix this can be null, you have to return false in that case - * @param aMaterial this can be null, you have to return false in that case - * @return if this Item should be generated and visible. - */ - public boolean doesMaterialAllowGeneration(DetravSimpleItems aPrefix, Materials aMaterial) { - // You have to check for at least these Conditions in every Case! So add a super Call like the following for this before executing your Code: - // if (!super.doesMaterialAllowGeneration(aPrefix, aMaterial)) return false; - return aPrefix != null && aMaterial != null && aPrefix.getOrePrefixes().doGenerateItem(aMaterial); - } - - /* ---------- OVERRIDEABLE FUNCTIONS ---------- */ - - /** - * @param aPrefix the OreDict Prefix - * @param aMaterial the Material - * @param aMetaData a Index from [0 - 31999] - * @return the Localized Name when default LangFiles are used. - */ - public String getDefaultLocalization(DetravSimpleItems aPrefix, Materials aMaterial, int aMetaData) { - return aPrefix.getDefaultLocalNameForItem(aMaterial); - } - - /** - * @param aMetaData a Index from [0 - 31999] - * @param aMaterial the Material - * @return an Icon Container for the Item Display. - */ - public IIconContainer getIconContainer(int aMetaData, Materials aMaterial) { - return mGeneratedItemList[aMetaData / 1000] != null && mGeneratedItemList[aMetaData / 1000].getOrePrefixes().mTextureIndex >= 0 ? aMaterial.mIconSet.mTextures[mGeneratedItemList[aMetaData / 1000].getOrePrefixes().mTextureIndex] : null; - } - - /** - * @param aPrefix always != null - * @param aMaterial always != null - * @param aDoShowAllItems this is the Configuration Setting of the User, if he wants to see all the Stuff like Tiny Dusts or Crushed Ores as well. - * @return if this Item should be visible in NEI or Creative - */ - public boolean doesShowInCreative(DetravSimpleItems aPrefix, Materials aMaterial, boolean aDoShowAllItems) { - return true; - } - - /* ---------- INTERNAL OVERRIDES ---------- */ - - @Override - public ItemStack getContainerItem(ItemStack aStack) { - int aDamage = aStack.getItemDamage(); - if (aDamage < 32000 && aDamage >= 0) { - Materials aMaterial = GregTech_API.sGeneratedMaterials[aDamage % 1000]; - if (aMaterial != null && aMaterial != Materials.Empty && aMaterial != Materials._NULL) { - DetravSimpleItems aPrefix = mGeneratedItemList[aDamage / 1000]; - if (aPrefix != null) return GT_Utility.copyAmount(1, aPrefix.mContainerItem); - } - } - return null; - } - - @Override - public final IIconContainer getIconContainer(int aMetaData) { - return GregTech_API.sGeneratedMaterials[aMetaData % 1000] == null ? null : getIconContainer(aMetaData, GregTech_API.sGeneratedMaterials[aMetaData % 1000]); - } - - @Override - @SideOnly(Side.CLIENT) - public final void getSubItems(Item var1, CreativeTabs aCreativeTab, List aList) { - for (int i = 0; i < 32000; i++) - if (doesMaterialAllowGeneration(mGeneratedItemList[i / 1000], GregTech_API.sGeneratedMaterials[i % 1000]) && doesShowInCreative(mGeneratedItemList[i / 1000], GregTech_API.sGeneratedMaterials[i % 1000], GregTech_API.sDoShowAllItemsInCreative)) { - ItemStack tStack = new ItemStack(this, 1, i); - isItemStackUsable(tStack); - aList.add(tStack); - } - super.getSubItems(var1, aCreativeTab, aList); - } - - @Override - public final IIcon getIconFromDamage(int aMetaData) { - if (aMetaData < 0) return null; - if (aMetaData < 32000) { - Materials tMaterial = GregTech_API.sGeneratedMaterials[aMetaData % 1000]; - if (tMaterial == null) return null; - IIconContainer tIcon = getIconContainer(aMetaData, tMaterial); - if (tIcon != null) return tIcon.getIcon(); - return null; - } - return aMetaData - 32000 < mIconList.length ? mIconList[aMetaData - 32000][0] : null; - } - - @Override - public int getItemStackLimit(ItemStack aStack) { - int tDamage = getDamage(aStack); - if (tDamage < 32000 && mGeneratedItemList[tDamage / 1000] != null) - return Math.min(super.getItemStackLimit(aStack), mGeneratedItemList[tDamage / 1000].mDefaultStackSize); - return super.getItemStackLimit(aStack); - } -}
\ No newline at end of file diff --git a/src/main/java/com/detrav/items/DetravMetaGeneratedItem01.java b/src/main/java/com/detrav/items/DetravMetaGeneratedItem01.java deleted file mode 100644 index 8edeb87b30..0000000000 --- a/src/main/java/com/detrav/items/DetravMetaGeneratedItem01.java +++ /dev/null @@ -1,119 +0,0 @@ -package com.detrav.items; - -//import gregtech.api.items.DetravMetaGeneratedItem; - -import com.detrav.DetravScannerMod; -import com.detrav.enums.DetravItemList; -import com.detrav.enums.DetravSimpleItems; -import com.detrav.enums.Textures01; -import gregtech.api.enums.Materials; -import gregtech.api.interfaces.IIconContainer; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.EnumChatFormatting; - -import java.util.List; - -/** - * Created by wital_000 on 19.03.2016. - */ -public class DetravMetaGeneratedItem01 extends DetravMetaGeneratedItem { - - public static DetravMetaGeneratedItem01 INSTANCE; - //private final String mToolTipPurify = GT_LanguageManager.addStringLocalization("metaitem.01.tooltip.purify", "Throw into Cauldron to get clean Dust"); - - public DetravMetaGeneratedItem01() { - super("detrav.metaitem.01", new DetravSimpleItems[]{DetravSimpleItems.toolHeadProPick}); - INSTANCE = this; - this.setCreativeTab(DetravScannerMod.TAB_DETRAV); - int tLastID; - DetravItemList.Shape_Extruder_ProPick.set(addItem(tLastID = 0, "Extruder Shape (Prospector's Pick Head)", "Extruder Shape for making Prospector's Picks", new Object[0])); - DetravItemList.ConfiguredCircuit.set(addItem(tLastID = 1, "Configured Circuit", "", new Object[0])); - //DetravItemList.Anvil.set(addItem(tLastID = 1, "Detrav Anvil","",new Object[0])); - //addItemBehavior(tLastID,new BahaviourDetravAnvil()); - } - - @Override - public final IIconContainer getIconContainer(int aMetaData, Materials aMaterial) { - return mGeneratedItemList[aMetaData / 1000] != null && mGeneratedItemList[aMetaData / 1000].mTextureIndex >= 0 ? Textures01.mTextures[mGeneratedItemList[aMetaData / 1000].mTextureIndex] : null; - } - - public boolean doesShowInCreative(DetravSimpleItems aPrefix, Materials aMaterial, boolean aDoShowAllItems) { - return aDoShowAllItems || !aPrefix.name().startsWith("toolHead"); - } - - public boolean isConfiguredCircuit(ItemStack aStack) { - return aStack.getUnlocalizedName().indexOf("gt.detrav.metaitem.01." + (mOffset + 1)) == 0; - } - - - public void addAdditionalToolTips(List aList, ItemStack aStack, EntityPlayer aPlayer) { - int tOffset = aList.size(); - String name = aStack.getUnlocalizedName(); - String num = name.substring("gt.detrav.metaitem.01.".length()); - int meta = Integer.parseInt(num) - mOffset; - switch (meta) { - case 1: { - NBTTagCompound aNBT = aStack.getTagCompound(); - if (aNBT != null) { - NBTTagCompound detravPosition = aNBT.getCompoundTag("DetravPosition"); - if (detravPosition != null) { - tOffset = addToList(tOffset, aList, detravPosition, "Finished", false); - tOffset = addToList(tOffset, aList, detravPosition, "Percent", true); - tOffset = addToList(tOffset, aList, detravPosition, "XCurrent", true); - tOffset = addToList(tOffset, aList, detravPosition, "ZCurrent", true); - tOffset = addToList(tOffset, aList, detravPosition, "X", "XFrom", "XTo"); - tOffset = addToList(tOffset, aList, detravPosition, "Z", "ZFrom", "ZTo"); - tOffset = addToList(tOffset, aList, detravPosition, "Y", "YFrom", "YTo"); - } - } - } - break; - } - } - - public int addToList(int tOffset, List aList, NBTTagCompound tag, String name, boolean integer) { - if (!tag.hasKey(name)) - return tOffset; - if (integer) { - int value = tag.getInteger(name); - aList.add(tOffset, EnumChatFormatting.WHITE + name + " = " + value); - } else { - if (tag.getBoolean(name)) { - aList.add(tOffset, EnumChatFormatting.WHITE + name + EnumChatFormatting.GRAY); - } - } - return tOffset + 1; - } - - - public int addToList(int tOffset, List aList, NBTTagCompound tag, String text, String from, String to) { - String i_from = ""; - String i_to = ""; - boolean noFrom = true; - boolean noTo = true; - if (tag.hasKey(from)) { - i_from = "" + tag.getInteger(from); - noFrom = false; - } - - if (tag.hasKey(to)) { - i_to = "" + tag.getInteger(to); - noTo = false; - } - - if (noFrom && noTo) - return tOffset; - - if (!noFrom && !noTo) - aList.add(tOffset, EnumChatFormatting.WHITE + text + " from " + i_from + " to " + i_to + EnumChatFormatting.GRAY); - else if (noFrom) - aList.add(tOffset, EnumChatFormatting.WHITE + text + " to " + i_to + EnumChatFormatting.GRAY); - else - aList.add(tOffset, EnumChatFormatting.WHITE + text + " from " + i_from + EnumChatFormatting.GRAY); - - - return tOffset + 1; - } -} diff --git a/src/main/java/com/detrav/items/DetravMetaGeneratedTool01.java b/src/main/java/com/detrav/items/DetravMetaGeneratedTool01.java index 2aff81beaf..0289f7eab0 100644 --- a/src/main/java/com/detrav/items/DetravMetaGeneratedTool01.java +++ b/src/main/java/com/detrav/items/DetravMetaGeneratedTool01.java @@ -28,17 +28,9 @@ public class DetravMetaGeneratedTool01 extends GT_MetaGenerated_Tool { public DetravMetaGeneratedTool01() { 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(4, "Smart plunger 1 bucket", "", new DetravToolSmartPlunger(),new Object[] {DetravToolDictNames.craftingToolSmartPlunger},new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 8L), new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 5L)); - addTool(6, "Smart plunger 16 buckets", "", new DetravToolSmartPlunger16(),new Object[] {DetravToolDictNames.craftingToolSmartPlunger},new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 8L), new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 5L)); - addTool(8, "Smart plunger 64 buckets", "", new DetravToolSmartPlunger64(),new Object[] {DetravToolDictNames.craftingToolSmartPlunger},new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 8L), new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 5L)); - addTool(10, "Smart Tree Tap","Changes resin tap",new DetravToolSmartTreeTap(),new Object[] {DetravToolDictNames.craftingToolSmartTreeTap}, new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 5L) ); addTool(100, "Electric Prospector's Scanner (IV)", "", 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 (LuV)", "", 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 (ZPM)", "", 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 Battery 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)); - addTool(108, "Circuit Confugurator", "", new DetravToolCircuitConfigurator(), new Object[]{DetravToolDictNames.craftingToolCictuitConfigurator, new TC_Aspects.TC_AspectStack(TC_Aspects.COGNITIO,10L) }); setCreativeTab(DetravScannerMod.TAB_DETRAV); } @@ -50,7 +42,8 @@ public class DetravMetaGeneratedTool01 extends GT_MetaGenerated_Tool { long tMaxDamage = getToolMaxDamage(aStack); Materials tMaterial = getPrimaryMaterial(aStack); IToolStats tStats = getToolStats(aStack); - int tOffset = aList.size(); //getElectricStats(aStack) != null ? 2 : 1; + int tOffset = aList.size(); + //getElectricStats(aStack) != null ? 2 : 1; if (tStats != null) { String name = aStack.getUnlocalizedName(); String num = name.substring("gt.detrav.metatool.01.".length()); @@ -285,38 +278,16 @@ public class DetravMetaGeneratedTool01 extends GT_MetaGenerated_Tool { public void getDetravSubItems(Item item, CreativeTabs detravCreativeTab, List list) { ItemStack dStack; - - dStack = getToolWithStatsPlus(106, 1, Materials.Tin, Materials.StainlessSteel, new long[]{4 * 100000L, 32L, 1L, -3L}, 1); - setCharge(dStack,4 * 100000L); - list.add(dStack); - dStack = getToolWithStatsPlus(106, 1, Materials.Tin, Materials.StainlessSteel, new long[]{4 * 75000L, 32L, 1L, -3L}, 1); - setCharge(dStack,4 * 75000L); - list.add(dStack); - dStack = getToolWithStatsPlus(106, 1, Materials.Tin, Materials.StainlessSteel, new long[]{4 * 50000L, 32L, 1L, -3L}, 1); - setCharge(dStack,4 * 50000L); - list.add(dStack); - dStack = getToolWithStatsPlus(106, 1, Materials.AnnealedCopper, Materials.Titanium, new long[]{4 * 400000L, 128L, 2L, -3L}, 1); - setCharge(dStack,4 * 400000L); - list.add(dStack); - dStack = getToolWithStatsPlus(106, 1, Materials.AnnealedCopper, Materials.Titanium, new long[]{4 * 300000L, 128L, 2L, -3L}, 1); - setCharge(dStack,4 * 300000L); + //Electric Scanners TODO + dStack = getToolWithStats(100, 1, Materials.Chrome, Materials.TungstenSteel, new long[]{25600000L, 8192L, 5L, -1L}); + setCharge(dStack,25600000L); list.add(dStack); - dStack = getToolWithStatsPlus(106, 1, Materials.AnnealedCopper, Materials.Titanium, new long[]{4 * 200000L, 128L, 2L, -3L}, 1); - setCharge(dStack,4 * 200000L); + dStack = getToolWithStats(102, 1, Materials.Iridium, Materials.TungstenSteel, new long[]{102400000L, 32768L, 6L, -1L}); + setCharge(dStack,102400000L); list.add(dStack); - dStack = getToolWithStatsPlus(106, 1, Materials.Silver, Materials.TungstenSteel, new long[]{4 * 1600000L, 512L, 3L, -3L}, 1); - setCharge(dStack,4 * 1600000L); - list.add(dStack); - dStack = getToolWithStatsPlus(106, 1, Materials.Silver, Materials.TungstenSteel, new long[]{4 * 1200000L, 512L, 3L, -3L}, 1); - setCharge(dStack,4 * 1200000L); - list.add(dStack); - dStack = getToolWithStatsPlus(106, 1, Materials.Silver, Materials.TungstenSteel, new long[]{4 * 800000L, 512L, 3L, -3L}, 1); - setCharge(dStack,4 * 800000L); - list.add(dStack); - - dStack = getToolWithStats(104, 1, Materials.Neutronium, Materials.TungstenSteel, new long[]{1600000L, 512L, 3L, -1L}); - setCharge(dStack,1600000L); + dStack = getToolWithStats(104, 1, Materials.Neutronium, Materials.TungstenSteel, new long[]{409600000L, 131072L, 7L, -1L}); + setCharge(dStack,409600000L); list.add(dStack); } -}
\ No newline at end of file +} diff --git a/src/main/java/com/detrav/items/behaviours/BehaviourDetravConfigurator.java b/src/main/java/com/detrav/items/behaviours/BehaviourDetravConfigurator.java deleted file mode 100644 index e55d3c8c31..0000000000 --- a/src/main/java/com/detrav/items/behaviours/BehaviourDetravConfigurator.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.detrav.items.behaviours; - -import com.detrav.enums.DetravItemList; -import gregtech.api.items.GT_MetaBase_Item; -import gregtech.common.items.behaviors.Behaviour_None; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.world.World; -import net.minecraft.world.chunk.IChunkProvider; - -/** - * Created by Detrav on 29.04.2017. - */ -public class BehaviourDetravConfigurator extends Behaviour_None { - public ItemStack onItemRightClick(GT_MetaBase_Item aItem, ItemStack aStack, World aWorld, EntityPlayer aPlayer) { - - InventoryPlayer inv = aPlayer.inventory; - if (inv != null) { - for (int i = 0; i < inv.mainInventory.length; i++) { - if (inv.mainInventory[i].getUnlocalizedName().startsWith("gt.integrated_circuit") - && inv.mainInventory[i].stackSize == 1) { - - int circuit_config = inv.mainInventory[i].getItemDamage(); - if(circuit_config > 5) - circuit_config = 5; - //circuit_config *= 2; - circuit_config++; - inv.mainInventory[i] = DetravItemList.ConfiguredCircuit.get(1); - ItemStack aCircuit = inv.mainInventory[i]; - - //in here if circuit is empty set data to chunk - - - NBTTagCompound aNBT = aCircuit.getTagCompound(); - if (aNBT == null) { - aNBT = new NBTTagCompound(); - NBTTagCompound detravPosition = new NBTTagCompound(); - aNBT.setTag("DetravPosition", detravPosition); - aCircuit.setTagCompound(aNBT); - } - - NBTTagCompound detravPosition = aNBT.getCompoundTag("DetravPosition"); - if (detravPosition == null) { - detravPosition = new NBTTagCompound(); - aNBT.setTag("DetravPosition", detravPosition); - } - - - int x_from = ((((int) aPlayer.posX) >> 4) - circuit_config + 1) * 16; - int x_to = ((((int) aPlayer.posX) >> 4) + circuit_config) * 16; - int x_current = x_from; - int z_from = ((((int) aPlayer.posZ) >> 4) - circuit_config + 1) * 16; - int z_to = ((((int) aPlayer.posZ) >> 4) + circuit_config) * 16; - int z_current = z_from; - - - int y_from = (int) aPlayer.posY + 1; - int y_to = (int) aPlayer.posY - 10; - - detravPosition.setInteger("XFrom", x_from); - detravPosition.setInteger("XTo", x_to); - detravPosition.setInteger("XCurrent", x_current); - detravPosition.setInteger("ZFrom", z_from); - detravPosition.setInteger("ZTo", z_to); - detravPosition.setInteger("ZCurrent", z_current); - detravPosition.setInteger("YFrom", y_from); - detravPosition.setInteger("YTo", y_to); - return super.onItemRightClick(aItem, aStack, aWorld, aPlayer); - } - } - - } - return super.onItemRightClick(aItem, aStack, aWorld, aPlayer); - - } -} diff --git a/src/main/java/com/detrav/items/behaviours/BehaviourDetravPortableCharger.java b/src/main/java/com/detrav/items/behaviours/BehaviourDetravPortableCharger.java deleted file mode 100644 index 08aa16a79c..0000000000 --- a/src/main/java/com/detrav/items/behaviours/BehaviourDetravPortableCharger.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.detrav.items.behaviours; - -import com.detrav.DetravScannerMod; -import com.detrav.gui.containers.DetravPortableChargerContainer; -import com.detrav.items.DetravMetaGeneratedTool01; -import gregtech.api.items.GT_MetaBase_Item; -import gregtech.common.items.behaviors.Behaviour_None; -import net.minecraft.entity.Entity; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; - -/** - * Created by wital_000 on 07.04.2016. - */ -public class BehaviourDetravPortableCharger extends Behaviour_None { - - public ItemStack onItemRightClick(GT_MetaBase_Item aItem, ItemStack aStack, World aWorld, EntityPlayer aPlayer) { - DetravScannerMod.proxy.openPortableChargerGui(aPlayer); - return super.onItemRightClick(aItem, aStack, aWorld, aPlayer); - //aPlayer.openContainer - } - - public void onUpdate(GT_MetaBase_Item aItem, ItemStack aStack, World aWorld, Entity aPlayer, int aTimer, boolean aIsInHand) { - if(!aIsInHand) return; - //if(aStack.getm) - if(aWorld.isRemote) return; - if(aPlayer instanceof EntityPlayer) - { - EntityPlayer player = (EntityPlayer)aPlayer; - if(player.openContainer !=null) - { - if(player.openContainer instanceof DetravPortableChargerContainer) - { - DetravPortableChargerContainer container = (DetravPortableChargerContainer)player.openContainer; - container.onUpdate(aItem,aStack,aWorld,aPlayer,1); - } - Long[] selfStats = DetravMetaGeneratedTool01.INSTANCE.getElectricStats(aStack); - if(selfStats == null) return; - - long selfCharge = DetravMetaGeneratedTool01.INSTANCE.getRealCharge(aStack); - if(selfCharge <0) return; - //update info - //long max = DetravMetaGeneratedTool01.getToolMaxDamage(aStack); - //double p = ((double)selfCharge)/((double)selfStats[0]); - //DetravMetaGeneratedTool01.setToolDamage(aStack,(long) (max * p) + 200); - } - } - } - -} diff --git a/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolElectricProPick.java b/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolElectricProPick.java index c500795e5d..f352767466 100644 --- a/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolElectricProPick.java +++ b/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolElectricProPick.java @@ -42,7 +42,6 @@ public class BehaviourDetravToolElectricProPick extends BehaviourDetravToolProPi if (!aWorld.isRemote) { int data = DetravMetaGeneratedTool01.INSTANCE.getToolGTDetravData(aStack).intValue(); - //Проверяем если нажат шифт if (aPlayer.isSneaking()) { data++; if (data > 3) data = 0; diff --git a/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolPortableAnvil.java b/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolPortableAnvil.java deleted file mode 100644 index 2ede8057f5..0000000000 --- a/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolPortableAnvil.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.detrav.items.behaviours; - -import com.detrav.DetravScannerMod; -import gregtech.api.items.GT_MetaBase_Item; -import gregtech.common.items.behaviors.Behaviour_None; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; - -/** - * Created by Detrav on 30.10.2016. - */ -public class BehaviourDetravToolPortableAnvil extends Behaviour_None { - - public ItemStack onItemRightClick(GT_MetaBase_Item aItem, ItemStack aStack, World aWorld, EntityPlayer aPlayer) { - DetravScannerMod.proxy.openPortableAnvilGui(aPlayer); - return super.onItemRightClick(aItem, aStack, aWorld, aPlayer); - //aPlayer.openContainer - } -} diff --git a/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolSmartPlunger.java b/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolSmartPlunger.java deleted file mode 100644 index 0e7331ad6b..0000000000 --- a/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolSmartPlunger.java +++ /dev/null @@ -1,90 +0,0 @@ -package com.detrav.items.behaviours; - -import com.detrav.items.DetravMetaGeneratedTool01; -import gregtech.api.GregTech_API; -import gregtech.api.interfaces.metatileentity.IMetaTileEntity; -import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import gregtech.api.items.GT_MetaBase_Item; -import gregtech.api.items.GT_MetaGenerated_Tool; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicTank; -import gregtech.api.util.GT_Utility; -import gregtech.common.items.behaviors.Behaviour_None; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fluids.IFluidHandler; - -/** - * Created by Detrav on 11.12.2016. - */ -public class BehaviourDetravToolSmartPlunger extends Behaviour_None { - - protected final int mCosts; - protected final int mFluidSpace; - - public BehaviourDetravToolSmartPlunger(int aCosts,int fluidSpace) { - mCosts = aCosts; - mFluidSpace = fluidSpace; - } - - public boolean onItemUseFirst(GT_MetaBase_Item aItem, ItemStack aStack, EntityPlayer aPlayer, World aWorld, int aX, int aY, int aZ, int aSide, float hitX, float hitY, float hitZ) { - if (aWorld.isRemote) { - return false; - } - FluidStack fs = DetravMetaGeneratedTool01.INSTANCE.getFluidStackFromDetravData(aStack); - boolean containts = fs!=null && fs.amount >0; - if(containts) { - TileEntity aTileEntity = aWorld.getTileEntity(aX, aY, aZ); - if ((aTileEntity instanceof IFluidHandler)) { - for (ForgeDirection tDirection : ForgeDirection.VALID_DIRECTIONS) { - if (((IFluidHandler) aTileEntity).fill(tDirection, fs, false) > 0) { - if ((aPlayer.capabilities.isCreativeMode) || (((GT_MetaGenerated_Tool) aItem).doDamage(aStack, this.mCosts))) { - int amount = ((IFluidHandler) aTileEntity).fill(tDirection, fs, true); - //fs = ((IFluidHandler) aTileEntity).drain(tDirection, 1000, true); - fs.amount -= amount; - GT_Utility.sendSoundToPlayers(aWorld, (String) GregTech_API.sSoundList.get(Integer.valueOf(101)), 1.0F, -1.0F, aX, aY, aZ); - if (fs.amount > 0) - DetravMetaGeneratedTool01.INSTANCE.setFluidStackToDetravData(aStack, fs); - else - DetravMetaGeneratedTool01.INSTANCE.setFluidStackToDetravData(aStack, null); - return true; - } - } - } - } - } - else { - TileEntity aTileEntity = aWorld.getTileEntity(aX, aY, aZ); - if ((aTileEntity instanceof IFluidHandler)) { - for (ForgeDirection tDirection : ForgeDirection.VALID_DIRECTIONS) { - if (((IFluidHandler) aTileEntity).drain(tDirection, mFluidSpace, false) != null) { - if ((aPlayer.capabilities.isCreativeMode) || (((GT_MetaGenerated_Tool) aItem).doDamage(aStack, this.mCosts))) { - fs = ((IFluidHandler) aTileEntity).drain(tDirection, mFluidSpace, true); - GT_Utility.sendSoundToPlayers(aWorld, (String) GregTech_API.sSoundList.get(Integer.valueOf(101)), 1.0F, -1.0F, aX, aY, aZ); - DetravMetaGeneratedTool01.INSTANCE.setFluidStackToDetravData(aStack,fs); - return true; - } - } - } - } - if (aTileEntity instanceof IGregTechTileEntity) { - IGregTechTileEntity tTileEntity = (IGregTechTileEntity) aTileEntity; - IMetaTileEntity mTileEntity = tTileEntity.getMetaTileEntity(); - if (mTileEntity instanceof GT_MetaTileEntity_BasicTank) { - GT_MetaTileEntity_BasicTank machine = (GT_MetaTileEntity_BasicTank) mTileEntity; - if (machine.mFluid != null && machine.mFluid.amount > 0) { - fs = machine.mFluid.copy(); - if (fs.amount > mFluidSpace) fs.amount = mFluidSpace; - machine.mFluid.amount = machine.mFluid.amount - Math.min(machine.mFluid.amount, mFluidSpace); - DetravMetaGeneratedTool01.INSTANCE.setFluidStackToDetravData(aStack,fs); - } - return true; - } - } - } - return false; - } -}
\ No newline at end of file diff --git a/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolTreeTap.java b/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolTreeTap.java deleted file mode 100644 index a49b5b28de..0000000000 --- a/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolTreeTap.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.detrav.items.behaviours; - -import com.detrav.items.DetravMetaGeneratedTool01; -import gregtech.api.items.GT_MetaBase_Item; -import gregtech.common.items.behaviors.Behaviour_None; -import ic2.core.block.BlockRubWood; -import net.minecraft.block.Block; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; - -/** - * Created by Detrav on 01.04.2017. - */ -public class BehaviourDetravToolTreeTap extends Behaviour_None { - - public boolean onItemUseFirst(GT_MetaBase_Item aItem, ItemStack aStack, EntityPlayer aPlayer, World aWorld, int aX, int aY, int aZ, int aSide, float hitX, float hitY, float hitZ) { - if (aWorld.isRemote) { - return false; - } - Block b = aWorld.getBlock(aX,aY,aZ); - if(b instanceof BlockRubWood) - { - int startPos = aY; - for(int i = aY; i> aY-10 && i> 1 && aWorld.getBlock(aX,i,aZ) instanceof BlockRubWood; i--) - startPos = i; - - for(int i = startPos; i< aY + 10; i++) - { - if(!(aWorld.getBlock(aX,i,aZ) instanceof BlockRubWood)) - break; - if(i == aY) - { - aWorld.setBlockMetadataWithNotify(aX,i,aZ,aSide,2); - } - else - { - aWorld.setBlockMetadataWithNotify(aX,i,aZ,1,2); - } - } - - ((DetravMetaGeneratedTool01)aItem).doDamage(aStack, 100); - return true; - } - return false; - } -}
\ No newline at end of file diff --git a/src/main/java/com/detrav/items/processing/ProcessingDetravPortableCharger.java b/src/main/java/com/detrav/items/processing/ProcessingDetravPortableCharger.java deleted file mode 100644 index 079a0a4a06..0000000000 --- a/src/main/java/com/detrav/items/processing/ProcessingDetravPortableCharger.java +++ /dev/null @@ -1,150 +0,0 @@ -package com.detrav.items.processing; - -import com.detrav.enums.DetravSimpleItems; -import com.detrav.items.DetravMetaGeneratedTool01; -import gregtech.GT_Mod; -import gregtech.api.enums.ItemList; -import gregtech.api.enums.Materials; -import gregtech.api.enums.OrePrefixes; -import gregtech.api.util.GT_ModHandler; -import gregtech.api.util.GT_OreDictUnificator; -import gregtech.common.blocks.GT_Block_Machines; -import gregtech.common.blocks.GT_Item_Machines; -import net.minecraft.item.ItemStack; - -/** - * Created by wital_000 on 07.04.2016. - */ -public class ProcessingDetravPortableCharger implements gregtech.api.interfaces.IOreRecipeRegistrator { - - public ProcessingDetravPortableCharger() { - OrePrefixes.cableGt01.add(this); - } - - @Override - public void registerOre(OrePrefixes orePrefixes, Materials materials, String s, String s1, ItemStack itemStack) { - - boolean bEC = !GT_Mod.gregtechproxy.mHardcoreCables; - long loss = 0; - long voltage = 0; - if (materials == Materials.Cobalt) { - loss = bEC ? 2L : 2L; - voltage = gregtech.api.enums.GT_Values.V[1]; - } else if (materials == Materials.Lead) { - loss = bEC ? 2L : 2L; - voltage = gregtech.api.enums.GT_Values.V[1]; - } else if (materials == Materials.Tin) { - loss = bEC ? 1L : 1L; - voltage = gregtech.api.enums.GT_Values.V[1]; - } else if (materials == Materials.Zinc) { - loss = bEC ? 1L : 1L; - voltage = gregtech.api.enums.GT_Values.V[1]; - } else if (materials == Materials.SolderingAlloy) { - loss = bEC ? 1L : 1L; - voltage = gregtech.api.enums.GT_Values.V[1]; - } else if (materials == Materials.Iron) { - loss = bEC ? 3L : 4L; - voltage = gregtech.api.enums.GT_Values.V[2]; - } else if (materials == Materials.Nickel) { - loss = bEC ? 3L : 5L; - voltage = gregtech.api.enums.GT_Values.V[2]; - } else if (materials == Materials.Cupronickel) { - loss = bEC ? 3L : 4L; - voltage = gregtech.api.enums.GT_Values.V[2]; - } else if (materials == Materials.Copper) { - loss = bEC ? 2L : 3L; - voltage = gregtech.api.enums.GT_Values.V[2]; - } else if (materials == Materials.AnnealedCopper) { - loss = bEC ? 1L : 2L; - voltage = gregtech.api.enums.GT_Values.V[2]; - } else if (materials == Materials.Kanthal) { - loss = bEC ? 3L : 8L; - voltage = gregtech.api.enums.GT_Values.V[3]; - } else if (materials == Materials.Gold) { - loss = bEC ? 2L : 6L; - voltage = gregtech.api.enums.GT_Values.V[3]; - } else if (materials == Materials.Electrum) { - loss = bEC ? 2L : 5L; - voltage = gregtech.api.enums.GT_Values.V[3]; - } else if (materials == Materials.Silver) { - loss = bEC ? 1L : 4L; - voltage = gregtech.api.enums.GT_Values.V[3]; - } else if (materials == Materials.BlueAlloy) { - loss = bEC ? 1L : 4L; - voltage = gregtech.api.enums.GT_Values.V[3]; - } else if (materials == Materials.Nichrome) { - loss = bEC ? 4L : 32L; - voltage = gregtech.api.enums.GT_Values.V[4]; - } else if (materials == Materials.Steel) { - loss = bEC ? 2L : 16L; - voltage = gregtech.api.enums.GT_Values.V[4]; - } else if (materials == Materials.TungstenSteel) { - loss = bEC ? 2L : 14L; - voltage = gregtech.api.enums.GT_Values.V[4]; - } else if (materials == Materials.Tungsten) { - loss = bEC ? 2L : 12L; - voltage = gregtech.api.enums.GT_Values.V[4]; - } else if (materials == Materials.Aluminium) { - loss = bEC ? 1L : 8L; - voltage = gregtech.api.enums.GT_Values.V[4]; - } else if (materials == Materials.Graphene) { - loss = bEC ? 1L : 16L; - voltage = gregtech.api.enums.GT_Values.V[5]; - } else if (materials == Materials.Osmium) { - loss = bEC ? 2L : 32L; - voltage = gregtech.api.enums.GT_Values.V[5]; - } else if (materials == Materials.Platinum) { - loss = bEC ? 1L : 16L; - voltage = gregtech.api.enums.GT_Values.V[5]; - } else if (materials == Materials.Naquadah) { - loss = bEC ? 1L : 64L; - voltage = gregtech.api.enums.GT_Values.V[6]; - } else if (materials == Materials.NiobiumTitanium) { - loss = bEC ? 2L : 128L; - voltage = gregtech.api.enums.GT_Values.V[6]; - } else if (materials == Materials.VanadiumGallium) { - loss = bEC ? 2L : 128L; - voltage = gregtech.api.enums.GT_Values.V[6]; - } else if (materials == Materials.YttriumBariumCuprate) { - loss = bEC ? 4L : 256L; - voltage = gregtech.api.enums.GT_Values.V[6]; - } else if (materials == Materials.RedAlloy) { - loss = 0L; - voltage = gregtech.api.enums.GT_Values.V[0]; - } else if (materials == Materials.Superconductor) { - loss = 1L; - voltage = gregtech.api.enums.GT_Values.V[9]; - } else { - loss = -1; - voltage = -1; - } - if (loss < 0) return; - ItemStack dStack = null; - switch ((int) voltage) { - case 32: - dStack = DetravMetaGeneratedTool01.INSTANCE.getToolWithStatsPlus(106, 1, materials, Materials.StainlessSteel, new long[]{4 * 100000L, 32L, 1L, -3L}, loss); - GT_ModHandler.addCraftingRecipe(dStack, GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"WBW", "BCB", "WBW", Character.valueOf('C'), OrePrefixes.circuit.get(Materials.Basic), Character.valueOf('B'), ItemList.Battery_RE_LV_Lithium.get(1L, new Object[0]), Character.valueOf('W'), itemStack}); - dStack = DetravMetaGeneratedTool01.INSTANCE.getToolWithStatsPlus(106, 1, materials, Materials.StainlessSteel, new long[]{4 * 75000L, 32L, 1L, -3L}, loss); - GT_ModHandler.addCraftingRecipe(dStack, GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"WBW", "BCB", "WBW", Character.valueOf('C'), OrePrefixes.circuit.get(Materials.Basic), Character.valueOf('B'), ItemList.Battery_RE_LV_Cadmium.get(1L, new Object[0]), Character.valueOf('W'), itemStack}); - dStack = DetravMetaGeneratedTool01.INSTANCE.getToolWithStatsPlus(106, 1, materials, Materials.StainlessSteel, new long[]{4 * 50000L, 32L, 1L, -3L}, loss); - GT_ModHandler.addCraftingRecipe(dStack, GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"WBW", "BCB", "WBW", Character.valueOf('C'), OrePrefixes.circuit.get(Materials.Basic), Character.valueOf('B'), ItemList.Battery_RE_LV_Sodium.get(1L, new Object[0]), Character.valueOf('W'), itemStack}); - break; - case 128: - dStack = DetravMetaGeneratedTool01.INSTANCE.getToolWithStatsPlus(106, 1, materials, Materials.Titanium, new long[]{4 * 400000L, 128L, 2L, -3L}, loss); - GT_ModHandler.addCraftingRecipe(dStack, GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"WBW", "BCB", "WBW", Character.valueOf('C'), OrePrefixes.circuit.get(Materials.Good), Character.valueOf('B'), ItemList.Battery_RE_MV_Lithium.get(1L, new Object[0]), Character.valueOf('W'), itemStack}); - dStack = DetravMetaGeneratedTool01.INSTANCE.getToolWithStatsPlus(106, 1, materials, Materials.Titanium, new long[]{4 * 300000L, 128L, 2L, -3L}, loss); - GT_ModHandler.addCraftingRecipe(dStack, GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"WBW", "BCB", "WBW", Character.valueOf('C'), OrePrefixes.circuit.get(Materials.Good), Character.valueOf('B'), ItemList.Battery_RE_MV_Cadmium.get(1L, new Object[0]), Character.valueOf('W'), itemStack}); - dStack = DetravMetaGeneratedTool01.INSTANCE.getToolWithStatsPlus(106, 1, materials, Materials.Titanium, new long[]{4 * 200000L, 128L, 2L, -3L}, loss); - GT_ModHandler.addCraftingRecipe(dStack, GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"WBW", "BCB", "WBW", Character.valueOf('C'), OrePrefixes.circuit.get(Materials.Good), Character.valueOf('B'), ItemList.Battery_RE_MV_Sodium.get(1L, new Object[0]), Character.valueOf('W'), itemStack}); - break; - case 512: - dStack = DetravMetaGeneratedTool01.INSTANCE.getToolWithStatsPlus(106, 1, materials, Materials.TungstenSteel, new long[]{4 * 1600000L, 512L, 3L, -3L}, loss); - GT_ModHandler.addCraftingRecipe(dStack, GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"WBW", "BCB", "WBW", Character.valueOf('C'), OrePrefixes.circuit.get(Materials.Advanced), Character.valueOf('B'), ItemList.Battery_RE_HV_Lithium.get(1L, new Object[0]), Character.valueOf('W'), itemStack}); - dStack = DetravMetaGeneratedTool01.INSTANCE.getToolWithStatsPlus(106, 1, materials, Materials.TungstenSteel, new long[]{4 * 1200000L, 512L, 3L, -3L}, loss); - GT_ModHandler.addCraftingRecipe(dStack, GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"WBW", "BCB", "WBW", Character.valueOf('C'), OrePrefixes.circuit.get(Materials.Advanced), Character.valueOf('B'), ItemList.Battery_RE_HV_Cadmium.get(1L, new Object[0]), Character.valueOf('W'), itemStack}); - dStack = DetravMetaGeneratedTool01.INSTANCE.getToolWithStatsPlus(106, 1, materials, Materials.TungstenSteel, new long[]{4 * 800000L, 512L, 3L, -3L}, loss); - GT_ModHandler.addCraftingRecipe(dStack, GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"WBW", "BCB", "WBW", Character.valueOf('C'), OrePrefixes.circuit.get(Materials.Advanced), Character.valueOf('B'), ItemList.Battery_RE_HV_Sodium.get(1L, new Object[0]), Character.valueOf('W'), itemStack}); - break; - } - } -}
\ No newline at end of file diff --git a/src/main/java/com/detrav/items/processing/ProcessingDetravShaping.java b/src/main/java/com/detrav/items/processing/ProcessingDetravShaping.java deleted file mode 100644 index 6e4c676bf3..0000000000 --- a/src/main/java/com/detrav/items/processing/ProcessingDetravShaping.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.detrav.items.processing; - -import com.detrav.enums.DetravItemList; -import com.detrav.enums.DetravSimpleItems; -import gregtech.api.enums.GT_Values; -import gregtech.api.enums.Materials; -import gregtech.api.enums.OrePrefixes; -import gregtech.api.enums.SubTag; -import gregtech.api.util.GT_OreDictUnificator; -import gregtech.api.util.GT_Utility; -import net.minecraft.item.ItemStack; - -/** - * Created by wital_000 on 20.03.2016. - */ -public class ProcessingDetravShaping implements gregtech.api.interfaces.IOreRecipeRegistrator { - - public ProcessingDetravShaping() { - OrePrefixes.ingot.add(this); - } - - @Override - public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) { - if ((GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 1L) != null) && (!aMaterial.contains(SubTag.NO_SMELTING))) { - int tAmount = (int) (aPrefix.mMaterialAmount / 3628800L); - if ((tAmount > 0) && (tAmount <= 64) && (aPrefix.mMaterialAmount % 3628800L == 0L)) { - int tVoltageMultiplier = aMaterial.mBlastFurnaceTemp >= 2800 ? 64 : 32; - - if (aMaterial.contains(SubTag.NO_SMASHING)) { - tVoltageMultiplier /= 4; - } else if (aPrefix.name().startsWith(OrePrefixes.dust.name())) { - return; - } - GT_Values.RA.addExtruderRecipe(GT_Utility.copyAmount(2L, new Object[]{aStack}), DetravItemList.Shape_Extruder_ProPick.get(0L, new Object[0]), GT_OreDictUnificator.get(DetravSimpleItems.toolHeadProPick.get(aMaterial), tAmount), (int) Math.max(aMaterial.getMass() * 2L * tAmount, tAmount), 15 * tVoltageMultiplier); - } - } - } -}
\ No newline at end of file diff --git a/src/main/java/com/detrav/items/processing/ProcessingDetravSmartPlunger.java b/src/main/java/com/detrav/items/processing/ProcessingDetravSmartPlunger.java deleted file mode 100644 index c866f95ea0..0000000000 --- a/src/main/java/com/detrav/items/processing/ProcessingDetravSmartPlunger.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.detrav.items.processing; - -import com.detrav.items.DetravMetaGeneratedTool01; -import gregtech.api.enums.*; -import gregtech.api.interfaces.IOreRecipeRegistrator; -import gregtech.api.util.GT_ModHandler; -import gregtech.api.util.GT_OreDictUnificator; -import gregtech.common.items.GT_MetaGenerated_Tool_01; -import ic2.core.Ic2Items; -import net.minecraft.init.Blocks; -import net.minecraft.item.ItemStack; - -/** - * Created by Detrav on 11.12.2016. - */ -public class ProcessingDetravSmartPlunger implements IOreRecipeRegistrator { - public ProcessingDetravSmartPlunger() { - OrePrefixes.toolHeadHammer.add(this); - } - - public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) { - if ((aMaterial != Materials.Stone) && (aMaterial != Materials.Flint)) { - if (aMaterial != Materials.Rubber) { - GT_ModHandler.addCraftingRecipe( - DetravMetaGeneratedTool01.INSTANCE.getToolWithStats(4, 1, aMaterial, aMaterial, null), - GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, - new Object[]{"xRR", " CR", "S f", - Character.valueOf('S'), OrePrefixes.stick.get(aMaterial), - Character.valueOf('R'), OrePrefixes.plate.get(Materials.Rubber), - Character.valueOf('C'), Ic2Items.cell}); - GT_ModHandler.addCraftingRecipe( - DetravMetaGeneratedTool01.INSTANCE.getToolWithStats(6, 1, aMaterial, aMaterial, null), - GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, - new Object[]{"xRR", " CR", "S f", - Character.valueOf('S'), OrePrefixes.stick.get(aMaterial), - Character.valueOf('R'), OrePrefixes.plate.get(Materials.Rubber), - Character.valueOf('C'), ItemList.Large_Fluid_Cell_Steel.get(1)}); - GT_ModHandler.addCraftingRecipe( - DetravMetaGeneratedTool01.INSTANCE.getToolWithStats(8, 1, aMaterial, aMaterial, null), - GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, - new Object[]{"xRR", " CR", "S f", - Character.valueOf('S'), OrePrefixes.stick.get(aMaterial), - Character.valueOf('R'), OrePrefixes.plate.get(Materials.Rubber), - Character.valueOf('C'), ItemList.Large_Fluid_Cell_TungstenSteel.get(1)}); - } - } - } -} diff --git a/src/main/java/com/detrav/items/processing/ProcessingDetravToolProPick.java b/src/main/java/com/detrav/items/processing/ProcessingDetravToolProPick.java index b1ab21eb83..4845b3563e 100644 --- a/src/main/java/com/detrav/items/processing/ProcessingDetravToolProPick.java +++ b/src/main/java/com/detrav/items/processing/ProcessingDetravToolProPick.java @@ -1,8 +1,5 @@ package com.detrav.items.processing; -import com.detrav.enums.DetravItemList; -import com.detrav.enums.DetravSimpleItems; -import com.detrav.items.DetravMetaGeneratedItem01; import com.detrav.items.DetravMetaGeneratedTool01; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; @@ -10,6 +7,7 @@ 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. @@ -21,23 +19,10 @@ public class ProcessingDetravToolProPick implements gregtech.api.interfaces.IOre public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) { if(!aPrefix.doGenerateItem(aMaterial)) return;; - //GT_ModHandler. - //addShapelessCraftingRecipe( - //DetravMetaGeneratedTool01.INSTANCE.getToolWithStats(0, 1, aMaterial, aMaterial.mHandleMaterial, null), - //new Object[]{DetravSimpleItems.toolHeadProPick.get(aMaterial), OrePrefixes.stick.get(aMaterial.mHandleMaterial)}); + GT_ModHandler.addCraftingRecipe(DetravMetaGeneratedTool01.INSTANCE.getToolWithStats(100, 1, aMaterial, Materials.Chrome, new long[]{25600000L, 8192L, 5L, -1L}), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"EHR", "CSC", "PBP", Character.valueOf('S'), ItemList.Cover_Screen, Character.valueOf('R'), ItemList.Sensor_IV, Character.valueOf('H'), OrePrefixes.toolHeadDrill.get(aMaterial), Character.valueOf('E'), ItemList.Emitter_IV,Character.valueOf('C'), OrePrefixes.circuit.get(Materials.Master), Character.valueOf('P'), OrePrefixes.plate.get(Materials.Chrome), Character.valueOf('B'), CustomItemList.BatteryHull_IV_Full.get(1L, new Object[0])}); + GT_ModHandler.addCraftingRecipe(DetravMetaGeneratedTool01.INSTANCE.getToolWithStats(102, 1, aMaterial, Materials.Iridium, new long[]{102400000L, 32768L, 6L, -1L}), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"EHR", "CSC", "PBP", Character.valueOf('S'), ItemList.Cover_Screen, Character.valueOf('R'), ItemList.Sensor_LuV, Character.valueOf('H'), OrePrefixes.toolHeadDrill.get(aMaterial),Character.valueOf('E'), ItemList.Emitter_LuV,Character.valueOf('C'), OrePrefixes.circuit.get(Materials.Ultimate), Character.valueOf('P'), OrePrefixes.plate.get(Materials.Iridium), Character.valueOf('B'), CustomItemList.BatteryHull_LuV_Full.get(1L, new Object[0])}); + GT_ModHandler.addCraftingRecipe(DetravMetaGeneratedTool01.INSTANCE.getToolWithStats(104, 1, aMaterial, Materials.Neutronium, new long[]{409600000L, 131072L, 7L, -1L}), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"EHR", "CSC", "PBP", Character.valueOf('S'), ItemList.Cover_Screen, Character.valueOf('R'), ItemList.Sensor_ZPM, Character.valueOf('H'), OrePrefixes.toolHeadDrill.get(aMaterial), Character.valueOf('E'), ItemList.Emitter_ZPM,Character.valueOf('C'), OrePrefixes.circuit.get(Materials.Superconductor), Character.valueOf('P'), OrePrefixes.plate.get(Materials.Neutronium), Character.valueOf('B'), CustomItemList.BatteryHull_ZPM_Full.get(1L, new Object[0])}); - GT_ModHandler.addCraftingRecipe(DetravMetaGeneratedTool01.INSTANCE.getToolWithStats(100, 1, aMaterial, Materials.Chrome, new long[]{100000L, 32L, 1L, -1L}), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"EHR", "CSC", "PBP", Character.valueOf('S'), ItemList.Cover_Screen, Character.valueOf('R'), ItemList.Sensor_IV,Character.valueOf('E'), ItemList.Emitter_LuV,Character.valueOf('C'), OrePrefixes.circuit.get(Materials.Master), Character.valueOf('H'), DetravSimpleItems.toolHeadProPick.get(aMaterial), Character.valueOf('P'), OrePrefixes.plate.get(Materials.Chrome), Character.valueOf('B'), ItemList.Battery_RE_LV_Lithium.get(1L, new Object[0])}); - GT_ModHandler.addCraftingRecipe(DetravMetaGeneratedTool01.INSTANCE.getToolWithStats(100, 1, aMaterial, Materials.Chrome, new long[]{75000L, 32L, 1L, -1L}), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"EHR", "CSC", "PBP", Character.valueOf('S'), ItemList.Cover_Screen, Character.valueOf('R'), ItemList.Sensor_IV,Character.valueOf('E'), ItemList.Emitter_LuV,Character.valueOf('C'), OrePrefixes.circuit.get(Materials.Master), Character.valueOf('H'), DetravSimpleItems.toolHeadProPick.get(aMaterial), Character.valueOf('P'), OrePrefixes.plate.get(Materials.Chrome), Character.valueOf('B'), ItemList.Battery_RE_LV_Cadmium.get(1L, new Object[0])}); - GT_ModHandler.addCraftingRecipe(DetravMetaGeneratedTool01.INSTANCE.getToolWithStats(100, 1, aMaterial, Materials.Chrome, new long[]{50000L, 32L, 1L, -1L}), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"EHR", "CSC", "PBP", Character.valueOf('S'), ItemList.Cover_Screen, Character.valueOf('R'), ItemList.Sensor_IV,Character.valueOf('E'), ItemList.Emitter_LuV,Character.valueOf('C'), OrePrefixes.circuit.get(Materials.Master), Character.valueOf('H'), DetravSimpleItems.toolHeadProPick.get(aMaterial), Character.valueOf('P'), OrePrefixes.plate.get(Materials.Chrome), Character.valueOf('B'), ItemList.Battery_RE_LV_Sodium.get(1L, new Object[0])}); - GT_ModHandler.addCraftingRecipe(DetravMetaGeneratedTool01.INSTANCE.getToolWithStats(102, 1, aMaterial, Materials.Iridium, new long[]{400000L, 128L, 2L, -1L}), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"EHR", "CSC", "PBP", Character.valueOf('S'), ItemList.Cover_Screen, Character.valueOf('R'), ItemList.Sensor_LuV,Character.valueOf('E'), ItemList.Emitter_ZPM,Character.valueOf('C'), OrePrefixes.circuit.get(Materials.Ultimate), Character.valueOf('H'), DetravSimpleItems.toolHeadProPick.get(aMaterial), Character.valueOf('P'), OrePrefixes.plate.get(Materials.Iridium), Character.valueOf('B'), ItemList.Battery_RE_MV_Lithium.get(1L, new Object[0])}); - GT_ModHandler.addCraftingRecipe(DetravMetaGeneratedTool01.INSTANCE.getToolWithStats(102, 1, aMaterial, Materials.Iridium, new long[]{300000L, 128L, 2L, -1L}), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"EHR", "CSC", "PBP", Character.valueOf('S'), ItemList.Cover_Screen, Character.valueOf('R'), ItemList.Sensor_LuV,Character.valueOf('E'), ItemList.Emitter_ZPM,Character.valueOf('C'), OrePrefixes.circuit.get(Materials.Ultimate), Character.valueOf('H'), DetravSimpleItems.toolHeadProPick.get(aMaterial), Character.valueOf('P'), OrePrefixes.plate.get(Materials.Iridium), Character.valueOf('B'), ItemList.Battery_RE_MV_Cadmium.get(1L, new Object[0])}); - GT_ModHandler.addCraftingRecipe(DetravMetaGeneratedTool01.INSTANCE.getToolWithStats(102, 1, aMaterial, Materials.Iridium, new long[]{200000L, 128L, 2L, -1L}), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"EHR", "CSC", "PBP", Character.valueOf('S'), ItemList.Cover_Screen, Character.valueOf('R'), ItemList.Sensor_LuV,Character.valueOf('E'), ItemList.Emitter_ZPM,Character.valueOf('C'), OrePrefixes.circuit.get(Materials.Ultimate), Character.valueOf('H'), DetravSimpleItems.toolHeadProPick.get(aMaterial), Character.valueOf('P'), OrePrefixes.plate.get(Materials.Iridium), Character.valueOf('B'), ItemList.Battery_RE_MV_Sodium.get(1L, new Object[0])}); - GT_ModHandler.addCraftingRecipe(DetravMetaGeneratedTool01.INSTANCE.getToolWithStats(104, 1, aMaterial, Materials.Neutronium, new long[]{1600000L, 512L, 3L, -1L}), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"EHR", "CSC", "PBP", Character.valueOf('S'), ItemList.Cover_Screen, Character.valueOf('R'), ItemList.Sensor_ZPM,Character.valueOf('E'), ItemList.Emitter_UV,Character.valueOf('C'), OrePrefixes.circuit.get(Materials.Superconductor), Character.valueOf('H'), DetravSimpleItems.toolHeadProPick.get(aMaterial), Character.valueOf('P'), OrePrefixes.plate.get(Materials.Neutronium), Character.valueOf('B'), ItemList.Battery_RE_HV_Lithium.get(1L, new Object[0])}); - GT_ModHandler.addCraftingRecipe(DetravMetaGeneratedTool01.INSTANCE.getToolWithStats(104, 1, aMaterial, Materials.Neutronium, new long[]{1200000L, 512L, 3L, -1L}), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"EHR", "CSC", "PBP", Character.valueOf('S'), ItemList.Cover_Screen, Character.valueOf('R'), ItemList.Sensor_ZPM,Character.valueOf('E'), ItemList.Emitter_UV,Character.valueOf('C'), OrePrefixes.circuit.get(Materials.Superconductor), Character.valueOf('H'), DetravSimpleItems.toolHeadProPick.get(aMaterial), Character.valueOf('P'), OrePrefixes.plate.get(Materials.Neutronium), Character.valueOf('B'), ItemList.Battery_RE_HV_Cadmium.get(1L, new Object[0])}); - GT_ModHandler.addCraftingRecipe(DetravMetaGeneratedTool01.INSTANCE.getToolWithStats(104, 1, aMaterial, Materials.Neutronium, new long[]{800000L, 512L, 3L, -1L}), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"EHR", "CSC", "PBP", Character.valueOf('S'), ItemList.Cover_Screen, Character.valueOf('R'), ItemList.Sensor_ZPM,Character.valueOf('E'), ItemList.Emitter_UV,Character.valueOf('C'), OrePrefixes.circuit.get(Materials.Superconductor), Character.valueOf('H'), DetravSimpleItems.toolHeadProPick.get(aMaterial), Character.valueOf('P'), OrePrefixes.plate.get(Materials.Neutronium), Character.valueOf('B'), ItemList.Battery_RE_HV_Sodium.get(1L, new Object[0])}); - - GT_ModHandler.addCraftingRecipe(DetravItemList.Shape_Extruder_ProPick.get(1L,new Object[0]), - new Object[]{"h","X","M", Character.valueOf('X'),DetravSimpleItems.toolHeadProPick.get(aMaterial),Character.valueOf('M'),ItemList.Shape_Empty}); } -}
\ No newline at end of file +} diff --git a/src/main/java/com/detrav/items/tools/DetravToolCircuitConfigurator.java b/src/main/java/com/detrav/items/tools/DetravToolCircuitConfigurator.java deleted file mode 100644 index de95f5bc41..0000000000 --- a/src/main/java/com/detrav/items/tools/DetravToolCircuitConfigurator.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.detrav.items.tools; - - - -import com.detrav.enums.Textures01; -import com.detrav.items.behaviours.BehaviourDetravConfigurator; -import gregtech.api.GregTech_API; -import gregtech.api.interfaces.IIconContainer; -import gregtech.api.items.GT_MetaGenerated_Tool; -import gregtech.common.tools.GT_Tool; -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; - -import java.util.List; - -/** - * Created by Detrav on 29.04.2017. - */ -public class DetravToolCircuitConfigurator extends GT_Tool { - public float getBaseDamage() { - return 0.25F; - } - - public float getSpeedMultiplier() { - return 0.3F; - } - - public float getMaxDurabilityMultiplier() { - return 0.50F; - } - - public String getCraftingSound() { - return (String) GregTech_API.sSoundList.get(Integer.valueOf(101)); - } - - public String getEntityHitSound() { - return (String) GregTech_API.sSoundList.get(Integer.valueOf(101)); - } - - public String getBreakingSound() { - return (String) GregTech_API.sSoundList.get(Integer.valueOf(0)); - } - - public String getMiningSound() { - return (String) GregTech_API.sSoundList.get(Integer.valueOf(101)); - } - - public boolean isMinableBlock(Block aBlock, byte aMetaData) { - return false; - } - - public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) { - return aIsToolHead ? Textures01.mTextures[8] : null; - } - - 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 BehaviourDetravConfigurator()); - } - - public IChatComponent getDeathMessage(EntityLivingBase aPlayer, EntityLivingBase aEntity) { - return new ChatComponentText(EnumChatFormatting.RED + aEntity.getCommandSenderName() + EnumChatFormatting.WHITE + " got stuck trying to escape through a Pipe while fighting " + EnumChatFormatting.GREEN + aPlayer.getCommandSenderName() + EnumChatFormatting.WHITE); - } -} diff --git a/src/main/java/com/detrav/items/tools/DetravToolHVElectricProPick.java b/src/main/java/com/detrav/items/tools/DetravToolHVElectricProPick.java index 3196ac7f5d..071416763c 100644 --- a/src/main/java/com/detrav/items/tools/DetravToolHVElectricProPick.java +++ b/src/main/java/com/detrav/items/tools/DetravToolHVElectricProPick.java @@ -17,6 +17,6 @@ public class DetravToolHVElectricProPick extends DetravToolMVElectricProPick { } public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) { - return Textures01.mTextures[3]; + 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 index 9cf53e299a..7be34f23d6 100644 --- a/src/main/java/com/detrav/items/tools/DetravToolLVElectricProPick.java +++ b/src/main/java/com/detrav/items/tools/DetravToolLVElectricProPick.java @@ -159,7 +159,7 @@ public class DetravToolLVElectricProPick implements IToolStats { } public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) { - return Textures01.mTextures[1]; + return Textures01.mTextures[0]; } public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) { diff --git a/src/main/java/com/detrav/items/tools/DetravToolMVElectricProPick.java b/src/main/java/com/detrav/items/tools/DetravToolMVElectricProPick.java index 81bfed4f17..05d719c2d3 100644 --- a/src/main/java/com/detrav/items/tools/DetravToolMVElectricProPick.java +++ b/src/main/java/com/detrav/items/tools/DetravToolMVElectricProPick.java @@ -16,6 +16,6 @@ public class DetravToolMVElectricProPick extends DetravToolLVElectricProPick { } public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) { - return Textures01.mTextures[2]; + return Textures01.mTextures[1]; } } diff --git a/src/main/java/com/detrav/items/tools/DetravToolPortableAnvil.java b/src/main/java/com/detrav/items/tools/DetravToolPortableAnvil.java deleted file mode 100644 index f181844e71..0000000000 --- a/src/main/java/com/detrav/items/tools/DetravToolPortableAnvil.java +++ /dev/null @@ -1,191 +0,0 @@ -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.minecraft.world.World; -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); - } - - public float getMiningSpeed(Block aBlock, byte aMetaData, float aDefault, EntityPlayer aPlayer, World aWorld, int aX, int aY, int aZ) { - return aDefault; - } -} diff --git a/src/main/java/com/detrav/items/tools/DetravToolPortableCharger.java b/src/main/java/com/detrav/items/tools/DetravToolPortableCharger.java deleted file mode 100644 index d915bbb1a0..0000000000 --- a/src/main/java/com/detrav/items/tools/DetravToolPortableCharger.java +++ /dev/null @@ -1,191 +0,0 @@ -package com.detrav.items.tools; - -import com.detrav.enums.DetravSimpleItems; -import com.detrav.enums.Textures01; -import com.detrav.items.behaviours.BehaviourDetravPortableCharger; -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.minecraft.world.World; -import net.minecraftforge.event.world.BlockEvent; - -import java.util.List; - -/** - * Created by wital_000 on 07.04.2016. - */ -public class DetravToolPortableCharger implements IToolStats { - public int getToolDamagePerBlockBreak() { - return GT_Mod.gregtechproxy.mHardRock ? 50 : 100; - } - - public int getToolDamagePerDropConversion() { - return 1000; - } - - public int getToolDamagePerContainerCraft() { - return 1000; - } - - public int getToolDamagePerEntityAttack() { - return 1000; - } - - public int getBaseQuality() { - return 0; - } - - public float getBaseDamage() { - return 2.5F; - } - - @Override - public int getHurtResistanceTime(int i, Entity entity) { - return i; - } - - public float getSpeedMultiplier() { - return 1F; - } - - public float getMaxDurabilityMultiplier() { - return 1F; - } - - @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 true; - } - - @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[4]: - Textures01.mTextures[5]; - } - - 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 BehaviourDetravPortableCharger()); - } - - 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 + " \"CHARGED!\" 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; - } -} diff --git a/src/main/java/com/detrav/items/tools/DetravToolProPick.java b/src/main/java/com/detrav/items/tools/DetravToolProPick.java deleted file mode 100644 index b1ceef0078..0000000000 --- a/src/main/java/com/detrav/items/tools/DetravToolProPick.java +++ /dev/null @@ -1,192 +0,0 @@ -package com.detrav.items.tools; - -import com.detrav.enums.DetravSimpleItems; -import com.detrav.enums.Textures01; -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.items.GT_MetaGenerated_Tool; -import gregtech.api.interfaces.IToolStats; -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.minecraft.world.World; -import net.minecraftforge.event.world.BlockEvent; - -import java.util.List; - -/** - * Created by wital_000 on 18.03.2016. - */ -public class DetravToolProPick 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 200; - } - - 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 true; - } - - public boolean isMinableBlock(Block aBlock, byte aMetaData) { - - String tTool = aBlock.getHarvestTool(aMetaData); - return tTool != null && tTool.equals("pickaxe") || aBlock.getMaterial() == Material.rock || aBlock.getMaterial() == Material.iron || aBlock.getMaterial() == Material.anvil || aBlock.getMaterial() == Material.glass; - } - - @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[DetravSimpleItems.toolHeadProPick.mTextureIndex] : - GT_MetaGenerated_Tool.getSecondaryMaterial(aStack).mIconSet.mTextures[gregtech.api.enums.OrePrefixes.stick.mTextureIndex]; - } - - 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 BehaviourDetravToolProPick(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 ProPicked 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; - } -} diff --git a/src/main/java/com/detrav/items/tools/DetravToolSmartPlunger.java b/src/main/java/com/detrav/items/tools/DetravToolSmartPlunger.java deleted file mode 100644 index 7cde3efad2..0000000000 --- a/src/main/java/com/detrav/items/tools/DetravToolSmartPlunger.java +++ /dev/null @@ -1,69 +0,0 @@ -package com.detrav.items.tools; - -import com.detrav.items.behaviours.BehaviourDetravToolSmartPlunger; -import gregtech.api.GregTech_API; -import gregtech.api.enums.Textures; -import gregtech.api.interfaces.IIconContainer; -import gregtech.api.interfaces.IItemBehaviour; -import gregtech.api.items.GT_MetaGenerated_Tool; -import gregtech.api.util.GT_Utility; -import gregtech.common.items.behaviors.Behaviour_Plunger_Fluid; -import gregtech.common.items.behaviors.Behaviour_Plunger_Item; -import gregtech.common.tools.GT_Tool; -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; - -/** - * Created by Detrav on 11.12.2016. - */ -public class DetravToolSmartPlunger - extends GT_Tool { - public float getBaseDamage() { - return 1.25F; - } - - public float getMaxDurabilityMultiplier() { - return 0.50F; - } - - public String getCraftingSound() { - return (String) GregTech_API.sSoundList.get(Integer.valueOf(101)); - } - - public String getEntityHitSound() { - return (String) GregTech_API.sSoundList.get(Integer.valueOf(101)); - } - - public String getBreakingSound() { - return (String) GregTech_API.sSoundList.get(Integer.valueOf(0)); - } - - public String getMiningSound() { - return (String) GregTech_API.sSoundList.get(Integer.valueOf(101)); - } - - public boolean isMinableBlock(Block aBlock, byte aMetaData) { - String tTool = aBlock.getHarvestTool(aMetaData); - return ((tTool != null) && tTool.equals("plunger")); - } - - public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) { - return aIsToolHead ? Textures.ItemIcons.PLUNGER : null; - } - - 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 BehaviourDetravToolSmartPlunger(getToolDamagePerDropConversion(),1000)); - } - - public IChatComponent getDeathMessage(EntityLivingBase aPlayer, EntityLivingBase aEntity) { - return new ChatComponentText(EnumChatFormatting.RED + aEntity.getCommandSenderName() + EnumChatFormatting.WHITE + " got stuck trying to escape through a Pipe while fighting " + EnumChatFormatting.GREEN + aPlayer.getCommandSenderName() + EnumChatFormatting.WHITE); - } -}
\ No newline at end of file diff --git a/src/main/java/com/detrav/items/tools/DetravToolSmartPlunger16.java b/src/main/java/com/detrav/items/tools/DetravToolSmartPlunger16.java deleted file mode 100644 index 28b08cb226..0000000000 --- a/src/main/java/com/detrav/items/tools/DetravToolSmartPlunger16.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.detrav.items.tools; - -import com.detrav.items.behaviours.BehaviourDetravToolSmartPlunger; -import gregtech.api.items.GT_MetaGenerated_Tool; - -/** - * Created by Detrav on 16.12.2016. - */ -public class DetravToolSmartPlunger16 extends DetravToolSmartPlunger { - public float getMaxDurabilityMultiplier() { - return 1F; - } - - public void onStatsAddedToTool(GT_MetaGenerated_Tool aItem, int aID) { - aItem.addItemBehavior(aID, new BehaviourDetravToolSmartPlunger(getToolDamagePerDropConversion(),16000)); - } -} diff --git a/src/main/java/com/detrav/items/tools/DetravToolSmartPlunger64.java b/src/main/java/com/detrav/items/tools/DetravToolSmartPlunger64.java deleted file mode 100644 index 0e13efa837..0000000000 --- a/src/main/java/com/detrav/items/tools/DetravToolSmartPlunger64.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.detrav.items.tools; - -import com.detrav.items.behaviours.BehaviourDetravToolSmartPlunger; -import gregtech.api.items.GT_MetaGenerated_Tool; - -/** - * Created by Detrav on 16.12.2016. - */ -public class DetravToolSmartPlunger64 extends DetravToolSmartPlunger { - public float getMaxDurabilityMultiplier() { - return 2F; - } - - public void onStatsAddedToTool(GT_MetaGenerated_Tool aItem, int aID) { - aItem.addItemBehavior(aID, new BehaviourDetravToolSmartPlunger(getToolDamagePerDropConversion(), 64000)); - } -}
\ No newline at end of file diff --git a/src/main/java/com/detrav/items/tools/DetravToolSmartTreeTap.java b/src/main/java/com/detrav/items/tools/DetravToolSmartTreeTap.java deleted file mode 100644 index 911dc87061..0000000000 --- a/src/main/java/com/detrav/items/tools/DetravToolSmartTreeTap.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.detrav.items.tools; - -import com.detrav.enums.Textures01; -import com.detrav.items.behaviours.BehaviourDetravToolTreeTap; -import gregtech.api.GregTech_API; -import gregtech.api.interfaces.IIconContainer; -import gregtech.api.items.GT_MetaGenerated_Tool; -import gregtech.common.tools.GT_Tool; -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; - -/** - * Created by Detrav on 01.04.2017. - */ -public class DetravToolSmartTreeTap extends GT_Tool { - public float getBaseDamage() { - return 1.25F; - } - - public float getMaxDurabilityMultiplier() { - return 0.5F; - } - - public String getCraftingSound() { - return (String) GregTech_API.sSoundList.get(Integer.valueOf(101)); - } - - public String getEntityHitSound() { - return (String) GregTech_API.sSoundList.get(Integer.valueOf(101)); - } - - public String getBreakingSound() { - return (String) GregTech_API.sSoundList.get(Integer.valueOf(0)); - } - - public String getMiningSound() { - return (String) GregTech_API.sSoundList.get(Integer.valueOf(101)); - } - - public boolean isMinableBlock(Block aBlock, byte aMetaData) { - return false; - } - - public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) { - return aIsToolHead ? Textures01.mTextures[7] : null; - } - - 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 BehaviourDetravToolTreeTap()); - } - - public IChatComponent getDeathMessage(EntityLivingBase aPlayer, EntityLivingBase aEntity) { - return new ChatComponentText(EnumChatFormatting.RED + aEntity.getCommandSenderName() + EnumChatFormatting.WHITE + " was sucked through a hole while fighting " + EnumChatFormatting.GREEN + aPlayer.getCommandSenderName() + EnumChatFormatting.WHITE); - } -}
\ No newline at end of file diff --git a/src/main/java/com/detrav/net/DetravNetwork.java b/src/main/java/com/detrav/net/DetravNetwork.java index 988b6c3a69..798ccffeda 100644 --- a/src/main/java/com/detrav/net/DetravNetwork.java +++ b/src/main/java/com/detrav/net/DetravNetwork.java @@ -34,7 +34,6 @@ public class DetravNetwork extends MessageToMessageCodec<FMLProxyPacket, DetravP this.mSubChannels = new DetravPacket[] { new DetravProPickPacket00(), - new DetravPortableChargerPacket01(), }; } diff --git a/src/main/java/com/detrav/net/DetravPortableChargerPacket01.java b/src/main/java/com/detrav/net/DetravPortableChargerPacket01.java deleted file mode 100644 index a99f684140..0000000000 --- a/src/main/java/com/detrav/net/DetravPortableChargerPacket01.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.detrav.net; - -import com.detrav.gui.DetravPortableChargerGui; -import com.google.common.io.ByteArrayDataInput; -import com.google.common.io.ByteArrayDataOutput; -import com.google.common.io.ByteStreams; - -/** - * Created by wital_000 on 07.04.2016. - */ -public class DetravPortableChargerPacket01 extends DetravPacket { - public long charge = 0; - @Override - public int getPacketID() { - return 1; - } - - @Override - public byte[] encode() { - ByteArrayDataOutput tOut = ByteStreams.newDataOutput(1); - tOut.writeLong(charge); - return tOut.toByteArray(); - } - - @Override - public Object decode(ByteArrayDataInput aData) { - DetravPortableChargerPacket01 packet = new DetravPortableChargerPacket01(); - packet.charge = aData.readLong(); - return packet; - } - - @Override - public void process() { - DetravPortableChargerGui.charge = charge; - } -} diff --git a/src/main/java/com/detrav/net/DetravProPickPacket00.java b/src/main/java/com/detrav/net/DetravProPickPacket00.java index dc59032922..0dd6e9f406 100644 --- a/src/main/java/com/detrav/net/DetravProPickPacket00.java +++ b/src/main/java/com/detrav/net/DetravProPickPacket00.java @@ -135,7 +135,6 @@ public class DetravProPickPacket00 extends DetravPacket { for (short meta : map[i][j].values()) { String name; short[] rgba; - //Пока только по одному буду Materials tMaterial = null; try { tMaterial = GregTech_API.sGeneratedMaterials[meta % 1000]; diff --git a/src/main/java/com/detrav/proxies/ClientProxy.java b/src/main/java/com/detrav/proxies/ClientProxy.java index 2140055802..2848b80ba8 100644 --- a/src/main/java/com/detrav/proxies/ClientProxy.java +++ b/src/main/java/com/detrav/proxies/ClientProxy.java @@ -2,7 +2,6 @@ package com.detrav.proxies; import com.detrav.DetravScannerMod; import com.detrav.enums.Textures01; -import com.detrav.events.DetravDrawBlockHighlightEventHandler; import com.detrav.gui.DetravGuiProPick; import gregtech.api.enums.Textures; import net.minecraft.client.Minecraft; @@ -22,7 +21,6 @@ public class ClientProxy extends CommonProxy { @Override public void onPostLoad() { super.onPostLoad(); - DetravDrawBlockHighlightEventHandler.register(); //Textures.ItemIcons.CustomIcon test = new Textures.ItemIcons.CustomIcon("iconsets/PRO_PICK_HEAD"); //test.run(); diff --git a/src/main/java/com/detrav/proxies/CommonProxy.java b/src/main/java/com/detrav/proxies/CommonProxy.java index 5c49af00fc..d75e3deee8 100644 --- a/src/main/java/com/detrav/proxies/CommonProxy.java +++ b/src/main/java/com/detrav/proxies/CommonProxy.java @@ -2,16 +2,8 @@ package com.detrav.proxies; import com.detrav.DetravScannerMod; -import com.detrav.enums.DetravItemList; -import com.detrav.enums.DetravSimpleItems; -import com.detrav.events.DetravEntityDropEvent; -import com.detrav.events.DetravLevelUpEvent; import com.detrav.events.DetravLoginEventHandler; import com.detrav.gui.DetravGuiProPick; -import com.detrav.gui.DetravPortableAnvilGui; -import com.detrav.gui.containers.DetravPortableAnvilContainer; -import com.detrav.gui.containers.DetravPortableChargerContainer; -import com.detrav.gui.DetravPortableChargerGui; import com.detrav.items.DetravMetaGeneratedTool01; import cpw.mods.fml.common.network.IGuiHandler; import gregtech.api.GregTech_API; @@ -35,43 +27,6 @@ public class CommonProxy implements IGuiHandler { } public void onPostLoad() { - //long tBits = GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED - //| GT_ModHandler.RecipeBits.ONLY_ADD_IF_RESULT_IS_NOT_NULL | GT_ModHandler.RecipeBits.NOT_REMOVABLE; - //for (Materials aMaterial : Materials.values()) { - //if ((aMaterial.mUnificatable) && (aMaterial.mMaterialInto == aMaterial)) { - //if (!aMaterial.contains(SubTag.NO_SMASHING)) { - // GT_ModHandler.addCraftingRecipe(GT_OreDictUnificator.get(DetravSimpleItems.toolHeadProPick.get(aMaterial), null, 1L), tBits, new Object[]{"PI", "fh", - //Character.valueOf('P'), OrePrefixes.plate.get(aMaterial), Character.valueOf('I'), OrePrefixes.ingot.get(aMaterial)}); - // } - //} - //} - - //if (!GregTech_API.sSpecialFile.get(ConfigCategories.general, "DisableFlintTools", false)) { - // GT_ModHandler.addCraftingRecipe(DetravMetaGeneratedTool01.INSTANCE.getToolWithStats(0, 1, Materials.Flint, Materials.Wood, null), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[]{"FF", "SS", Character.valueOf('S'), OrePrefixes.stick.get(Materials.Wood), Character.valueOf('F'), new ItemStack(Items.flint, 1)}); - //} - - //boiler recipes - //GT_ModHandler.addCraftingRecipe(DetravItemList.Solar_Boiler_Low.get(1L, new Object[0]), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"GGG", "BBB", "PMP", Character.valueOf('M'), ItemList.Machine_Bronze_Boiler, Character.valueOf('P'), OrePrefixes.pipeSmall.get(Materials.Bronze), Character.valueOf('B'), OrePrefixes.plate.get(Materials.Silver), Character.valueOf('G'), new ItemStack(Blocks.glass, 1)}); - GT_ModHandler.addCraftingRecipe(DetravItemList.Solar_Boiler_Medium.get(1L, new Object[0]), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"GSG", "NXN", "PMP", Character.valueOf('M'), ItemList.Machine_Bronze_Boiler_Solar, Character.valueOf('X'), ItemList.Machine_Steel_Boiler, Character.valueOf('S'), ItemList.Cover_SolarPanel, Character.valueOf('P'), OrePrefixes.pipeMedium.get(Materials.Steel), Character.valueOf('N'), OrePrefixes.plate.get(Materials.Electrum), Character.valueOf('G'), GT_ModHandler.getIC2Item("reinforcedGlass", 1L)}); - GT_ModHandler.addCraftingRecipe(DetravItemList.Solar_Boiler_High.get(1L, new Object[0]), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"GSG", "RXR", "PMP", Character.valueOf('M'), DetravItemList.Solar_Boiler_Medium, Character.valueOf('X'), ItemList.Casing_HV, Character.valueOf('S'), ItemList.Cover_SolarPanel_8V, Character.valueOf('P'), OrePrefixes.pipeLarge.get(Materials.StainlessSteel), Character.valueOf('R'), OrePrefixes.plate.get(Materials.SterlingSilver), Character.valueOf('G'),GT_ModHandler.getIC2Item("reinforcedGlass", 1L),}); - - GT_ModHandler.addCraftingRecipe( - DetravMetaGeneratedTool01.INSTANCE.getToolWithStats(108,1,Materials.Iron, Materials._NULL,null), - GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, - new Object[]{ "GGG","dCi","GGG", Character.valueOf('G'), OrePrefixes.plate.get(Materials.Titanium), Character.valueOf('C'), ItemList.Circuit_Master.get(1) }); - - GT_ModHandler.addCraftingRecipe(DetravItemList.DetravAdvancedMiner2.get(1L), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.DISMANTLEABLE , new Object[]{"WWW", "EME", "CCC", 'M', ItemList.OreDrill4, 'W', OrePrefixes.frameGt.get(Materials.Tritanium), 'E', OrePrefixes.circuit.get(Materials.Superconductor), 'C', ItemList.Electric_Motor_UV}); - - - //Treetap recipes - - GT_ModHandler.addShapelessCraftingRecipe(DetravMetaGeneratedTool01.INSTANCE.getToolWithStats(10,1, Materials.Wood,Materials.Wood, null ), - new Object[]{Ic2Items.treetap,Ic2Items.rubberWood,Ic2Items.resin}); - - GT_ModHandler.addShapelessCraftingRecipe(ItemList.Circuit_Integrated.get(1), new Object[]{ DetravItemList.ConfiguredCircuit } ); - //DetravCraftingEventHandler.register(); - DetravEntityDropEvent.register(); - DetravLevelUpEvent.register(); DetravLoginEventHandler.register(); } @@ -80,10 +35,6 @@ public class CommonProxy implements IGuiHandler { switch (ID) { case DetravGuiProPick.GUI_ID: return null; - case DetravPortableChargerGui.GUI_ID: - return new DetravPortableChargerContainer(player.inventory,world,player.getCurrentEquippedItem()); - case DetravPortableAnvilGui.GUI_ID: - return new DetravPortableAnvilContainer(player.inventory,world,player.getCurrentEquippedItem()); default: return null; } @@ -94,10 +45,6 @@ public class CommonProxy implements IGuiHandler { switch (ID) { case DetravGuiProPick.GUI_ID: return new DetravGuiProPick(); - case DetravPortableChargerGui.GUI_ID: - return new DetravPortableChargerGui(player.inventory,world,player.getCurrentEquippedItem()); - case DetravPortableAnvilGui.GUI_ID: - return new DetravPortableAnvilGui(player.inventory,world,player.getCurrentEquippedItem()); default: return null; } @@ -109,17 +56,6 @@ public class CommonProxy implements IGuiHandler { //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 openPortableAnvilGui(EntityPlayer player) - { - player.openGui(DetravScannerMod.instance, DetravPortableAnvilGui.GUI_ID,player.worldObj,(int)player.posX,(int)player.posY,(int)player.posZ); - } - - public void onPreInit() { diff --git a/src/main/java/com/detrav/tileentities/Detrav_MetaTileEntity_AdvMiner2.java b/src/main/java/com/detrav/tileentities/Detrav_MetaTileEntity_AdvMiner2.java deleted file mode 100644 index 5d9a39cf82..0000000000 --- a/src/main/java/com/detrav/tileentities/Detrav_MetaTileEntity_AdvMiner2.java +++ /dev/null @@ -1,578 +0,0 @@ -package com.detrav.tileentities; - -/** - * Created by Detrav on 13.12.2016. - */ -import com.detrav.enums.DetravItemList; -import com.detrav.items.DetravMetaGeneratedItem01; -import com.detrav.items.DetravMetaGeneratedTool01; -import gregtech.api.GregTech_API; -import gregtech.api.enums.ItemList; -import gregtech.api.enums.Materials; -import gregtech.api.enums.OrePrefixes; -import gregtech.api.enums.Textures; -import gregtech.api.gui.GT_GUIContainer_MultiMachine; -import gregtech.api.interfaces.ITexture; -import gregtech.api.interfaces.metatileentity.IMetaTileEntity; -import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_MultiBlockBase; -import gregtech.api.objects.GT_RenderedTexture; -import gregtech.api.objects.ItemData; -import gregtech.api.util.GT_ModHandler; -import gregtech.api.util.GT_OreDictUnificator; -import gregtech.api.util.GT_Recipe; -import gregtech.api.util.GT_Utility; -import gregtech.common.blocks.GT_Block_Ores_Abstract; -import gregtech.common.blocks.GT_TileEntity_Ores; -import net.minecraft.block.Block; -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.init.Blocks; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.ChunkPosition; -import net.minecraft.world.World; -import net.minecraft.world.chunk.Chunk; -import net.minecraft.world.chunk.IChunkProvider; -import net.minecraftforge.common.util.ForgeDirection; -import net.minecraftforge.fluids.FluidStack; - -import java.util.ArrayList; -import java.util.zip.Inflater; - -public class Detrav_MetaTileEntity_AdvMiner2 extends GT_MetaTileEntity_MultiBlockBase { - - private final ArrayList<ChunkPosition> mMineList = new ArrayList(); - - public Detrav_MetaTileEntity_AdvMiner2(int aID, String aName, String aNameRegional) { - super(aID, aName, aNameRegional); - } - - public Detrav_MetaTileEntity_AdvMiner2(String aName) { - super(aName); - } - - public String[] getDescription() { - return new String[]{ - "Controller Block for the Ore Drilling Plant V", - "Default size is one chunk, use circuit configuration", - "to increase the size, {config}*2 + 1 chunks", - "Size(WxHxD): 3x7x3, Controller (Front middle bottom)", - "3x1x3 Base of Solid Steel Casings", - "1x3x1 Solid Steel Casing pillar (Center of base)", - "1x3x1 Steel Frame Boxes (Each Steel pillar side and on top)", - "1x Input Hatch (Any bottom layer casing)", - "1x Output Bus (Any bottom layer casing)", - "1x Maintenance Hatch (Any bottom layer casing)", - "1x MV+ Energy Hatch (Any bottom layer casing)"}; - } - - public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, boolean aActive, boolean aRedstone) { - if (aSide == aFacing) { - return new ITexture[]{Textures.BlockIcons.CASING_BLOCKS[16], new GT_RenderedTexture(aActive ? Textures.BlockIcons.OVERLAY_FRONT_OIL_DRILL_ACTIVE : Textures.BlockIcons.OVERLAY_FRONT_OIL_DRILL)}; - } - return new ITexture[]{Textures.BlockIcons.CASING_BLOCKS[16]}; - } - - public Object getClientGUI(int aID, InventoryPlayer aPlayerInventory, IGregTechTileEntity aBaseMetaTileEntity) { - return new GT_GUIContainer_MultiMachine(aPlayerInventory, aBaseMetaTileEntity, getLocalName(), "AdvMiner2.png"); - } - - - - @Override - public boolean checkRecipe(ItemStack aStack) { - - if(!moveFirst()) - return false; - - if (mInputHatches == null || mInputHatches.get(0).mFluid == null || mInputHatches.get(0).mFluid.getFluid().getID() != ItemList.sDrillingFluid.getID()) { - return false; - } - FluidStack tFluid = mInputHatches.get(0).mFluid.copy(); - if (tFluid == null) { - return false; - } - if (tFluid.amount < 100) { - return false; - } - tFluid.amount = 100; - depleteInput(tFluid); - long tVoltage = getMaxInputVoltage(); - - if (getBaseMetaTileEntity().getRandomNumber(10) <= 4 && - DetravMetaGeneratedItem01.INSTANCE.isConfiguredCircuit(mInventory[1])) { - - if (mMineList.isEmpty()) { - int x = getXCurrent(); - int z = getZCurrent(); - World w = getBaseMetaTileEntity().getWorld(); - if(w==null) return false; - Chunk c = w.getChunkProvider().provideChunk(x>>4,z>>4); - int x1 = x & 15; - int z1 = z & 15; - int yTo = getYTo(); - for(int yLevel = getYFrom(); yLevel>=yTo; yLevel --) - { - Block tBlock = c.getBlock(x1,yLevel,z1); - int tMetaID = c.getBlockMetadata(x1,yLevel,z1); - if (tBlock instanceof GT_Block_Ores_Abstract) { - TileEntity tTileEntity = c.getTileEntityUnsafe(x1,yLevel,z1); - if ((tTileEntity!=null) - && (tTileEntity instanceof GT_TileEntity_Ores) - && ((GT_TileEntity_Ores) tTileEntity).mNatural == true - && !mMineList.contains(new ChunkPosition(tTileEntity.xCoord, tTileEntity.yCoord, tTileEntity.zCoord))) { - mMineList.add(new ChunkPosition(tTileEntity.xCoord, tTileEntity.yCoord, tTileEntity.zCoord)); - } - } - else { - ItemData tAssotiation = GT_OreDictUnificator.getAssociation(new ItemStack(tBlock, 1, tMetaID)); - if ((tAssotiation != null) && (tAssotiation.mPrefix.toString().startsWith("ore"))) { - ChunkPosition cp = new ChunkPosition(x, yLevel, z); - if (!mMineList.contains(cp)) { - mMineList.add(cp); - } - } - } - } - } - - - ArrayList<ItemStack> tDrops = new ArrayList(); - Block tMineBlock = null; - ChunkPosition mle = null;; - while ((tMineBlock==null || tMineBlock == Blocks.air) && !mMineList.isEmpty()) { - mle = mMineList.get(0); - mMineList.remove(0); - tMineBlock = getBaseMetaTileEntity() - .getWorld() - .getChunkProvider() - .provideChunk( mle.chunkPosX >> 4, mle.chunkPosZ >> 4 ) - .getBlock(mle.chunkPosX&15, mle.chunkPosY, mle.chunkPosZ&15); - } - - if (tMineBlock!=null && tMineBlock!=Blocks.air) { - int metadata = getBaseMetaTileEntity().getMetaID(mle.chunkPosX, mle.chunkPosY, mle.chunkPosZ); - boolean silkTouch = tMineBlock.canSilkHarvest(getBaseMetaTileEntity().getWorld(), null, mle.chunkPosX, mle.chunkPosY, mle.chunkPosZ, metadata); - if (silkTouch){ - ItemStack IS = new ItemStack(tMineBlock); - IS.setItemDamage(metadata); - IS.stackSize=1; - tDrops.add(IS); - } - else{ - tDrops = tMineBlock.getDrops(getBaseMetaTileEntity().getWorld(), mle.chunkPosX, mle.chunkPosY, mle.chunkPosZ, metadata, 1); - } - - getBaseMetaTileEntity().getWorld().setBlock(mle.chunkPosX, mle.chunkPosY , mle.chunkPosZ,Blocks.dirt); - if (!tDrops.isEmpty()) { - ItemData tData = GT_OreDictUnificator.getItemData(tDrops.get(0).copy()); - if (tData.mPrefix != OrePrefixes.crushed && tData.mMaterial.mMaterial != Materials.Oilsands) { - - GT_Recipe tRecipe = GT_Recipe.GT_Recipe_Map.sMaceratorRecipes.findRecipe(getBaseMetaTileEntity(), false, tVoltage, null, tDrops.get(0).copy()); - if (tRecipe != null) { - this.mOutputItems = new ItemStack[tRecipe.mOutputs.length]; - for (int g = 0; g < mOutputItems.length; g++) { - mOutputItems[g] = tRecipe.mOutputs[g].copy(); - if (getBaseMetaTileEntity().getRandomNumber(10000) < tRecipe.getOutputChance(g)) { - mOutputItems[g].stackSize *= getBaseMetaTileEntity().getRandomNumber(4) + 1; - } - } - } else { - this.mOutputItems = new ItemStack[tDrops.size()]; - for (int g = 0; g < mOutputItems.length; g++) { - mOutputItems[g] = tDrops.get(g).copy(); - } - } - } else { - this.mOutputItems = null; - ItemStack[] tStack = new ItemStack[tDrops.size()]; - for (int j = 0; j < tDrops.size(); j++) { - tStack[j] = tDrops.get(j).copy(); - tStack[j].stackSize = tStack[j].stackSize * (getBaseMetaTileEntity().getRandomNumber(4) + 1); - } - mOutputItems = tStack; - } - } - } - else - { - if (mEnergyHatches.size() > 0 && mEnergyHatches.get(0).getEUVar() > (512 + getMaxInputVoltage() * 4)) { - moveNext(); - } - } - } - - byte tTier = (byte) Math.max(1, GT_Utility.getTier(tVoltage)); - this.mEfficiency = (10000 - (getIdealStatus() - getRepairStatus()) * 1000); - this.mEfficiencyIncrease = 10000; - int tEU = 48; - int tDuration = 24; - if (tEU <= 16) { - this.mEUt = (tEU * (1 << tTier - 1) * (1 << tTier - 1)); - this.mMaxProgresstime = (tDuration / (1 << tTier - 1)); - } else { - this.mEUt = tEU; - this.mMaxProgresstime = tDuration; - while (this.mEUt <= gregtech.api.enums.GT_Values.V[(tTier - 1)]) { - this.mEUt *= 4; - this.mMaxProgresstime /= 2; - } - } - if (this.mEUt > 0) { - this.mEUt = (-this.mEUt); - } - this.mMaxProgresstime = Math.max(1, this.mMaxProgresstime); - return true; - } - - - - - private boolean moveFirst() { - int circuit_config = 1; - if (mInventory[1] == null) - return false; - if (mInventory[1].stackSize > 1) return false; - if (mInventory[1].getUnlocalizedName().startsWith("gt.integrated_circuit")) { - circuit_config = mInventory[1].getItemDamage(); - circuit_config *= 2; - circuit_config++; - { - ItemStack aCircuit = mInventory[1]; - NBTTagCompound aNBT = aCircuit.getTagCompound(); - if (aNBT == null) { - aNBT = new NBTTagCompound(); - NBTTagCompound detravPosition = new NBTTagCompound(); - aNBT.setTag("DetravPosition", detravPosition); - aCircuit.setTagCompound(aNBT); - } - - NBTTagCompound detravPosition = aNBT.getCompoundTag("DetravPosition"); - if (detravPosition == null) { - detravPosition = new NBTTagCompound(); - aNBT.setTag("DetravPosition", detravPosition); - } - - int x_from = ((getBaseMetaTileEntity().getXCoord() >> 4) - circuit_config + 1) * 16 - 16 * 3; - int x_to = ((getBaseMetaTileEntity().getXCoord() >> 4) + circuit_config) * 16 + 16 * 3; - int z_from = ((getBaseMetaTileEntity().getZCoord() >> 4) - circuit_config + 1) * 16 - 16 * 3; - int z_to = ((getBaseMetaTileEntity().getZCoord() >> 4) + circuit_config) * 16 + 16 * 3; - - int x_current = x_from; - int z_current = z_from; - - if(!detravPosition.hasKey("Configured")) { - detravPosition.setBoolean("Configured", true); - detravPosition.setInteger("XCurrent",x_current); - detravPosition.setInteger("ZCurrent",z_current); - } - else - { - if(detravPosition.hasKey("XCurrent")) - x_current = detravPosition.getInteger("XCurrent"); - if(detravPosition.hasKey("ZCurrent")) - z_current = detravPosition.getInteger("ZCurrent"); - } - - World aWorld = getBaseMetaTileEntity().getWorld(); - IChunkProvider provider = aWorld.getChunkProvider(); - for (int i = x_current; i <= x_to; i += 16) - for (int j = z_current; j <= z_to; j += 16) { - if (!provider.provideChunk(i >> 4, j >> 4).isTerrainPopulated) { - provider.populate(provider, (i >> 4), (j >> 4) ); - detravPosition.setInteger("XCurrent",i); - detravPosition.setInteger("ZCurrent",j); - return true; - } - } - - } - { - mInventory[1] = DetravItemList.ConfiguredCircuit.get(1); - ItemStack aCircuit = mInventory[1]; - - //in here if circuit is empty set data to chunk - - - NBTTagCompound aNBT = aCircuit.getTagCompound(); - if (aNBT == null) { - aNBT = new NBTTagCompound(); - NBTTagCompound detravPosition = new NBTTagCompound(); - aNBT.setTag("DetravPosition", detravPosition); - aCircuit.setTagCompound(aNBT); - } - - NBTTagCompound detravPosition = aNBT.getCompoundTag("DetravPosition"); - if (detravPosition == null) { - detravPosition = new NBTTagCompound(); - aNBT.setTag("DetravPosition", detravPosition); - } - - - int x_from = ((getBaseMetaTileEntity().getXCoord() >> 4) - circuit_config + 1) * 16; - int x_to = ((getBaseMetaTileEntity().getXCoord() >> 4) + circuit_config) * 16; - int x_current = x_from; - int z_from = ((getBaseMetaTileEntity().getZCoord() >> 4) - circuit_config + 1) * 16; - int z_to = ((getBaseMetaTileEntity().getZCoord() >> 4) + circuit_config) * 16; - int z_current = z_from; - - int y_from = getBaseMetaTileEntity().getYCoord() - 1; - int y_to = 1; - - detravPosition.setInteger("XFrom", x_from); - detravPosition.setInteger("XTo", x_to); - detravPosition.setInteger("XCurrent", x_current); - detravPosition.setInteger("ZFrom", z_from); - detravPosition.setInteger("ZTo", z_to); - detravPosition.setInteger("ZCurrent", z_current); - detravPosition.setInteger("YFrom",y_from); - detravPosition.setInteger("YTo", y_to); - - } - } - if (DetravMetaGeneratedItem01.INSTANCE.isConfiguredCircuit(mInventory[1])) { - NBTTagCompound aNBT = mInventory[1].getTagCompound(); - if (aNBT == null) { - return false; - } - - NBTTagCompound detravPosition = aNBT.getCompoundTag("DetravPosition"); - if (detravPosition == null) { - return false; - } - if (detravPosition.hasKey("Finished")) - return !detravPosition.getBoolean("Finished"); - return true; - } - return false; - } - - private int getXCurrent() - { - int fakeResult = getBaseMetaTileEntity().getXCoord(); - if(mInventory[1] == null) return fakeResult; - ItemStack aCircuit = mInventory[1]; - NBTTagCompound aNBT = aCircuit.getTagCompound(); - if(aNBT == null) return fakeResult; - NBTTagCompound detravPosition = aNBT.getCompoundTag("DetravPosition"); - if (detravPosition == null ) return fakeResult; - - if(detravPosition.hasKey("Finished")) - if(detravPosition.getBoolean("Finished")) - return fakeResult; - - return detravPosition.getInteger("XCurrent"); - } - - private int getYFrom() - { - int fakeResult = getBaseMetaTileEntity().getYCoord()-1; - if(mInventory[1] == null) return fakeResult; - ItemStack aCircuit = mInventory[1]; - NBTTagCompound aNBT = aCircuit.getTagCompound(); - if(aNBT == null) return fakeResult; - NBTTagCompound detravPosition = aNBT.getCompoundTag("DetravPosition"); - if (detravPosition == null ) return fakeResult; - - if(detravPosition.hasKey("Finished")) - if(detravPosition.getBoolean("Finished")) - return fakeResult; - - if(!detravPosition.hasKey("YFrom")) - return fakeResult; - - int y_from = detravPosition.getInteger("YFrom");; - if(y_from < 1 || y_from > 254) - return fakeResult; - return y_from; - } - - private int getYTo() { - int fakeResult = getBaseMetaTileEntity().getYCoord() - 1; - if (mInventory[1] == null) return fakeResult; - ItemStack aCircuit = mInventory[1]; - NBTTagCompound aNBT = aCircuit.getTagCompound(); - if (aNBT == null) return fakeResult; - NBTTagCompound detravPosition = aNBT.getCompoundTag("DetravPosition"); - if (detravPosition == null) return fakeResult; - - if (detravPosition.hasKey("Finished")) - if (detravPosition.getBoolean("Finished")) - return fakeResult; - if(!detravPosition.hasKey("YTo")) - return 1; - - int y_to = detravPosition.getInteger("YTo"); - - if (y_to > 254) - return fakeResult; - if (y_to < 1) - return 1; - return y_to; - } - - private int getZCurrent() - { - int fakeResult = getBaseMetaTileEntity().getZCoord(); - if(mInventory[1] == null) return fakeResult; - ItemStack aCircuit = mInventory[1]; - NBTTagCompound aNBT = aCircuit.getTagCompound(); - if(aNBT == null) return fakeResult; - NBTTagCompound detravPosition = aNBT.getCompoundTag("DetravPosition"); - if (detravPosition == null ) return fakeResult; - - if(detravPosition.hasKey("Finished")) - if(detravPosition.getBoolean("Finished")) - return fakeResult; - - return detravPosition.getInteger("ZCurrent"); - } - - - private boolean moveNext() { - if(mInventory[1] == null) return false; - ItemStack aCircuit = mInventory[1]; - NBTTagCompound aNBT = aCircuit.getTagCompound(); - if(aNBT == null) return false; - NBTTagCompound detravPosition = aNBT.getCompoundTag("DetravPosition"); - if (detravPosition == null ) return false; - - if(detravPosition.hasKey("Finished")) - if(detravPosition.getBoolean("Finished")) - return false; - - int x_from = detravPosition.getInteger("XFrom"); - int z_from = detravPosition.getInteger("ZFrom"); - int x_to = detravPosition.getInteger("XTo"); - int z_to = detravPosition.getInteger("ZTo"); - int x_current = detravPosition.getInteger("XCurrent"); - int z_current = detravPosition.getInteger("ZCurrent"); - int y_from = detravPosition.getInteger("YFrom"); - int y_to = detravPosition.getInteger("YTo"); - - if(x_from > x_to) - { - int temp = x_to; - x_to = x_from; - x_from = temp; - detravPosition.setInteger("XFrom",x_from); - detravPosition.setInteger("XTo",x_to); - } - - if(z_from > z_to) - { - int temp = z_to; - z_to = z_from; - z_from = temp; - detravPosition.setInteger("ZFrom",z_from); - detravPosition.setInteger("ZTo",z_to); - } - - if(y_from < y_to) - { - int temp = y_to; - y_to = y_from; - y_from = temp; - detravPosition.setInteger("YFrom",y_from); - detravPosition.setInteger("YTo",y_to); - } - - if(z_current < z_to) - z_current++; - else { - if (x_current < x_to) { - z_current = z_from; - x_current++; - } else { - detravPosition.setBoolean("Finished", true); - if (detravPosition.hasKey("Percent")) - detravPosition.removeTag("Percent"); - return false; - } - } - - detravPosition.setInteger("Percent", (int)( - ((float)(z_current - z_from + (x_current - x_from) * (z_to - z_from ))) - * 100f - /((float)( (x_to - x_from + 1 )*(z_to-z_from))))); - - - detravPosition.setInteger("XCurrent",x_current); - detravPosition.setInteger("ZCurrent",z_current); - - return true; - } - - @Override - public boolean checkMachine(IGregTechTileEntity aBaseMetaTileEntity, ItemStack aStack) { - int xDir = ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetX; - int zDir = ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetZ; - for (int i = -1; i < 2; i++) { - for (int j = -1; j < 2; j++) { - if ((xDir + i != 0) || (zDir + j != 0)) { - IGregTechTileEntity tTileEntity = aBaseMetaTileEntity.getIGregTechTileEntityOffset(xDir + i, 0, zDir + j); - if ((!addMaintenanceToMachineList(tTileEntity, 16)) && (!addInputToMachineList(tTileEntity, 16)) && (!addOutputToMachineList(tTileEntity, 16)) && (!addEnergyInputToMachineList(tTileEntity, 16))) { - if (aBaseMetaTileEntity.getBlockOffset(xDir + i, 0, zDir + j) != GregTech_API.sBlockCasings2) { - return false; - } - if (aBaseMetaTileEntity.getMetaIDOffset(xDir + i, 0, zDir + j) != 0) { - return false; - } - } - } - } - } - for (int y = 1; y < 4; y++) { - if (aBaseMetaTileEntity.getBlockOffset(xDir, y, zDir) != GregTech_API.sBlockCasings2) { - return false; - } - if (aBaseMetaTileEntity.getBlockOffset(xDir + 1, y, zDir) != GregTech_API.sBlockMachines) { - return false; - } - if (aBaseMetaTileEntity.getBlockOffset(xDir - 1, y, zDir) != GregTech_API.sBlockMachines) { - return false; - } - if (aBaseMetaTileEntity.getBlockOffset(xDir, y, zDir + 1) != GregTech_API.sBlockMachines) { - return false; - } - if (aBaseMetaTileEntity.getBlockOffset(xDir, y, zDir - 1) != GregTech_API.sBlockMachines) { - return false; - } - if (aBaseMetaTileEntity.getBlockOffset(xDir, y + 3, zDir) != GregTech_API.sBlockMachines) { - return false; - } - } - return true; - } - - @Override - public boolean isCorrectMachinePart(ItemStack aStack) { - return true; - } - - @Override - public int getMaxEfficiency(ItemStack aStack) { - return 10000; - } - - @Override - public int getPollutionPerTick(ItemStack aStack) { - return 0; - } - - @Override - public int getDamageToComponent(ItemStack aStack) { - return 0; - } - - @Override - public boolean explodesOnComponentBreak(ItemStack aStack) { - return false; - } - - public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new Detrav_MetaTileEntity_AdvMiner2(this.mName); - } - -} diff --git a/src/main/java/com/detrav/tileentities/Detrav_MetaTileEntity_Boiler_Solar_High.java b/src/main/java/com/detrav/tileentities/Detrav_MetaTileEntity_Boiler_Solar_High.java deleted file mode 100644 index 9cb54ce2ff..0000000000 --- a/src/main/java/com/detrav/tileentities/Detrav_MetaTileEntity_Boiler_Solar_High.java +++ /dev/null @@ -1,152 +0,0 @@ -package com.detrav.tileentities; - -/** - * Created by wital_000 on 04.05.2016. - */ - -import gregtech.api.enums.Dyes; -import gregtech.api.enums.Textures; -import gregtech.api.interfaces.ITexture; -import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import gregtech.api.metatileentity.MetaTileEntity; -import gregtech.api.objects.GT_RenderedTexture; -import gregtech.api.util.GT_ModHandler; -import gregtech.common.gui.GT_Container_Boiler; -import gregtech.common.gui.GT_GUIContainer_Boiler; -import gregtech.common.tileentities.boilers.GT_MetaTileEntity_Boiler; -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraftforge.common.util.ForgeDirection; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fluids.IFluidHandler; - -public class Detrav_MetaTileEntity_Boiler_Solar_High extends GT_MetaTileEntity_Boiler { - public Detrav_MetaTileEntity_Boiler_Solar_High(int aID, String aName, String aNameRegional) { - super(aID, aName, aNameRegional, "Steam Power by the Sun", new ITexture[0]); - } - - public Detrav_MetaTileEntity_Boiler_Solar_High(String aName, int aTier, String aDescription, ITexture[][][] aTextures) { - super(aName, aTier, aDescription, aTextures); - } - - @Override - public String[] getDescription() { - return new String[]{mDescription, "Produces 600L of Steam per second"}; - } - - public ITexture[][][] getTextureSet(ITexture[] aTextures) { - ITexture[][][] rTextures = new ITexture[4][17][]; - for (byte i = -1; i < 16; i = (byte) (i + 1)) { - ITexture[] tmp0 = {new GT_RenderedTexture(Textures.BlockIcons.MACHINE_LV_BOTTOM, Dyes.getModulation(i, Dyes._NULL.mRGBa))}; - rTextures[0][(i + 1)] = tmp0; - ITexture[] tmp1 = {new GT_RenderedTexture(Textures.BlockIcons.MACHINE_LV_TOP, Dyes.getModulation(i, Dyes._NULL.mRGBa)), new GT_RenderedTexture(Textures.BlockIcons.BOILER_SOLAR,Dyes.dyeYellow.getRGBA())}; - rTextures[1][(i + 1)] = tmp1; - ITexture[] tmp2 = {new GT_RenderedTexture(Textures.BlockIcons.MACHINE_LV_SIDE, Dyes.getModulation(i, Dyes._NULL.mRGBa))}; - rTextures[2][(i + 1)] = tmp2; - ITexture[] tmp3 = {new GT_RenderedTexture(Textures.BlockIcons.MACHINE_LV_SIDE, Dyes.getModulation(i, Dyes._NULL.mRGBa)), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE)}; - rTextures[3][(i + 1)] = tmp3; - } - return rTextures; - } - - public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, boolean aActive, boolean aRedstone) { - return mTextures[aSide >= 2 ? ((byte) (aSide != aFacing ? 2 : 3)) : aSide][aColorIndex + 1]; - } - - public int maxProgresstime() { - return 200; - } - - public Object getServerGUI(int aID, InventoryPlayer aPlayerInventory, IGregTechTileEntity aBaseMetaTileEntity) { - return new GT_Container_Boiler(aPlayerInventory, aBaseMetaTileEntity, 16000); - } - - public Object getClientGUI(int aID, InventoryPlayer aPlayerInventory, IGregTechTileEntity aBaseMetaTileEntity) { - return new GT_GUIContainer_Boiler(aPlayerInventory, aBaseMetaTileEntity, "SolarBoiler.png", 16000); - } - - public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new Detrav_MetaTileEntity_Boiler_Solar_High(this.mName, this.mTier, this.mDescription, this.mTextures); - } - - private int mRunTime = 0; - - @Override - public void saveNBTData(NBTTagCompound aNBT) { - super.saveNBTData(aNBT); - aNBT.setInteger("mRunTime", this.mRunTime); - } - - @Override - public void loadNBTData(NBTTagCompound aNBT) { - super.loadNBTData(aNBT); - this.mRunTime = aNBT.getInteger("mRunTime"); - } - - public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) { - if ((aBaseMetaTileEntity.isServerSide()) && (aTick > 20L)) { - if (this.mTemperature <= 20) { - this.mTemperature = 20; - this.mLossTimer = 0; - } - if (++this.mLossTimer > 45) { - this.mTemperature -= 5; - this.mLossTimer = 0; - } - if (this.mSteam != null) { - byte i = aBaseMetaTileEntity.getFrontFacing(); - IFluidHandler tTileEntity = aBaseMetaTileEntity.getITankContainerAtSide(i); - if (tTileEntity != null) { - FluidStack tDrained = aBaseMetaTileEntity.drain(ForgeDirection.getOrientation(i), Math.max(1, this.mSteam.amount / 2), false); - if (tDrained != null) { - int tFilledAmount = tTileEntity.fill(ForgeDirection.getOrientation(i).getOpposite(), tDrained, false); - if (tFilledAmount > 0) { - tTileEntity.fill(ForgeDirection.getOrientation(i).getOpposite(), aBaseMetaTileEntity.drain(ForgeDirection.getOrientation(i), tFilledAmount, true), true); - } - } - } - } - if (aTick % 25L == 0L) { - if (this.mTemperature > 100) { - if ((this.mFluid == null) || (!GT_ModHandler.isWater(this.mFluid)) || (this.mFluid.amount <= 0)) { - this.mHadNoWater = true; - } else { - if (this.mHadNoWater) { - aBaseMetaTileEntity.doExplosion(2048L); - return; - } - this.mFluid.amount -= 1; - mRunTime += 1; - int tOutput = 750;//30 steam/tick - /*if(mRunTime > 10000){ - tOutput = Math.max(50, 150 - ((mRunTime-10000)/100)); - }*/ - if (this.mSteam == null) { - this.mSteam = GT_ModHandler.getSteam(tOutput); - } else if (GT_ModHandler.isSteam(this.mSteam)) { - this.mSteam.amount += tOutput; - } else { - this.mSteam = GT_ModHandler.getSteam(tOutput); - } - } - } else { - this.mHadNoWater = false; - } - } - if ((this.mSteam != null) && - (this.mSteam.amount > 16000)) { - sendSound((byte) 1); - this.mSteam.amount = 12000; - } - if ((this.mProcessingEnergy <= 0) && (aBaseMetaTileEntity.isAllowedToWork()) && (aTick % 256L == 0L) && (!aBaseMetaTileEntity.getWorld().isThundering())) { - boolean bRain = aBaseMetaTileEntity.getWorld().isRaining() && aBaseMetaTileEntity.getBiome().rainfall > 0.0F; - mProcessingEnergy += bRain && aBaseMetaTileEntity.getWorld().skylightSubtracted >= 4 || !aBaseMetaTileEntity.getSkyAtSide((byte) 1) ? 0 : !bRain && aBaseMetaTileEntity.getWorld().isDaytime() ? 8 : 1; - } - if ((this.mTemperature < 200) && (this.mProcessingEnergy > 0) && (aTick % 12L == 0L)) { - this.mProcessingEnergy -= 1; - this.mTemperature += 5; - } - aBaseMetaTileEntity.setActive(this.mProcessingEnergy > 0); - } - } -} diff --git a/src/main/java/com/detrav/tileentities/Detrav_MetaTileEntity_Boiler_Solar_Low.java b/src/main/java/com/detrav/tileentities/Detrav_MetaTileEntity_Boiler_Solar_Low.java deleted file mode 100644 index 742f008dce..0000000000 --- a/src/main/java/com/detrav/tileentities/Detrav_MetaTileEntity_Boiler_Solar_Low.java +++ /dev/null @@ -1,152 +0,0 @@ -package com.detrav.tileentities; - -/** - * Created by wital_000 on 04.05.2016. - */ - -import gregtech.api.enums.Dyes; -import gregtech.api.enums.Textures; -import gregtech.api.interfaces.ITexture; -import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import gregtech.api.metatileentity.MetaTileEntity; -import gregtech.api.objects.GT_RenderedTexture; -import gregtech.api.util.GT_ModHandler; -import gregtech.common.gui.GT_Container_Boiler; -import gregtech.common.gui.GT_GUIContainer_Boiler; -import gregtech.common.tileentities.boilers.GT_MetaTileEntity_Boiler; -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraftforge.common.util.ForgeDirection; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fluids.IFluidHandler; - -public class Detrav_MetaTileEntity_Boiler_Solar_Low extends GT_MetaTileEntity_Boiler { - public Detrav_MetaTileEntity_Boiler_Solar_Low(int aID, String aName, String aNameRegional) { - super(aID, aName, aNameRegional, "Steam Power by the Sun, 6mB/t", new ITexture[0]); - } - - public Detrav_MetaTileEntity_Boiler_Solar_Low(String aName, int aTier, String aDescription, ITexture[][][] aTextures) { - super(aName, aTier, aDescription, aTextures); - } - - @Override - public String[] getDescription() { - return new String[]{mDescription, "This machine can not explode!"}; - } - - public ITexture[][][] getTextureSet(ITexture[] aTextures) { - ITexture[][][] rTextures = new ITexture[4][17][]; - for (byte i = -1; i < 16; i = (byte) (i + 1)) { - ITexture[] tmp0 = {new GT_RenderedTexture(Textures.BlockIcons.MACHINE_BRONZEBRICKS_BOTTOM, Dyes.getModulation(i, Dyes._NULL.mRGBa))}; - rTextures[0][(i + 1)] = tmp0; - ITexture[] tmp1 = {new GT_RenderedTexture(Textures.BlockIcons.MACHINE_BRONZEBRICKS_TOP, Dyes.getModulation(i, Dyes._NULL.mRGBa)), new GT_RenderedTexture(Textures.BlockIcons.BOILER_SOLAR, Dyes.dyeBlack.getRGBA())}; - rTextures[1][(i + 1)] = tmp1; - ITexture[] tmp2 = {new GT_RenderedTexture(Textures.BlockIcons.MACHINE_BRONZEBRICKS_SIDE, Dyes.getModulation(i, Dyes._NULL.mRGBa))}; - rTextures[2][(i + 1)] = tmp2; - ITexture[] tmp3 = {new GT_RenderedTexture(Textures.BlockIcons.MACHINE_BRONZEBRICKS_SIDE, Dyes.getModulation(i, Dyes._NULL.mRGBa)), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE)}; - rTextures[3][(i + 1)] = tmp3; - } - return rTextures; - } - - public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, boolean aActive, boolean aRedstone) { - return mTextures[aSide >= 2 ? ((byte) (aSide != aFacing ? 2 : 3)) : aSide][aColorIndex + 1]; - } - - public int maxProgresstime() { - return 200; - } - - public Object getServerGUI(int aID, InventoryPlayer aPlayerInventory, IGregTechTileEntity aBaseMetaTileEntity) { - return new GT_Container_Boiler(aPlayerInventory, aBaseMetaTileEntity, 16000); - } - - public Object getClientGUI(int aID, InventoryPlayer aPlayerInventory, IGregTechTileEntity aBaseMetaTileEntity) { - return new GT_GUIContainer_Boiler(aPlayerInventory, aBaseMetaTileEntity, "SolarBoiler.png", 16000); - } - - public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new Detrav_MetaTileEntity_Boiler_Solar_Low(this.mName, this.mTier, this.mDescription, this.mTextures); - } - - private int mRunTime = 0; - - @Override - public void saveNBTData(NBTTagCompound aNBT) { - super.saveNBTData(aNBT); - aNBT.setInteger("mRunTime", this.mRunTime); - } - - @Override - public void loadNBTData(NBTTagCompound aNBT) { - super.loadNBTData(aNBT); - this.mRunTime = aNBT.getInteger("mRunTime"); - } - - public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) { - if ((aBaseMetaTileEntity.isServerSide()) && (aTick > 20L)) { - if (this.mTemperature <= 20) { - this.mTemperature = 20; - this.mLossTimer = 0; - } - if (++this.mLossTimer > 45) { - this.mTemperature -= 5; - this.mLossTimer = 0; - } - if (this.mSteam != null) { - byte i = aBaseMetaTileEntity.getFrontFacing(); - IFluidHandler tTileEntity = aBaseMetaTileEntity.getITankContainerAtSide(i); - if (tTileEntity != null) { - FluidStack tDrained = aBaseMetaTileEntity.drain(ForgeDirection.getOrientation(i), Math.max(1, this.mSteam.amount / 2), false); - if (tDrained != null) { - int tFilledAmount = tTileEntity.fill(ForgeDirection.getOrientation(i).getOpposite(), tDrained, false); - if (tFilledAmount > 0) { - tTileEntity.fill(ForgeDirection.getOrientation(i).getOpposite(), aBaseMetaTileEntity.drain(ForgeDirection.getOrientation(i), tFilledAmount, true), true); - } - } - } - } - if (aTick % 25L == 0L) { - if (this.mTemperature > 100) { - if ((this.mFluid == null) || (!GT_ModHandler.isWater(this.mFluid)) || (this.mFluid.amount <= 0)) { - this.mHadNoWater = true; - } else { - if (this.mHadNoWater) { - //aBaseMetaTileEntity.doExplosion(2048L); - return; - } - this.mFluid.amount -= 1; - mRunTime += 1; - int tOutput = 150;//6 steam/tick - /*if(mRunTime > 10000){ - tOutput = Math.max(50, 150 - ((mRunTime-10000)/100)); - }*/ - if (this.mSteam == null) { - this.mSteam = GT_ModHandler.getSteam(tOutput); - } else if (GT_ModHandler.isSteam(this.mSteam)) { - this.mSteam.amount += tOutput; - } else { - this.mSteam = GT_ModHandler.getSteam(tOutput); - } - } - } else { - this.mHadNoWater = false; - } - } - if ((this.mSteam != null) && - (this.mSteam.amount > 16000)) { - sendSound((byte) 1); - this.mSteam.amount = 12000; - } - if ((this.mProcessingEnergy <= 0) && (aBaseMetaTileEntity.isAllowedToWork()) && (aTick % 256L == 0L) && (!aBaseMetaTileEntity.getWorld().isThundering())) { - boolean bRain = aBaseMetaTileEntity.getWorld().isRaining() && aBaseMetaTileEntity.getBiome().rainfall > 0.0F; - mProcessingEnergy += bRain && aBaseMetaTileEntity.getWorld().skylightSubtracted >= 4 || !aBaseMetaTileEntity.getSkyAtSide((byte) 1) ? 0 : !bRain && aBaseMetaTileEntity.getWorld().isDaytime() ? 8 : 1; - } - if ((this.mTemperature < 200) && (this.mProcessingEnergy > 0) && (aTick % 12L == 0L)) { - this.mProcessingEnergy -= 1; - this.mTemperature += 5; - } - aBaseMetaTileEntity.setActive(this.mProcessingEnergy > 0); - } - } -} diff --git a/src/main/java/com/detrav/tileentities/Detrav_MetaTileEntity_Boiler_Solar_Medium.java b/src/main/java/com/detrav/tileentities/Detrav_MetaTileEntity_Boiler_Solar_Medium.java deleted file mode 100644 index 01cf37d062..0000000000 --- a/src/main/java/com/detrav/tileentities/Detrav_MetaTileEntity_Boiler_Solar_Medium.java +++ /dev/null @@ -1,152 +0,0 @@ -package com.detrav.tileentities; - -/** - * Created by wital_000 on 04.05.2016. - */ - -import gregtech.api.enums.Dyes; -import gregtech.api.enums.Textures; -import gregtech.api.interfaces.ITexture; -import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import gregtech.api.metatileentity.MetaTileEntity; -import gregtech.api.objects.GT_RenderedTexture; -import gregtech.api.util.GT_ModHandler; -import gregtech.common.gui.GT_Container_Boiler; -import gregtech.common.gui.GT_GUIContainer_Boiler; -import gregtech.common.tileentities.boilers.GT_MetaTileEntity_Boiler; -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraftforge.common.util.ForgeDirection; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fluids.IFluidHandler; - -public class Detrav_MetaTileEntity_Boiler_Solar_Medium extends GT_MetaTileEntity_Boiler { - public Detrav_MetaTileEntity_Boiler_Solar_Medium(int aID, String aName, String aNameRegional) { - super(aID, aName, aNameRegional, "Steam Power by the Sun", new ITexture[0]); - } - - public Detrav_MetaTileEntity_Boiler_Solar_Medium(String aName, int aTier, String aDescription, ITexture[][][] aTextures) { - super(aName, aTier, aDescription, aTextures); - } - - @Override - public String[] getDescription() { - return new String[]{mDescription, "Produces 300L of Steam per second"}; - } - - public ITexture[][][] getTextureSet(ITexture[] aTextures) { - ITexture[][][] rTextures = new ITexture[4][17][]; - for (byte i = -1; i < 16; i = (byte) (i + 1)) { - ITexture[] tmp0 = {new GT_RenderedTexture(Textures.BlockIcons.MACHINE_STEELBRICKS_BOTTOM, Dyes.getModulation(i, Dyes._NULL.mRGBa))}; - rTextures[0][(i + 1)] = tmp0; - ITexture[] tmp1 = {new GT_RenderedTexture(Textures.BlockIcons.MACHINE_STEELBRICKS_TOP, Dyes.getModulation(i, Dyes._NULL.mRGBa)), new GT_RenderedTexture(Textures.BlockIcons.BOILER_SOLAR,Dyes.dyeLightGray.getRGBA())}; - rTextures[1][(i + 1)] = tmp1; - ITexture[] tmp2 = {new GT_RenderedTexture(Textures.BlockIcons.MACHINE_STEELBRICKS_SIDE, Dyes.getModulation(i, Dyes._NULL.mRGBa))}; - rTextures[2][(i + 1)] = tmp2; - ITexture[] tmp3 = {new GT_RenderedTexture(Textures.BlockIcons.MACHINE_STEELBRICKS_SIDE, Dyes.getModulation(i, Dyes._NULL.mRGBa)), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE)}; - rTextures[3][(i + 1)] = tmp3; - } - return rTextures; - } - - public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, boolean aActive, boolean aRedstone) { - return mTextures[aSide >= 2 ? ((byte) (aSide != aFacing ? 2 : 3)) : aSide][aColorIndex + 1]; - } - - public int maxProgresstime() { - return 200; - } - - public Object getServerGUI(int aID, InventoryPlayer aPlayerInventory, IGregTechTileEntity aBaseMetaTileEntity) { - return new GT_Container_Boiler(aPlayerInventory, aBaseMetaTileEntity, 16000); - } - - public Object getClientGUI(int aID, InventoryPlayer aPlayerInventory, IGregTechTileEntity aBaseMetaTileEntity) { - return new GT_GUIContainer_Boiler(aPlayerInventory, aBaseMetaTileEntity, "SolarBoiler.png", 16000); - } - - public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new Detrav_MetaTileEntity_Boiler_Solar_Medium(this.mName, this.mTier, this.mDescription, this.mTextures); - } - - private int mRunTime = 0; - - @Override - public void saveNBTData(NBTTagCompound aNBT) { - super.saveNBTData(aNBT); - aNBT.setInteger("mRunTime", this.mRunTime); - } - - @Override - public void loadNBTData(NBTTagCompound aNBT) { - super.loadNBTData(aNBT); - this.mRunTime = aNBT.getInteger("mRunTime"); - } - - public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) { - if ((aBaseMetaTileEntity.isServerSide()) && (aTick > 20L)) { - if (this.mTemperature <= 20) { - this.mTemperature = 20; - this.mLossTimer = 0; - } - if (++this.mLossTimer > 45) { - this.mTemperature -= 5; - this.mLossTimer = 0; - } - if (this.mSteam != null) { - byte i = aBaseMetaTileEntity.getFrontFacing(); - IFluidHandler tTileEntity = aBaseMetaTileEntity.getITankContainerAtSide(i); - if (tTileEntity != null) { - FluidStack tDrained = aBaseMetaTileEntity.drain(ForgeDirection.getOrientation(i), Math.max(1, this.mSteam.amount / 2), false); - if (tDrained != null) { - int tFilledAmount = tTileEntity.fill(ForgeDirection.getOrientation(i).getOpposite(), tDrained, false); - if (tFilledAmount > 0) { - tTileEntity.fill(ForgeDirection.getOrientation(i).getOpposite(), aBaseMetaTileEntity.drain(ForgeDirection.getOrientation(i), tFilledAmount, true), true); - } - } - } - } - if (aTick % 25L == 0L) { - if (this.mTemperature > 100) { - if ((this.mFluid == null) || (!GT_ModHandler.isWater(this.mFluid)) || (this.mFluid.amount <= 0)) { - this.mHadNoWater = true; - } else { - if (this.mHadNoWater) { - aBaseMetaTileEntity.doExplosion(2048L); - return; - } - this.mFluid.amount -= 1; - mRunTime += 1; - int tOutput = 375;//15 steam/tick - /*if(mRunTime > 10000){ - tOutput = Math.max(50, 150 - ((mRunTime-10000)/100)); - }*/ - if (this.mSteam == null) { - this.mSteam = GT_ModHandler.getSteam(tOutput); - } else if (GT_ModHandler.isSteam(this.mSteam)) { - this.mSteam.amount += tOutput; - } else { - this.mSteam = GT_ModHandler.getSteam(tOutput); - } - } - } else { - this.mHadNoWater = false; - } - } - if ((this.mSteam != null) && - (this.mSteam.amount > 16000)) { - sendSound((byte) 1); - this.mSteam.amount = 12000; - } - if ((this.mProcessingEnergy <= 0) && (aBaseMetaTileEntity.isAllowedToWork()) && (aTick % 256L == 0L) && (!aBaseMetaTileEntity.getWorld().isThundering())) { - boolean bRain = aBaseMetaTileEntity.getWorld().isRaining() && aBaseMetaTileEntity.getBiome().rainfall > 0.0F; - mProcessingEnergy += bRain && aBaseMetaTileEntity.getWorld().skylightSubtracted >= 4 || !aBaseMetaTileEntity.getSkyAtSide((byte) 1) ? 0 : !bRain && aBaseMetaTileEntity.getWorld().isDaytime() ? 8 : 1; - } - if ((this.mTemperature < 200) && (this.mProcessingEnergy > 0) && (aTick % 12L == 0L)) { - this.mProcessingEnergy -= 1; - this.mTemperature += 5; - } - aBaseMetaTileEntity.setActive(this.mProcessingEnergy > 0); - } - } -} diff --git a/src/main/java/com/detrav/utils/DetravRepairRecipe.java b/src/main/java/com/detrav/utils/DetravRepairRecipe.java deleted file mode 100644 index 9645142e84..0000000000 --- a/src/main/java/com/detrav/utils/DetravRepairRecipe.java +++ /dev/null @@ -1,125 +0,0 @@ -package com.detrav.utils; - -import appeng.recipes.game.ShapelessRecipe; -import com.detrav.items.DetravMetaGeneratedTool01; -import com.enderio.core.common.OreDict; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import gregtech.api.enums.GT_Values; -import gregtech.api.enums.Materials; -import gregtech.api.enums.OrePrefixes; -import gregtech.api.interfaces.internal.IGT_CraftingRecipe; -import gregtech.api.items.GT_MetaGenerated_Tool; -import gregtech.api.util.GT_ModHandler; -import gregtech.api.util.GT_OreDictUnificator; -import gregtech.api.util.GT_Recipe; -import gregtech.api.util.GT_Utility; -import gregtech.common.items.GT_MetaGenerated_Tool_01; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.enchantment.Enchantment; -import net.minecraft.init.Items; -import net.minecraft.inventory.InventoryCrafting; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.IRecipe; -import net.minecraft.world.World; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.oredict.OreDictionary; -import net.minecraftforge.oredict.ShapedOreRecipe; - -import java.util.Iterator; -import java.util.List; - -/** - * Created by Detrav on 02.10.2016. - */ -public class DetravRepairRecipe extends ShapelessRecipe { - - public static DetravRepairRecipe INSTANCE; - - //int recipeSize; - public DetravRepairRecipe() - { - super(DetravMetaGeneratedTool01.INSTANCE.getToolWithStats(0, 1, Materials._NULL, Materials._NULL, null)); - INSTANCE = this; - //recipeSize = aRecipeSize; - } - - - @Override - public boolean matches(InventoryCrafting inv, World world) { - ItemStack stack = inv.getStackInSlot(4); - int iStack = -1; - if(stack == null) return false; - if(stack.getItem() instanceof GT_MetaGenerated_Tool) - iStack = 4; - /* - for (int i = 0; i < inv.getSizeInventory(); i++) { - stack = inv.getStackInSlot(i); - if (stack == null) continue; - if (stack.getItem() instanceof GT_MetaGenerated_Tool) { - iStack = i; - break; - } - }*/ - if (iStack < 0) return false; - Materials mat = GT_MetaGenerated_Tool_01.getPrimaryMaterial(stack); - FluidStack fstack = mat.getMolten(1); - if(fstack == null) fstack = mat.getFluid(1); - if(fstack == null) return false; - int fluidID = fstack.getFluidID(); - for (int i = 0; i < inv.getSizeInventory(); i++) { - ItemStack tStack = inv.getStackInSlot(i); - if (tStack == null) continue; - if (i == iStack) continue; - GT_Recipe recipe = GT_Recipe.GT_Recipe_Map.sFluidExtractionRecipes.findRecipe(null, false, 524288L, null, tStack); - if (recipe == null) - return false; - FluidStack fStack = recipe.getFluidOutput(0); - if (fStack.getFluidID() != fluidID) - return false; - } - return true; - } - - @Override - public ItemStack getCraftingResult(InventoryCrafting inv) { - ItemStack stack = inv.getStackInSlot(4).copy(); - int iStack = 4; - /*for(int i =0; i<inv.getSizeInventory(); i++) - { - stack = inv.getStackInSlot(i); - if(stack == null) continue; - if(stack.getItem() instanceof GT_MetaGenerated_Tool) - { - iStack = i; - break; - } - }*/ - float amount = 0; - for (int i = 0; i < inv.getSizeInventory(); i++) { - ItemStack tStack = inv.getStackInSlot(i); - if (tStack == null) continue; - if (i == iStack) continue; - GT_Recipe recipe = GT_Recipe.GT_Recipe_Map.sFluidExtractionRecipes.findRecipe(null, false, 524288L, null, tStack); - FluidStack fStack = recipe.getFluidOutput(0); - amount += fStack.amount; - } - - amount /= 1000; - - long maxDamage = GT_MetaGenerated_Tool.getToolMaxDamage(stack); - long damage = GT_MetaGenerated_Tool.getToolDamage(stack); - maxDamage = (long)(maxDamage * amount); - damage -= maxDamage; - if(damage<0) damage = 0; - GT_MetaGenerated_Tool.setToolDamage(stack,damage); - //inv.setInventorySlotContents(iStack,null); - return stack; - } - - @Override - public int getRecipeSize() { - return 9; - } -}
\ No newline at end of file diff --git a/src/main/java/com/detrav/utils/PortableAnvilInventory.java b/src/main/java/com/detrav/utils/PortableAnvilInventory.java deleted file mode 100644 index 8843c26e89..0000000000 --- a/src/main/java/com/detrav/utils/PortableAnvilInventory.java +++ /dev/null @@ -1,76 +0,0 @@ -package com.detrav.utils; - -import com.detrav.items.DetravMetaGeneratedTool01; -import gregtech.api.enums.Materials; -import gregtech.api.items.GT_MetaGenerated_Tool; -import gregtech.api.util.GT_Recipe; -import gregtech.api.util.GT_Utility; -import gregtech.common.items.GT_MetaGenerated_Tool_01; -import net.minecraft.inventory.InventoryBasic; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidStack; - -/** - * Created by Detrav on 30.10.2016. - */ -public class PortableAnvilInventory extends InventoryBasic { - public PortableAnvilInventory(ItemStack me,String p_i1561_1_, boolean p_i1561_2_, int p_i1561_3_) { - super(p_i1561_1_, p_i1561_2_, p_i1561_3_); - meStack = me; - } - - ItemStack meStack; - - public void setInventorySlotContents(int slot, ItemStack stack) { - super.setInventorySlotContents(slot, stack); - if (super.getStackInSlot(2) != null) return; - ItemStack gtTool = super.getStackInSlot(0); - if (gtTool != null) { - if ((gtTool.getItem() instanceof GT_MetaGenerated_Tool)) { - Materials mat = GT_MetaGenerated_Tool_01.getPrimaryMaterial(gtTool); - FluidStack fstack = mat.getMolten(1); - if (fstack == null) fstack = mat.getFluid(1); - if (fstack != null) { - int fluidID = fstack.getFluidID(); - ItemStack gtMaterial = super.getStackInSlot(1); - if (gtMaterial != null) { - GT_Recipe recipe = GT_Recipe.GT_Recipe_Map.sFluidExtractionRecipes.findRecipe(null, false, 524288L, null, gtMaterial); - if (recipe != null) { - FluidStack fStack = recipe.getFluidOutput(0); - if (fStack.getFluidID() == fluidID) { - ItemStack gtCopy = gtTool; - //make copy - float amount = fStack.amount / 1000f; - long maxDamage = GT_MetaGenerated_Tool.getToolMaxDamage(gtCopy); - long damage = GT_MetaGenerated_Tool.getToolDamage(gtCopy); - if (damage == 0) { - super.setInventorySlotContents(2, null); - return; - } - float flevel = DetravMetaGeneratedTool01.INSTANCE.getLevel(meStack,mat.mToolQuality); - int level = ((int)flevel + 1)*((int)flevel + 1); - long repair = (long) (maxDamage * amount * (flevel+1)); - repair = Math.min(repair,damage); - damage -= repair; - - float delta = ((float)repair) / ((float)maxDamage) / ((float)level) * 2.7f; - flevel += delta; - DetravMetaGeneratedTool01.INSTANCE.setLevelToItemStack(meStack,mat.mToolQuality,flevel); - - GT_MetaGenerated_Tool.setToolDamage(gtCopy, damage); - if (gtMaterial.stackSize > 1) - gtMaterial.stackSize -= 1; - else - super.setInventorySlotContents(1, null); - super.setInventorySlotContents(2, gtCopy); - super.setInventorySlotContents(0, null); - return; - } - } - } - } - } - } - super.setInventorySlotContents(2, null); - } -}
\ No newline at end of file |