diff options
Diffstat (limited to 'src/main/java/com/detrav/items')
4 files changed, 81 insertions, 82 deletions
diff --git a/src/main/java/com/detrav/items/DetravMetaGeneratedTool01.java b/src/main/java/com/detrav/items/DetravMetaGeneratedTool01.java index 62d296077c..6a80b7de0f 100644 --- a/src/main/java/com/detrav/items/DetravMetaGeneratedTool01.java +++ b/src/main/java/com/detrav/items/DetravMetaGeneratedTool01.java @@ -7,6 +7,7 @@ import com.detrav.enums.DetravToolDictNames; import com.detrav.items.tools.DetravProPick; import com.detrav.items.tools.DetravToolElectricProPick; +import cpw.mods.fml.common.Loader; import gregtech.api.enums.GT_Values; import gregtech.api.enums.Materials; import gregtech.api.enums.TC_Aspects; @@ -20,6 +21,8 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumChatFormatting; import net.minecraftforge.fluids.FluidStack; +import static com.detrav.DetravScannerMod.DEBUGBUILD; + /** * Created by wital_000 on 19.03.2016. */ @@ -298,32 +301,34 @@ public class DetravMetaGeneratedTool01 extends GT_MetaGenerated_Tool { public void getDetravSubItems(Item item, CreativeTabs detravCreativeTab, List list) { ItemStack dStack; - - //Materials at tiers - dStack = getToolWithStats(0,1,Materials.Polycaprolactam,Materials.Polycaprolactam, null); - list.add(dStack); - dStack = getToolWithStats(2,1,Materials.Steel,Materials.Steel, null); - list.add(dStack); - dStack = getToolWithStats(2,1,Materials.Bronze,Materials.Steel, null); - list.add(dStack); - dStack = getToolWithStats(4,1,Materials.Manyullyn,Materials.Aluminium, null); - list.add(dStack); - dStack = getToolWithStats(6,1,Materials.DamascusSteel,Materials.DamascusSteel, null); - list.add(dStack); - dStack = getToolWithStats(8,1,Materials.Titanium,Materials.Titanium, null); - list.add(dStack); - dStack = getToolWithStats(10,1,Materials.TungstenSteel,Materials.TungstenSteel, null); - list.add(dStack); - dStack = getToolWithStats(12,1,Materials.Iridium,Materials.Iridium, null); - list.add(dStack); - dStack = getToolWithStats(12,1,Materials.Osmium,Materials.Osmium, null); - list.add(dStack); - dStack = getToolWithStats(14,1,Materials.Neutronium,Materials.Neutronium, null); - list.add(dStack); - dStack = getToolWithStats(16,1,Materials.InfinityCatalyst,Materials.InfinityCatalyst, null); - list.add(dStack); - dStack = getToolWithStats(18,1,Materials.Infinity,Materials.Infinity, null); - list.add(dStack); + if (Loader.isModLoaded("dreamcraft")) { + //Materials at tiers + dStack = getToolWithStats(0, 1, Materials.Polycaprolactam, Materials.Polycaprolactam, null); + list.add(dStack); + dStack = getToolWithStats(2, 1, Materials.Steel, Materials.Steel, null); + list.add(dStack); + dStack = getToolWithStats(2, 1, Materials.Bronze, Materials.Steel, null); + list.add(dStack); + dStack = getToolWithStats(4, 1, Materials.Manyullyn, Materials.Aluminium, null); + list.add(dStack); + dStack = getToolWithStats(6, 1, Materials.DamascusSteel, Materials.DamascusSteel, null); + list.add(dStack); + dStack = getToolWithStats(8, 1, Materials.Titanium, Materials.Titanium, null); + list.add(dStack); + dStack = getToolWithStats(10, 1, Materials.TungstenSteel, Materials.TungstenSteel, null); + list.add(dStack); + dStack = getToolWithStats(12, 1, Materials.Iridium, Materials.Iridium, null); + list.add(dStack); + dStack = getToolWithStats(12, 1, Materials.Osmium, Materials.Osmium, null); + list.add(dStack); + dStack = getToolWithStats(14, 1, Materials.Neutronium, Materials.Neutronium, null); + list.add(dStack); + + dStack = getToolWithStats(16, 1, Materials.InfinityCatalyst, Materials.InfinityCatalyst, null); + list.add(dStack); + dStack = getToolWithStats(18, 1, Materials.Infinity, Materials.Infinity, null); + list.add(dStack); + } //Steel for comparison dStack = getToolWithStats(0,1,Materials.Steel,Materials.Steel, null); @@ -354,12 +359,18 @@ public class DetravMetaGeneratedTool01 extends GT_MetaGenerated_Tool { dStack = getToolWithStats(102, 1, Materials.Neutronium, Materials.TungstenSteel, new long[]{409600000L, GT_Values.V[7], 7L, -1L}); setCharge(dStack,409600000L); list.add(dStack); - dStack = getToolWithStats(104, 1, Materials.InfinityCatalyst, Materials.TungstenSteel, new long[]{1638400000L, GT_Values.V[8], 8L, -1L}); - setCharge(dStack,1638400000L); - list.add(dStack); - dStack = getToolWithStats(106, 1, Materials.Infinity, Materials.TungstenSteel, new long[]{6553600000L, GT_Values.V[9], 9L, -1L}); - setCharge(dStack,6553600000L); - list.add(dStack); + if (Loader.isModLoaded("dreamcraft")) { + dStack = getToolWithStats(104, 1, Materials.InfinityCatalyst, Materials.TungstenSteel, new long[]{1638400000L, GT_Values.V[8], 8L, -1L}); + setCharge(dStack, 1638400000L); + list.add(dStack); + dStack = getToolWithStats(106, 1, Materials.Infinity, Materials.TungstenSteel, new long[]{6553600000L, GT_Values.V[9], 9L, -1L}); + setCharge(dStack, 6553600000L); + list.add(dStack); + } else { + dStack = getToolWithStats(106, 1, Materials.Neutronium, Materials.TungstenSteel, new long[]{6553600000L, GT_Values.V[9], 9L, -1L}); + setCharge(dStack, 6553600000L); + list.add(dStack); + } } } diff --git a/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolElectricProPick.java b/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolElectricProPick.java index 57f5318571..c614a844f6 100644 --- a/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolElectricProPick.java +++ b/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolElectricProPick.java @@ -1,14 +1,11 @@ package com.detrav.items.behaviours; -import java.util.ArrayList; -import java.util.List; -import java.util.SplittableRandom; - import com.detrav.items.DetravMetaGeneratedTool01; import com.detrav.net.DetravNetwork; import com.detrav.net.DetravProPickPacket00; +import com.detrav.utils.BartWorksHelper; import com.detrav.utils.GTppHelper; - +import cpw.mods.fml.common.Loader; import gregtech.api.items.GT_MetaBase_Item; import gregtech.api.objects.ItemData; import gregtech.api.util.GT_LanguageManager; @@ -16,8 +13,6 @@ import gregtech.api.util.GT_OreDictUnificator; import gregtech.common.GT_UndergroundOil; import gregtech.common.blocks.GT_Block_Ores_Abstract; import gregtech.common.blocks.GT_TileEntity_Ores; -import gtPlusPlus.core.block.base.BlockBaseOre; -import gtPlusPlus.core.material.Material; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; @@ -25,11 +20,13 @@ import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ChatComponentText; -import net.minecraft.util.EnumChatFormatting; import net.minecraft.world.World; import net.minecraft.world.chunk.Chunk; import net.minecraftforge.fluids.FluidStack; +import java.util.ArrayList; +import java.util.List; + /** * Created by wital_000 on 19.03.2016. */ @@ -92,56 +89,42 @@ public class BehaviourDetravToolElectricProPick extends BehaviourDetravToolProPi int ySize = c.getHeightValue(x, z);//(int)aPlayer.posY;//c.getHeightValue(x, z); for (int y = 1; y < ySize; y++) { switch (data) { - case 0: + case 0: case 1: - Block tBlock = c.getBlock(x,y,z); - short tMetaID = (short)c.getBlockMetadata(x,y,z); + Block tBlock = c.getBlock(x, y, z); + short tMetaID = (short) c.getBlockMetadata(x, y, z); if (tBlock instanceof GT_Block_Ores_Abstract) { - TileEntity tTileEntity = c.getTileEntityUnsafe(x,y,z); - if ((tTileEntity!=null) + TileEntity tTileEntity = c.getTileEntityUnsafe(x, y, z); + if ((tTileEntity != null) && (tTileEntity instanceof GT_TileEntity_Ores) && ((GT_TileEntity_Ores) tTileEntity).mNatural == true) { - tMetaID = (short)((GT_TileEntity_Ores) tTileEntity).getMetaData(); + tMetaID = (short) ((GT_TileEntity_Ores) tTileEntity).getMetaData(); try { String name = GT_LanguageManager.getTranslation( tBlock.getUnlocalizedName() + "." + tMetaID + ".name"); if (name.startsWith("Small")) if (data != 1) continue; packet.addBlock(c.xPosition * 16 + x, y, c.zPosition * 16 + z, tMetaID); - } - catch(Exception e) { + } catch (Exception e) { String name = tBlock.getUnlocalizedName() + "."; if (name.contains(".small.")) if (data != 1) continue; packet.addBlock(c.xPosition * 16 + x, y, c.zPosition * 16 + z, tMetaID); } } - } - else if (tBlock instanceof BlockBaseOre) { - Short packaged = 0; - Material m = ((BlockBaseOre) tBlock).getMaterialEx(); - packaged = GTppHelper.encodeoresGTpp.get(m); - try { - packet.addBlock(c.xPosition * 16 + x, y, c.zPosition * 16 + z, (short) (packaged+7000)); - } - catch(Exception e) { - - } - } - else if (data == 1) { + } else if (Loader.isModLoaded("miscutils") && GTppHelper.isGTppBlock(tBlock)) { + short meta = GTppHelper.getGTppMeta(tBlock); + packet.addBlock(c.xPosition * 16 + x, y, c.zPosition * 16 + z, meta); + } else if (Loader.isModLoaded("bartworks") && BartWorksHelper.isOre(tBlock)) { + packet.addBlock(c.xPosition * 16 + x, y, c.zPosition * 16 + z, BartWorksHelper.getMetaFromBlock(c, x, y, z, tBlock)); + } else if (data == 1) { ItemData tAssotiation = GT_OreDictUnificator.getAssociation(new ItemStack(tBlock, 1, tMetaID)); if ((tAssotiation != null) && (tAssotiation.mPrefix.toString().startsWith("ore"))) { - try { - packet.addBlock(c.xPosition * 16 + x, y, c.zPosition * 16 + z, (short)tAssotiation.mMaterial.mMaterial.mMetaItemSubID); - } - catch (Exception e) - { - - } + packet.addBlock(c.xPosition * 16 + x, y, c.zPosition * 16 + z, (short) tAssotiation.mMaterial.mMaterial.mMetaItemSubID); } } break; case 2: - if(( x == 0 ) || ( z == 0 )){ //Skip doing the locations with the grid on them. + if ((x == 0) || (z == 0)) { //Skip doing the locations with the grid on them. break; } FluidStack fStack = GT_UndergroundOil.undergroundOil(aWorld.getChunkFromBlockCoords(c.xPosition * 16 + x, c.zPosition * 16 + z), -1); @@ -160,8 +143,8 @@ public class BehaviourDetravToolElectricProPick extends BehaviourDetravToolProPi packet.addBlock(c.xPosition * 16 + x, 1, c.zPosition * 16 + z, (short) polution); break; } - if (data > 1) - break; + if (data > 1) + break; } } } diff --git a/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolProPick.java b/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolProPick.java index e9419e310e..4a8655360f 100644 --- a/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolProPick.java +++ b/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolProPick.java @@ -1,12 +1,10 @@ package com.detrav.items.behaviours; -import java.util.HashMap; -import java.util.Random; -import java.util.SplittableRandom; - import com.detrav.DetravScannerMod; import com.detrav.items.DetravMetaGeneratedTool01; - +import com.detrav.utils.BartWorksHelper; +import com.detrav.utils.GTppHelper; +import cpw.mods.fml.common.Loader; import gregtech.api.GregTech_API; import gregtech.api.enums.Materials; import gregtech.api.items.GT_MetaBase_Item; @@ -18,7 +16,6 @@ import gregtech.common.GT_UndergroundOil; import gregtech.common.blocks.GT_Block_Ores_Abstract; import gregtech.common.blocks.GT_TileEntity_Ores; import gregtech.common.items.behaviors.Behaviour_None; -import gtPlusPlus.core.block.base.BlockBaseOre; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; @@ -31,6 +28,9 @@ import net.minecraft.world.World; import net.minecraft.world.chunk.Chunk; import net.minecraftforge.fluids.FluidStack; +import java.util.HashMap; +import java.util.SplittableRandom; + /** * Created by wital_000 on 19.03.2016. */ @@ -216,10 +216,12 @@ public class BehaviourDetravToolProPick extends Behaviour_None { addOreToHashMap(name, aPlayer); } } - } else if (tBlock instanceof BlockBaseOre) { - String name = tBlock.getLocalizedName(); - addOreToHashMap(name, aPlayer); - + } else if (Loader.isModLoaded("miscutils") && GTppHelper.isGTppBlock(tBlock) ) { + String name = GTppHelper.getGTppVeinName(tBlock); + if (!name.isEmpty()) + addOreToHashMap(name, aPlayer); + } else if (Loader.isModLoaded("bartworks") && BartWorksHelper.isOre(tBlock)){ + addOreToHashMap(GT_LanguageManager.getTranslation("bw.blockores.01." + ((BartWorksHelper.getMetaFromBlock(aChunk,x,y,z,tBlock))*-1) + ".name"), aPlayer); } else if (data == 1) { tAssotiation = GT_OreDictUnificator.getAssociation(new ItemStack(tBlock, 1, tMetaID)); if ((tAssotiation != null) && (tAssotiation.mPrefix.toString().startsWith("ore"))) { diff --git a/src/main/java/com/detrav/items/processing/ProcessingDetravToolProPick.java b/src/main/java/com/detrav/items/processing/ProcessingDetravToolProPick.java index ad92dd8932..52b8627944 100644 --- a/src/main/java/com/detrav/items/processing/ProcessingDetravToolProPick.java +++ b/src/main/java/com/detrav/items/processing/ProcessingDetravToolProPick.java @@ -13,6 +13,8 @@ import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; +import static com.detrav.DetravScannerMod.DEBUGBUILD; + /** * Created by wital_000 on 18.03.2016. */ @@ -25,7 +27,8 @@ 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; - + if (DEBUGBUILD) + return; //ULV disabled //GT_ModHandler.addCraftingRecipe(DetravMetaGeneratedTool01.INSTANCE.getToolWithStats(0, 1, aMaterial, Materials.Lead, null), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"SHE","CPC","PXP",'E',OreDictionary.getOres("cellSulfuricAcid").get(0),'S',OreDictionary.getOres("cellHydroxide").get(0),'H',OrePrefixes.toolHeadDrill.get(aMaterial),'P',OrePrefixes.plate.get(aMaterial),'C',OrePrefixes.circuit.get(Materials.Primitive),'X',gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList.Sensor_ULV}); GT_ModHandler.addCraftingRecipe(DetravMetaGeneratedTool01.INSTANCE.getToolWithStats(2, 1, aMaterial, Materials.Steel, null), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"SHE","CPC","PXP",'E',OreDictionary.getOres("cellSulfuricAcid").get(0),'S',OreDictionary.getOres("cellHydroxide").get(0),'H',OrePrefixes.toolHeadDrill.get(aMaterial),'P',OrePrefixes.plate.get(aMaterial),'C',OrePrefixes.circuit.get(Materials.Basic),'X',ItemList.Sensor_LV}); |