From 6db06249fbede596ad278a03a29b1fb4aac27073 Mon Sep 17 00:00:00 2001 From: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Date: Wed, 18 Apr 2018 18:05:17 +0200 Subject: Try to make GT++ Ores work + Version increase --- .../items/behaviours/BehaviourDetravToolElectricProPick.java | 4 ++++ .../detrav/items/behaviours/BehaviourDetravToolProPick.java | 10 ++++++++++ 2 files changed, 14 insertions(+) (limited to 'src/main/java/com/detrav/items') diff --git a/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolElectricProPick.java b/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolElectricProPick.java index 70b5296e00..8b8732a848 100644 --- a/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolElectricProPick.java +++ b/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolElectricProPick.java @@ -10,6 +10,7 @@ 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 net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; @@ -112,6 +113,9 @@ public class BehaviourDetravToolElectricProPick extends BehaviourDetravToolProPi } } } + else if (tBlock instanceof BlockBaseOre) { + packet.addBlock(c.xPosition * 16 + x, y, c.zPosition * 16 + z, new Short((short) (7000+(short) ((BlockBaseOre) tBlock).getMaterialEx().calculateProtons()))); + } else if (data == 1) { ItemData 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/behaviours/BehaviourDetravToolProPick.java b/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolProPick.java index c4a12e42bd..16b6a94e5d 100644 --- a/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolProPick.java +++ b/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolProPick.java @@ -12,6 +12,7 @@ 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; @@ -137,6 +138,15 @@ public class BehaviourDetravToolProPick extends Behaviour_None { } } } + } else if (tBlock instanceof BlockBaseOre) { + String name = tBlock.getLocalizedName(); + if (!ores.containsKey(name)) + ores.put(name, 1); + else { + int val = ores.get(name); + ores.put(name, val + 1); + } + } else if (data == 1) { tAssotiation = GT_OreDictUnificator.getAssociation(new ItemStack(tBlock, 1, tMetaID)); if ((tAssotiation != null) && (tAssotiation.mPrefix.toString().startsWith("ore"))) { -- cgit From b9ccedea6b82c35f0ced4ca3c18ae493ccf8be55 Mon Sep 17 00:00:00 2001 From: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Date: Wed, 18 Apr 2018 20:24:46 +0200 Subject: fixed GT++ Ores not showing up +slow af tho --- .../behaviours/BehaviourDetravToolElectricProPick.java | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) (limited to 'src/main/java/com/detrav/items') diff --git a/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolElectricProPick.java b/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolElectricProPick.java index 8b8732a848..9704a8f582 100644 --- a/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolElectricProPick.java +++ b/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolElectricProPick.java @@ -35,7 +35,7 @@ public class BehaviourDetravToolElectricProPick extends BehaviourDetravToolProPi super(aCosts); } - public ItemStack onItemRightClick(GT_MetaBase_Item aItem, ItemStack aStack, World aWorld, EntityPlayer aPlayer) { + public ItemStack onItemRightClick(GT_MetaBase_Item aItem, ItemStack aStack, World aWorld, EntityPlayer aPlayer) { if (!aWorld.isRemote) { int data = DetravMetaGeneratedTool01.INSTANCE.getToolGTDetravData(aStack).intValue(); @@ -113,9 +113,18 @@ public class BehaviourDetravToolElectricProPick extends BehaviourDetravToolProPi } } } - else if (tBlock instanceof BlockBaseOre) { - packet.addBlock(c.xPosition * 16 + x, y, c.zPosition * 16 + z, new Short((short) (7000+(short) ((BlockBaseOre) tBlock).getMaterialEx().calculateProtons()))); - } + else if (tBlock instanceof BlockBaseOre) { + short num=0; + for (byte n=0;n Date: Thu, 19 Apr 2018 05:20:30 +0200 Subject: performance improve + drasticly improved performance + updated mcmod.info + changed forge version to 10.13.4.1614 --- .../BehaviourDetravToolElectricProPick.java | 37 ++++++++++++---------- .../behaviours/BehaviourDetravToolProPick.java | 7 ++-- 2 files changed, 24 insertions(+), 20 deletions(-) (limited to 'src/main/java/com/detrav/items') diff --git a/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolElectricProPick.java b/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolElectricProPick.java index 9704a8f582..3a588aa74f 100644 --- a/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolElectricProPick.java +++ b/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolElectricProPick.java @@ -1,8 +1,15 @@ package com.detrav.items.behaviours; +import java.util.ArrayList; +import java.util.List; +import java.util.Random; + +import com.detrav.DetravScannerMod; import com.detrav.items.DetravMetaGeneratedTool01; import com.detrav.net.DetravNetwork; import com.detrav.net.DetravProPickPacket00; +import com.detrav.utils.GTppHelper; + import gregtech.api.items.GT_MetaBase_Item; import gregtech.api.objects.ItemData; import gregtech.api.util.GT_LanguageManager; @@ -11,6 +18,7 @@ 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; @@ -22,10 +30,6 @@ import net.minecraft.world.World; import net.minecraft.world.chunk.Chunk; import net.minecraftforge.fluids.FluidStack; -import java.util.ArrayList; -import java.util.List; -import java.util.Random; - /** * Created by wital_000 on 19.03.2016. */ @@ -36,7 +40,6 @@ public class BehaviourDetravToolElectricProPick extends BehaviourDetravToolProPi } public ItemStack onItemRightClick(GT_MetaBase_Item aItem, ItemStack aStack, World aWorld, EntityPlayer aPlayer) { - if (!aWorld.isRemote) { int data = DetravMetaGeneratedTool01.INSTANCE.getToolGTDetravData(aStack).intValue(); if (aPlayer.isSneaking()) { @@ -89,7 +92,7 @@ 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); @@ -114,16 +117,15 @@ public class BehaviourDetravToolElectricProPick extends BehaviourDetravToolProPi } } else if (tBlock instanceof BlockBaseOre) { - short num=0; - for (byte n=0;n 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 16b6a94e5d..5dd8ddd55d 100644 --- a/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolProPick.java +++ b/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolProPick.java @@ -1,6 +1,10 @@ package com.detrav.items.behaviours; +import java.util.HashMap; +import java.util.Random; + import com.detrav.items.DetravMetaGeneratedTool01; + import gregtech.api.GregTech_API; import gregtech.api.enums.Materials; import gregtech.api.items.GT_MetaBase_Item; @@ -24,9 +28,6 @@ import net.minecraft.world.World; import net.minecraft.world.chunk.Chunk; import net.minecraftforge.fluids.FluidStack; -import java.util.HashMap; -import java.util.Random; - /** * Created by wital_000 on 19.03.2016. */ -- cgit