From b5bc6de82559596b58c93a80dad0b592c9eb5264 Mon Sep 17 00:00:00 2001 From: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Date: Mon, 7 May 2018 06:12:45 +0200 Subject: added mechanic to scan Schematics to data stics --- .../machines/basic/GT_MetaTileEntity_Scanner.java | 27 ++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'src/main/java/gregtech') diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Scanner.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Scanner.java index 0294889b06..0c66aced50 100644 --- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Scanner.java +++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Scanner.java @@ -150,6 +150,33 @@ public class GT_MetaTileEntity_Scanner return FOUND_RECIPE_BUT_DID_NOT_MEET_REQUIREMENTS; return 2; } + + if (aStack.getItem().getUnlocalizedName().contains("Schematic")||aStack.getItem().getUnlocalizedName().contains("schematic")){ + String sTier =""; + + if (aStack.getItem().getUnlocalizedName().contains("moonbuggy")) + sTier = "100"; + else if(aStack.getItem().getUnlocalizedName().contains("cargo")) + sTier = "101"; + else if(aStack.getItem().getUnlocalizedName().contains("astro")) + sTier = "102"; + else if (aStack.getItem().getUnlocalizedName().matches(".*\\d+.*")) + sTier = aStack.getItem().getUnlocalizedName().split("(?<=\\D)(?=\\d)")[1].substring(0, 1); + else + sTier = "1"; + + getSpecialSlot().stackSize -= 1; + aStack.stackSize -= 1; + + this.mOutputItems[0] = GT_Utility.copyAmount(1L, new Object[]{getSpecialSlot()}); + this.mOutputItems[0].setTagCompound(GT_Utility.getNBTContainingShort(new NBTTagCompound(), "rocket_tier", Short.parseShort(sTier) )); + calculateOverclockedNess(512,36000); + //In case recipe is too OP for that machine + if (mMaxProgresstime == Integer.MAX_VALUE - 1 && mEUt == Integer.MAX_VALUE - 1) + return FOUND_RECIPE_BUT_DID_NOT_MEET_REQUIREMENTS; + return 2; + } + } if (getSpecialSlot() == null && ItemList.Tool_DataStick.isStackEqual(aStack, false, true)) { if (GT_Utility.ItemNBT.getBookTitle(aStack).equals("Raw Prospection Data")) { -- cgit From a69dfe40d0088f5ca539ecb3e67a513aab8d2313 Mon Sep 17 00:00:00 2001 From: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Date: Mon, 7 May 2018 15:23:46 +0200 Subject: fake re-enabled OreAchievements for compability purposes --- src/main/java/gregtech/loaders/misc/GT_Achievements.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'src/main/java/gregtech') diff --git a/src/main/java/gregtech/loaders/misc/GT_Achievements.java b/src/main/java/gregtech/loaders/misc/GT_Achievements.java index 6a9481492c..fe9cde5f62 100644 --- a/src/main/java/gregtech/loaders/misc/GT_Achievements.java +++ b/src/main/java/gregtech/loaders/misc/GT_Achievements.java @@ -231,13 +231,13 @@ public class GT_Achievements { } } - /*public static void registerOre(Materials aMaterial, int min, int max, int chance, boolean overworld, boolean nether, boolean end) { - if (aMaterial != Materials._NULL) { + public static void registerOre(Materials aMaterial, int min, int max, int chance, boolean overworld, boolean nether, boolean end) { + /*if (aMaterial != Materials._NULL) { oreList.add(aMaterial); //if(!oreList.add(aMaterial)) Minecraft.getMinecraft().crashed(new CrashReport("GT Achievement - Ore with that (" + aMaterial.name() + ") material already exists.",new IllegalArgumentException())); } - oreStats.add(new Integer[]{min, max, chance, overworld ? 1 : 0, nether ? 1 : 0, end ? 1 : 0}); - }*/ + oreStats.add(new Integer[]{min, max, chance, overworld ? 1 : 0, nether ? 1 : 0, end ? 1 : 0});*/ + } public Achievement registerAchievement(String textId, int x, int y, ItemStack icon, Achievement requirement, boolean special) { if (!GT_Mod.gregtechproxy.mAchievements) { @@ -274,16 +274,16 @@ public class GT_Achievements { return achievement; } - /*public Achievement registerOreAchievement(Materials aMaterial) { - + public Achievement registerOreAchievement(Materials aMaterial) { + /* if (this.achievementList.get(aMaterial.mName) == null) { oreReg++; return registerAchievement(aMaterial.mName, -(6 + oreReg % 5), ((oreReg) / 5) - 8, new ItemStack(GregTech_API.sBlockOres1, 1, aMaterial.mMetaItemSubID), AchievementList.openInventory, false); - } + }*/ return null; } -*/ + public Achievement registerAssAchievement(GT_Recipe recipe) { if (this.achievementList.get(recipe.getOutput(0).getUnlocalizedName()) == null) { assReg++; -- cgit From 9d18a13c135738d469de95935734e8ff8e16bd17 Mon Sep 17 00:00:00 2001 From: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Date: Mon, 7 May 2018 15:29:06 +0200 Subject: this shouldnt be in this branch --- .../machines/basic/GT_MetaTileEntity_Scanner.java | 26 ---------------------- 1 file changed, 26 deletions(-) (limited to 'src/main/java/gregtech') diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Scanner.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Scanner.java index 0c66aced50..1a60ce2bef 100644 --- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Scanner.java +++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Scanner.java @@ -151,32 +151,6 @@ public class GT_MetaTileEntity_Scanner return 2; } - if (aStack.getItem().getUnlocalizedName().contains("Schematic")||aStack.getItem().getUnlocalizedName().contains("schematic")){ - String sTier =""; - - if (aStack.getItem().getUnlocalizedName().contains("moonbuggy")) - sTier = "100"; - else if(aStack.getItem().getUnlocalizedName().contains("cargo")) - sTier = "101"; - else if(aStack.getItem().getUnlocalizedName().contains("astro")) - sTier = "102"; - else if (aStack.getItem().getUnlocalizedName().matches(".*\\d+.*")) - sTier = aStack.getItem().getUnlocalizedName().split("(?<=\\D)(?=\\d)")[1].substring(0, 1); - else - sTier = "1"; - - getSpecialSlot().stackSize -= 1; - aStack.stackSize -= 1; - - this.mOutputItems[0] = GT_Utility.copyAmount(1L, new Object[]{getSpecialSlot()}); - this.mOutputItems[0].setTagCompound(GT_Utility.getNBTContainingShort(new NBTTagCompound(), "rocket_tier", Short.parseShort(sTier) )); - calculateOverclockedNess(512,36000); - //In case recipe is too OP for that machine - if (mMaxProgresstime == Integer.MAX_VALUE - 1 && mEUt == Integer.MAX_VALUE - 1) - return FOUND_RECIPE_BUT_DID_NOT_MEET_REQUIREMENTS; - return 2; - } - } if (getSpecialSlot() == null && ItemList.Tool_DataStick.isStackEqual(aStack, false, true)) { if (GT_Utility.ItemNBT.getBookTitle(aStack).equals("Raw Prospection Data")) { -- cgit