From 8e309f5d439b214c1fb90effb227ccd3080aafec Mon Sep 17 00:00:00 2001 From: Ian Ramirez-España Date: Fri, 23 Jun 2017 17:51:16 -0500 Subject: Fix - Added compatibility for GregTech 5.09.31.02 --- src/main/java/com/detrav/enums/DetravItemList.java | 2 +- .../behaviours/BehaviourDetravToolElectricProPick.java | 7 ++++--- .../detrav/items/behaviours/BehaviourDetravToolProPick.java | 13 ++++--------- .../com/detrav/items/tools/DetravToolLVElectricProPick.java | 5 +++++ .../com/detrav/items/tools/DetravToolPortableAnvil.java | 5 +++++ .../com/detrav/items/tools/DetravToolPortableCharger.java | 5 +++++ src/main/java/com/detrav/items/tools/DetravToolProPick.java | 5 +++++ src/main/java/com/detrav/proxies/CommonProxy.java | 2 +- .../tileentities/Detrav_MetaTileEntity_AdvMiner2.java | 2 +- 9 files changed, 31 insertions(+), 15 deletions(-) diff --git a/src/main/java/com/detrav/enums/DetravItemList.java b/src/main/java/com/detrav/enums/DetravItemList.java index 8b66ceb98e..617483afe1 100644 --- a/src/main/java/com/detrav/enums/DetravItemList.java +++ b/src/main/java/com/detrav/enums/DetravItemList.java @@ -53,7 +53,7 @@ public enum DetravItemList implements IItemContainer { public Block getBlock() { if (mHasNotBeenSet) throw new IllegalAccessError("The Enum '" + name() + "' has not been set to an Item at this time!"); - return GT_Utility.getBlockFromStack(getItem()); + return GT_Utility.getBlockFromItem(getItem()); } @Override diff --git a/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolElectricProPick.java b/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolElectricProPick.java index 5d6b351236..c500795e5d 100644 --- a/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolElectricProPick.java +++ b/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolElectricProPick.java @@ -11,6 +11,7 @@ import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Utility; import gregtech.common.blocks.GT_Block_Ores_Abstract; import gregtech.common.blocks.GT_TileEntity_Ores; +import gregtech.common.GT_UndergroundOil; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; @@ -130,7 +131,7 @@ public class BehaviourDetravToolElectricProPick extends BehaviourDetravToolProPi } break; case 2: - FluidStack fStack = GT_Utility.getUndergroundOil(aWorld, c.xPosition * 16 + x, c.zPosition * 16 + z); + FluidStack fStack = GT_UndergroundOil.undergroundOil(aWorld.getChunkFromBlockCoords(c.xPosition * 16 + x, c.zPosition * 16 + z), -1); if (fStack.amount > 10000) { packet.addBlock(c.xPosition * 16 + x, 2, c.zPosition * 16 + z, (short) (fStack.amount / 5000)); packet.addBlock(c.xPosition * 16 + x, 1, c.zPosition * 16 + z, (short) fStack.getFluidID()); @@ -173,7 +174,7 @@ public class BehaviourDetravToolElectricProPick extends BehaviourDetravToolProPi if(aWorld.getBlock(aX,aY,aZ) == Blocks.bedrock) { if (!aWorld.isRemote) { - FluidStack fStack = GT_Utility.getUndergroundOil(aWorld,aX,aZ); + FluidStack fStack = GT_UndergroundOil.undergroundOil(aWorld.getChunkFromBlockCoords(aX, aZ), -1); addChatMassageByValue(aPlayer,fStack.amount/5000,fStack.getLocalizedName()); if (!aPlayer.capabilities.isCreativeMode) ((DetravMetaGeneratedTool01)aItem).doDamage(aStack, this.mCosts); @@ -193,7 +194,7 @@ public class BehaviourDetravToolElectricProPick extends BehaviourDetravToolProPi } if (data < 3) if (!aWorld.isRemote) { - FluidStack fStack = GT_Utility.getUndergroundOil(aWorld, aX, aZ); + FluidStack fStack = GT_UndergroundOil.undergroundOil(aWorld.getChunkFromBlockCoords(aX, aZ), -1); addChatMassageByValue(aPlayer, fStack.amount / 5000, fStack.getLocalizedName()); if (!aPlayer.capabilities.isCreativeMode) ((DetravMetaGeneratedTool01) aItem).doDamage(aStack, this.mCosts); diff --git a/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolProPick.java b/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolProPick.java index 6b5fa11e57..78b6eb53b7 100644 --- a/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolProPick.java +++ b/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolProPick.java @@ -12,6 +12,8 @@ import gregtech.common.GT_Proxy; import gregtech.common.blocks.GT_Block_Ores_Abstract; import gregtech.common.blocks.GT_TileEntity_Ores; import gregtech.common.items.behaviors.Behaviour_None; +import gregtech.common.GT_UndergroundOil; +import gregtech.common.GT_Pollution; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; @@ -53,7 +55,7 @@ public class BehaviourDetravToolProPick extends Behaviour_None { if(aWorld.getBlock(aX,aY,aZ) == Blocks.bedrock) { if (!aWorld.isRemote) { - FluidStack fStack = GT_Utility.getUndergroundOil(aWorld,aX,aZ); + FluidStack fStack = GT_UndergroundOil.undergroundOil(aWorld.getChunkFromBlockCoords(aX, aZ), -1); addChatMassageByValue(aPlayer,fStack.amount/5000,fStack.getLocalizedName()); if (!aPlayer.capabilities.isCreativeMode) ((DetravMetaGeneratedTool01)aItem).doDamage(aStack, this.mCosts); @@ -210,13 +212,6 @@ public class BehaviourDetravToolProPick extends Behaviour_None { public static int getPolution(World aWorld, int aX, int aZ) { - ChunkPosition tPos = new ChunkPosition(aX / 16, 1, aZ / 16); - if(GT_Proxy.chunkData.containsKey(tPos)) { - int[] tInts = (int[])GT_Proxy.chunkData.get(tPos); - if(tInts.length > 1 && tInts[1] > 0) { - return tInts[1]; - } - } - return 0; + return GT_Pollution.getPollution(aWorld.getChunkFromBlockCoords(aX, aZ)); } } \ No newline at end of file diff --git a/src/main/java/com/detrav/items/tools/DetravToolLVElectricProPick.java b/src/main/java/com/detrav/items/tools/DetravToolLVElectricProPick.java index 4ad574a6dc..9cf53e299a 100644 --- a/src/main/java/com/detrav/items/tools/DetravToolLVElectricProPick.java +++ b/src/main/java/com/detrav/items/tools/DetravToolLVElectricProPick.java @@ -19,6 +19,7 @@ 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; @@ -179,4 +180,8 @@ public class DetravToolLVElectricProPick implements IToolStats { public IChatComponent getDeathMessage(EntityLivingBase aPlayer, EntityLivingBase aEntity) { return new ChatComponentText(EnumChatFormatting.RED + aEntity.getCommandSenderName() + EnumChatFormatting.WHITE + " got Pick Up'ed 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; + } } \ No newline at end of file diff --git a/src/main/java/com/detrav/items/tools/DetravToolPortableAnvil.java b/src/main/java/com/detrav/items/tools/DetravToolPortableAnvil.java index f7073ed2f8..f181844e71 100644 --- a/src/main/java/com/detrav/items/tools/DetravToolPortableAnvil.java +++ b/src/main/java/com/detrav/items/tools/DetravToolPortableAnvil.java @@ -22,6 +22,7 @@ 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; @@ -183,4 +184,8 @@ public class DetravToolPortableAnvil implements IToolStats { 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 index 0687b75bd6..d915bbb1a0 100644 --- a/src/main/java/com/detrav/items/tools/DetravToolPortableCharger.java +++ b/src/main/java/com/detrav/items/tools/DetravToolPortableCharger.java @@ -22,6 +22,7 @@ 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; @@ -183,4 +184,8 @@ public class DetravToolPortableCharger implements IToolStats { 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 index b04d6579b6..b1ceef0078 100644 --- a/src/main/java/com/detrav/items/tools/DetravToolProPick.java +++ b/src/main/java/com/detrav/items/tools/DetravToolProPick.java @@ -21,6 +21,7 @@ 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; @@ -184,4 +185,8 @@ public class DetravToolProPick implements IToolStats { 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/proxies/CommonProxy.java b/src/main/java/com/detrav/proxies/CommonProxy.java index 63c1fa0fe1..5c17d2db4b 100644 --- a/src/main/java/com/detrav/proxies/CommonProxy.java +++ b/src/main/java/com/detrav/proxies/CommonProxy.java @@ -64,7 +64,7 @@ public class CommonProxy implements IGuiHandler { GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{ "GGG","dCi","GGG", Character.valueOf('G'), new ItemStack(Items.dye,1,2), Character.valueOf('C'), ItemList.Circuit_Basic.get(1) }); - GT_ModHandler.addShapelessCraftingRecipe(DetravItemList.DetravAdvancedMiner2.get(1L, new Object[0]),new Object[]{ItemList.AdvancedMiner2}); + GT_ModHandler.addShapelessCraftingRecipe(DetravItemList.DetravAdvancedMiner2.get(1L, new Object[0]),new Object[]{ItemList.OilDrill}); //Treetap recipes diff --git a/src/main/java/com/detrav/tileentities/Detrav_MetaTileEntity_AdvMiner2.java b/src/main/java/com/detrav/tileentities/Detrav_MetaTileEntity_AdvMiner2.java index ac5c73a0fc..334e7263a8 100644 --- a/src/main/java/com/detrav/tileentities/Detrav_MetaTileEntity_AdvMiner2.java +++ b/src/main/java/com/detrav/tileentities/Detrav_MetaTileEntity_AdvMiner2.java @@ -69,7 +69,7 @@ public class Detrav_MetaTileEntity_AdvMiner2 extends GT_MetaTileEntity_MultiBloc 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_ADVMINER2_ACTIVE : Textures.BlockIcons.OVERLAY_FRONT_ADVMINER2)}; + 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]}; } -- cgit