diff options
Diffstat (limited to 'src/main')
5 files changed, 0 insertions, 307 deletions
diff --git a/src/main/java/gregtech/api/enums/ItemList.java b/src/main/java/gregtech/api/enums/ItemList.java index 7f2cafc1aa..4e57d1b148 100644 --- a/src/main/java/gregtech/api/enums/ItemList.java +++ b/src/main/java/gregtech/api/enums/ItemList.java @@ -1706,9 +1706,6 @@ public enum ItemList implements IItemContainer { Honeycomb, Charcoal_Pile, Block_BrittleCharcoal, - Seismic_Prospector_LV, - Seismic_Prospector_MV, - Seismic_Prospector_HV, Seismic_Prospector_Adv_LV, Seismic_Prospector_Adv_MV, Seismic_Prospector_Adv_HV, diff --git a/src/main/java/gregtech/api/enums/MetaTileEntityIDs.java b/src/main/java/gregtech/api/enums/MetaTileEntityIDs.java index f5140af9a1..9b5abd0994 100644 --- a/src/main/java/gregtech/api/enums/MetaTileEntityIDs.java +++ b/src/main/java/gregtech/api/enums/MetaTileEntityIDs.java @@ -551,7 +551,6 @@ public enum MetaTileEntityIDs { LARGE_PLASMA_TURBINE_CONTROLLER(1153), LARGE_HEAT_EXCHANGER_CONTROLLER(1154), CHARCOAL_PILE_IGNITER_CONTROLLER(1155), - SEISMIC_PROSPECTOR_LV(1156), MULTIBLOCK_PUMP_MKI_CONTROLLER(1157), ORE_DRILL_MKI_CONTROLLER(1158), PYROLYSE_OVEN_CONTROLLER(1159), @@ -593,8 +592,6 @@ public enum MetaTileEntityIDs { PLASMA_GENERATOR_LuV(1197), PLASMA_GENERATOR_ZPM(1198), PROCESSING_ARRAY_CONTROLLER(1199), - SEISMIC_PROSPECTOR_MV(2100), - SEISMIC_PROSPECTOR_HV(2101), ADVANCED_SEISMIC_PROSPECTOR_LV(2102), ADVANCED_SEISMIC_PROSPECTOR_MV(2103), ADVANCED_SEISMIC_PROSPECTOR_HV(2104), diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_SeismicProspector.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_SeismicProspector.java deleted file mode 100644 index a4d4077796..0000000000 --- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_SeismicProspector.java +++ /dev/null @@ -1,265 +0,0 @@ -package gregtech.common.tileentities.machines.basic; - -import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_BOTTOM_ROCK_BREAKER; -import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_BOTTOM_ROCK_BREAKER_ACTIVE; -import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_BOTTOM_ROCK_BREAKER_ACTIVE_GLOW; -import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_BOTTOM_ROCK_BREAKER_GLOW; -import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_ROCK_BREAKER; -import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_ROCK_BREAKER_ACTIVE; -import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_ROCK_BREAKER_ACTIVE_GLOW; -import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_ROCK_BREAKER_GLOW; -import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_SIDE_ROCK_BREAKER; -import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_SIDE_ROCK_BREAKER_ACTIVE; -import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_SIDE_ROCK_BREAKER_ACTIVE_GLOW; -import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_SIDE_ROCK_BREAKER_GLOW; -import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_TOP_ROCK_BREAKER; -import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_TOP_ROCK_BREAKER_ACTIVE; -import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_TOP_ROCK_BREAKER_ACTIVE_GLOW; -import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_TOP_ROCK_BREAKER_GLOW; - -import java.util.ArrayList; -import java.util.List; - -import net.minecraft.block.Block; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.fluids.FluidStack; - -import gregtech.api.GregTech_API; -import gregtech.api.enums.ItemList; -import gregtech.api.enums.Materials; -import gregtech.api.interfaces.ITexture; -import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import gregtech.api.metatileentity.MetaTileEntity; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine; -import gregtech.api.objects.ItemData; -import gregtech.api.render.TextureFactory; -import gregtech.api.util.GT_OreDictUnificator; -import gregtech.api.util.GT_Utility; -import gregtech.common.GT_UndergroundOil; -import gregtech.common.blocks.GT_Block_Ores_Abstract; -import gregtech.common.blocks.GT_TileEntity_Ores; -import ic2.core.Ic2Items; - -public class GT_MetaTileEntity_SeismicProspector extends GT_MetaTileEntity_BasicMachine { - - boolean ready = false; - - public GT_MetaTileEntity_SeismicProspector(int aID, String aName, String aNameRegional, int aTier) { - super( - aID, - aName, - aNameRegional, - aTier, - 1, - "(DEPRECATED, DO NOT USE! SWAP TO ADVANCED VERSION USING SHAPELESS RECIPE!)", - 1, - 1, - "Default.png", - "", - TextureFactory.of( - TextureFactory.of(OVERLAY_SIDE_ROCK_BREAKER_ACTIVE), - TextureFactory.builder() - .addIcon(OVERLAY_SIDE_ROCK_BREAKER_ACTIVE_GLOW) - .glow() - .build()), - TextureFactory.of( - TextureFactory.of(OVERLAY_SIDE_ROCK_BREAKER), - TextureFactory.builder() - .addIcon(OVERLAY_SIDE_ROCK_BREAKER_GLOW) - .glow() - .build()), - TextureFactory.of( - TextureFactory.of(OVERLAY_TOP_ROCK_BREAKER_ACTIVE), - TextureFactory.builder() - .addIcon(OVERLAY_TOP_ROCK_BREAKER_ACTIVE_GLOW) - .glow() - .build()), - TextureFactory.of( - TextureFactory.of(OVERLAY_TOP_ROCK_BREAKER), - TextureFactory.builder() - .addIcon(OVERLAY_TOP_ROCK_BREAKER_GLOW) - .glow() - .build()), - TextureFactory.of( - TextureFactory.of(OVERLAY_FRONT_ROCK_BREAKER_ACTIVE), - TextureFactory.builder() - .addIcon(OVERLAY_FRONT_ROCK_BREAKER_ACTIVE_GLOW) - .glow() - .build()), - TextureFactory.of( - TextureFactory.of(OVERLAY_FRONT_ROCK_BREAKER), - TextureFactory.builder() - .addIcon(OVERLAY_FRONT_ROCK_BREAKER_GLOW) - .glow() - .build()), - TextureFactory.of( - TextureFactory.of(OVERLAY_BOTTOM_ROCK_BREAKER_ACTIVE), - TextureFactory.builder() - .addIcon(OVERLAY_BOTTOM_ROCK_BREAKER_ACTIVE_GLOW) - .glow() - .build()), - TextureFactory.of( - TextureFactory.of(OVERLAY_BOTTOM_ROCK_BREAKER), - TextureFactory.builder() - .addIcon(OVERLAY_BOTTOM_ROCK_BREAKER_GLOW) - .glow() - .build())); - } - - public GT_MetaTileEntity_SeismicProspector(String aName, int aTier, String aDescription, ITexture[][][] aTextures, - String aGUIName, String aNEIName) { - super(aName, aTier, 1, aDescription, aTextures, 1, 1, aGUIName, aNEIName); - } - - public GT_MetaTileEntity_SeismicProspector(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures, - String aGUIName, String aNEIName) { - super(aName, aTier, 1, aDescription, aTextures, 1, 1, aGUIName, aNEIName); - } - - @Override - public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GT_MetaTileEntity_SeismicProspector( - this.mName, - this.mTier, - this.mDescriptionArray, - this.mTextures, - this.mGUIName, - this.mNEIName); - } - - @Override - public boolean onRightclick(IGregTechTileEntity aBaseMetaTileEntity, EntityPlayer aPlayer) { - if (aBaseMetaTileEntity.isServerSide()) { - ItemStack aStack = aPlayer.getCurrentEquippedItem(); - ItemData stackData = GT_OreDictUnificator.getItemData(aStack); - if (!ready && (aStack != null) - && ((aStack.getItem() == Item.getItemFromBlock(Blocks.tnt) && aStack.stackSize >= 2) - || (aStack.getItem() == Ic2Items.industrialTnt.getItem() && aStack.stackSize >= 1) - || (aStack.getItem() == Ic2Items.dynamite.getItem() && aStack.stackSize >= 4) - || (stackData != null && stackData.mMaterial.mMaterial == Materials.Glyceryl - && aStack.stackSize >= 1) - || (aStack.getItem() == ItemList.Block_Powderbarrel.getItem() - && aStack.getItemDamage() == ItemList.Block_Powderbarrel.get(1) - .getItemDamage() - && aStack.stackSize >= 8))) { - if ((!aPlayer.capabilities.isCreativeMode) && (aStack.stackSize != 111)) { - if (aStack.getItem() == Item.getItemFromBlock(Blocks.tnt)) { - aStack.stackSize -= 2; - } else if (aStack.getItem() == Ic2Items.industrialTnt.getItem()) { - aStack.stackSize -= 1; - } else if (aStack.getItem() == Ic2Items.dynamite.getItem()) { - aStack.stackSize -= 4; - } else if (aStack.getItem() == ItemList.Block_Powderbarrel.getItem() - && aStack.getItemDamage() == ItemList.Block_Powderbarrel.get(1) - .getItemDamage()) { - aStack.stackSize -= 8; - } else { - aStack.stackSize -= 1; - } - } - this.ready = true; - this.mMaxProgresstime = 200; - } else if (ready && mMaxProgresstime == 0 - && aStack != null - && aStack.stackSize == 1 - && aStack.getItem() == ItemList.Tool_DataStick.getItem()) { - this.ready = false; - GT_Utility.ItemNBT.setBookTitle(aPlayer.getCurrentEquippedItem(), "Raw Prospection Data"); - List<String> tStringList = new ArrayList<>(); - - // range by tier - int min = -range(); - int max = range(); - int step = step(); - - for (int i = this.getBaseMetaTileEntity() - .getYCoord(); i > 0; i--) { - for (int f = min; f <= max; f += step) { - for (int g = min; g <= max; g += step) { - Block tBlock = this.getBaseMetaTileEntity() - .getBlockOffset(f, -i, g); - if ((tBlock instanceof GT_Block_Ores_Abstract)) { - TileEntity tTileEntity = getBaseMetaTileEntity().getWorld() - .getTileEntity( - getBaseMetaTileEntity().getXCoord() + f, - getBaseMetaTileEntity().getYCoord() + (-i), - getBaseMetaTileEntity().getZCoord() + g); - if ((tTileEntity instanceof GT_TileEntity_Ores)) { - if (((GT_TileEntity_Ores) tTileEntity).mMetaData < 16000) { - Materials tMaterial = GregTech_API.sGeneratedMaterials[(((GT_TileEntity_Ores) tTileEntity).mMetaData - % 1000)]; - if ((tMaterial != null) && (tMaterial != Materials._NULL)) { - if (!tStringList.contains(tMaterial.mDefaultLocalName)) { - tStringList.add(tMaterial.mDefaultLocalName); - } - } - } - } - } else { - int tMetaID = getBaseMetaTileEntity().getWorld() - .getBlockMetadata( - getBaseMetaTileEntity().getXCoord() + f, - getBaseMetaTileEntity().getYCoord() + (-i), - getBaseMetaTileEntity().getZCoord() + g); - ItemData tAssotiation = GT_OreDictUnificator - .getAssociation(new ItemStack(tBlock, 1, tMetaID)); - if ((tAssotiation != null) && (tAssotiation.mPrefix.toString() - .startsWith("ore"))) { - if (!tStringList.contains(tAssotiation.mMaterial.mMaterial.mDefaultLocalName)) { - tStringList.add(tAssotiation.mMaterial.mMaterial.mDefaultLocalName); - } - } - } - } - } - } - if (tStringList.size() < 1) { - tStringList.add("No Ores found."); - } - FluidStack tFluid = GT_UndergroundOil.undergroundOilReadInformation(getBaseMetaTileEntity()); - String[] tStringArray = new String[tStringList.size()]; - { - for (int i = 0; i < tStringArray.length; i++) { - tStringArray[i] = tStringList.get(i); - } - } - GT_Utility.ItemNBT.setProspectionData( - aPlayer.getCurrentEquippedItem(), - this.getBaseMetaTileEntity() - .getXCoord(), - this.getBaseMetaTileEntity() - .getYCoord(), - this.getBaseMetaTileEntity() - .getZCoord(), - this.getBaseMetaTileEntity() - .getWorld().provider.dimensionId, - tFluid, - tStringArray); - } - } - - return true; - } - - private int range() { - return switch (mTier) { - case 1 -> 16; - case 2 -> 32; - case 3 -> 48; - default -> 0; - }; - } - - private int step() { - return switch (mTier) { - case 1 -> 1; - case 2 -> 3; - case 3 -> 4; - default -> 1; - }; - } -} diff --git a/src/main/java/gregtech/loaders/load/GT_Loader_MetaTileEntities_Recipes.java b/src/main/java/gregtech/loaders/load/GT_Loader_MetaTileEntities_Recipes.java index b06aaf43b1..0416cf22c6 100644 --- a/src/main/java/gregtech/loaders/load/GT_Loader_MetaTileEntities_Recipes.java +++ b/src/main/java/gregtech/loaders/load/GT_Loader_MetaTileEntities_Recipes.java @@ -7454,19 +7454,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { new Object[] { GT_ModHandler.getModItem(Gendustry.ID, "ApiaryUpgrade", 1, 15) }); } - // Converter recipes in case you had old one lying around - GT_ModHandler.addShapelessCraftingRecipe( - ItemList.Seismic_Prospector_Adv_LV.get(1L), - bits, - new Object[] { ItemList.Seismic_Prospector_LV }); - GT_ModHandler.addShapelessCraftingRecipe( - ItemList.Seismic_Prospector_Adv_MV.get(1L), - bits, - new Object[] { ItemList.Seismic_Prospector_MV }); - GT_ModHandler.addShapelessCraftingRecipe( - ItemList.Seismic_Prospector_Adv_HV.get(1L), - bits, - new Object[] { ItemList.Seismic_Prospector_HV }); } private static void run4() { diff --git a/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java b/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java index 42fc02bb66..5e72c6421c 100644 --- a/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java +++ b/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java @@ -78,7 +78,6 @@ import gregtech.common.tileentities.machines.basic.GT_MetaTileEntity_Pump; import gregtech.common.tileentities.machines.basic.GT_MetaTileEntity_Replicator; import gregtech.common.tileentities.machines.basic.GT_MetaTileEntity_RockBreaker; import gregtech.common.tileentities.machines.basic.GT_MetaTileEntity_Scanner; -import gregtech.common.tileentities.machines.basic.GT_MetaTileEntity_SeismicProspector; import gregtech.common.tileentities.machines.basic.GT_MetaTileEntity_Teleporter; import gregtech.common.tileentities.machines.long_distance.GT_MetaTileEntity_LongDistancePipelineFluid; import gregtech.common.tileentities.machines.long_distance.GT_MetaTileEntity_LongDistancePipelineItem; @@ -929,27 +928,6 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 8).getStackForm(1L)); } - private static void registerSeismicProspector() { - ItemList.Seismic_Prospector_LV.set( - new GT_MetaTileEntity_SeismicProspector( - SEISMIC_PROSPECTOR_LV.ID, - "basicmachine.seismicprospector.01", - "Seismic Prospector LV", - 1).getStackForm(1)); - ItemList.Seismic_Prospector_MV.set( - new GT_MetaTileEntity_SeismicProspector( - SEISMIC_PROSPECTOR_MV.ID, - "basicmachine.seismicprospector.02", - "Seismic Prospector MV", - 2).getStackForm(1)); - ItemList.Seismic_Prospector_HV.set( - new GT_MetaTileEntity_SeismicProspector( - SEISMIC_PROSPECTOR_HV.ID, - "basicmachine.seismicprospector.03", - "Seismic Prospector HV", - 3).getStackForm(1)); - } - private static void registerAdvancedSeismicProspector() { ItemList.Seismic_Prospector_Adv_LV.set( new GT_MetaTileEntity_AdvSeismicProspector( @@ -3584,7 +3562,6 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC registerPump(); registerTeleporter(); registerMonsterRepellator(); - registerSeismicProspector(); registerAdvancedSeismicProspector(); registerMicrowaveEnergyTransmitter(); registerChestBuffer(); |