diff options
9 files changed, 3329 insertions, 3282 deletions
diff --git a/build.properties b/build.properties index 2d228ad619..d0d35c40a2 100644 --- a/build.properties +++ b/build.properties @@ -3,6 +3,6 @@ forge.version=10.13.4.1614-1.7.10 ic2.version=2.2.817-experimental gt.version=5.09.37 ae2.version=rv3-beta-22 -gtpp.version=1.7.09 +gtpp.version=1.7.11 commit.hash=aa9f04218e5298414f900b9fe61131f7ed26b8f1 structurelib.version=1.0.6 diff --git a/src/Java/gregtech/api/util/GTPP_Recipe.java b/src/Java/gregtech/api/util/GTPP_Recipe.java index b44b05985b..ec7bf42a35 100644 --- a/src/Java/gregtech/api/util/GTPP_Recipe.java +++ b/src/Java/gregtech/api/util/GTPP_Recipe.java @@ -327,37 +327,37 @@ public class GTPP_Recipe extends GT_Recipe implements IComparableRecipe { * Contains all Recipe Maps */ public static final Collection<GTPP_Recipe_Map> sMappings = new ArrayList<>(); - //public static final GT_Recipe_Map sChemicalBathRecipes = new GT_Recipe_Map(new HashSet<GT_Recipe>(200), "gt.recipe.chemicalbath", "Chemical Bath", null, RES_PATH_GUI + "basicmachines/ChemicalBath", 1, 3, 1, 1, 1, E, 1, E, true, true); - public static final GTPP_Recipe_Map_Internal sCokeOvenRecipes = new GTPP_Recipe_Map_Internal(new HashSet<GT_Recipe>(200), "gt.recipe.cokeoven", "Coke Oven", null, RES_PATH_GUI + "basicmachines/Dehydrator", 2, 2, 1, 0, 1, E, 1, E, true, true); - public static final GTPP_Recipe_Map_Internal sMatterFab2Recipes = new GTPP_Recipe_Map_Internal(new HashSet<GT_Recipe>(200), "gt.recipe.matterfab2", "Matter Fabricator", null, RES_PATH_GUI + "basicmachines/Default", 9, 9, 0, 0, 1, E, 1, E, true, true); - //public static final Gregtech_Recipe_Map sMatterFabRecipes = new Gregtech_Recipe_Map(new HashSet<GregtechRecipe>(200), "gt.recipe.matterfab", "Matter Fabricator", null, RES_PATH_GUI + "basicmachines/Massfabricator", 1, 3, 1, 1, 1, E, 1, E, true, true); + //public static final GT_Recipe_Map sChemicalBathRecipes = new GT_Recipe_Map(new HashSet<GT_Recipe>(200), "gtpp.recipe.chemicalbath", "Chemical Bath", null, RES_PATH_GUI + "basicmachines/ChemicalBath", 1, 3, 1, 1, 1, E, 1, E, true, true); + public static final GTPP_Recipe_Map_Internal sCokeOvenRecipes = new GTPP_Recipe_Map_Internal(new HashSet<GT_Recipe>(200), "gtpp.recipe.cokeoven", "Coke Oven", null, RES_PATH_GUI + "basicmachines/Dehydrator", 2, 2, 1, 0, 1, E, 1, E, true, true); + public static final GTPP_Recipe_Map_Internal sMatterFab2Recipes = new GTPP_Recipe_Map_Internal(new HashSet<GT_Recipe>(200), "gtpp.recipe.matterfab2", "Matter Fabricator", null, RES_PATH_GUI + "basicmachines/Default", 9, 9, 0, 0, 1, E, 1, E, true, true); + //public static final Gregtech_Recipe_Map sMatterFabRecipes = new Gregtech_Recipe_Map(new HashSet<GregtechRecipe>(200), "gtpp.recipe.matterfab", "Matter Fabricator", null, RES_PATH_GUI + "basicmachines/Massfabricator", 1, 3, 1, 1, 1, E, 1, E, true, true); - public static final GT_Recipe_Map_Fuel sRocketFuels = new GT_Recipe_Map_Fuel(new HashSet<GT_Recipe>(10), "gt.recipe.rocketenginefuel", "Rocket Engine Fuel", null, RES_PATH_GUI + "basicmachines/Default", 1, 1, 0, 0, 1, "Fuel Value: ", 3000, " EU", true, true); + public static final GT_Recipe_Map_Fuel sRocketFuels = new GT_Recipe_Map_Fuel(new HashSet<GT_Recipe>(10), "gtpp.recipe.rocketenginefuel", "Rocket Engine Fuel", null, RES_PATH_GUI + "basicmachines/Default", 1, 1, 0, 0, 1, "Fuel Value: ", 3000, " EU", true, true); - public static final GTPP_Recipe_Map_Internal sGeoThermalFuels = new GTPP_Recipe_Map_Internal(new HashSet<GT_Recipe>(10), "gt.recipe.geothermalfuel", "GeoThermal Fuel", null, RES_PATH_GUI + "basicmachines/Default", 1, 1, 0, 0, 1, "Fuel Value: ", 1000, " EU", true, true); - public static final GTPP_Recipe_Map_Internal sChemicalDehydratorRecipes = new GTPP_Recipe_Map_Internal(new HashSet<GT_Recipe>(200), "gt.recipe.chemicaldehydrator", "Dehydrator", null, RES_PATH_GUI + "basicmachines/Dehydrator", 2, 9, 0, 0, 1, E, 1, E, true, true); - public static final GTPP_Recipe_Map_Internal sVacuumFurnaceRecipes = new GTPP_Recipe_Map_Internal(new HashSet<GT_Recipe>(500), "gt.recipe.vacfurnace", "Vacuum Furnace", null, "gregtech:textures/gui/basicmachines/Default", 6, 6, 1, 0, 1, "Heat Capacity: ", 1, " K", false, true); - public static final GTPP_Recipe_Map_Internal sAlloyBlastSmelterRecipes = new GTPP_Recipe_Map_Internal(new HashSet<GT_Recipe>(200), "gt.recipe.alloyblastsmelter", "Alloy Blast Smelter", null, RES_PATH_GUI + "basicmachines/BlastSmelter", 9, 9, 1, 0, 1, E, 1, E, true, true); - public static final GTPP_Recipe_Map_Internal sSteamTurbineFuels = new GTPP_Recipe_Map_Internal(new HashSet<GT_Recipe>(10), "gt.recipe.geothermalfuel", "GeoThermal Fuel", null, RES_PATH_GUI + "basicmachines/Default", 1, 1, 0, 0, 1, "Fuel Value: ", 1000, " EU", true, true); + public static final GTPP_Recipe_Map_Internal sGeoThermalFuels = new GTPP_Recipe_Map_Internal(new HashSet<GT_Recipe>(10), "gtpp.recipe.geothermalfuel", "GeoThermal Fuel", null, RES_PATH_GUI + "basicmachines/Default", 1, 1, 0, 0, 1, "Fuel Value: ", 1000, " EU", true, true); + public static final GTPP_Recipe_Map_Internal sChemicalDehydratorRecipes = new GTPP_Recipe_Map_Internal(new HashSet<GT_Recipe>(200), "gtpp.recipe.chemicaldehydrator", "Dehydrator", null, RES_PATH_GUI + "basicmachines/Dehydrator", 2, 9, 0, 0, 1, E, 1, E, true, true); + public static final GTPP_Recipe_Map_Internal sVacuumFurnaceRecipes = new GTPP_Recipe_Map_Internal(new HashSet<GT_Recipe>(500), "gtpp.recipe.vacfurnace", "Vacuum Furnace", null, "gregtech:textures/gui/basicmachines/Default", 6, 6, 1, 0, 1, "Heat Capacity: ", 1, " K", false, true); + public static final GTPP_Recipe_Map_Internal sAlloyBlastSmelterRecipes = new GTPP_Recipe_Map_Internal(new HashSet<GT_Recipe>(200), "gtpp.recipe.alloyblastsmelter", "Alloy Blast Smelter", null, RES_PATH_GUI + "basicmachines/BlastSmelter", 9, 9, 1, 0, 1, E, 1, E, true, true); + public static final GTPP_Recipe_Map_Internal sSteamTurbineFuels = new GTPP_Recipe_Map_Internal(new HashSet<GT_Recipe>(10), "gtpp.recipe.steamturbinefuel", "GeoThermal Fuel", null, RES_PATH_GUI + "basicmachines/Default", 1, 1, 0, 0, 1, "Fuel Value: ", 1000, " EU", true, true); //LFTR recipes - public static final GTPP_Recipe_Map_Internal sLiquidFluorineThoriumReactorRecipes = new GTPP_Recipe_Map_Internal(new HashSet<GT_Recipe>(50), "gt.recipe.lftr", "Liquid Fluoride Thorium Reactor", null, RES_PATH_GUI + "basicmachines/LFTR", 0, 0, 0, 2, 1, "Start: ", 1, " EU", true, true); - public static final GTPP_Recipe_Map_Internal sLiquidFluorineThoriumReactorRecipesEx = new GTPP_Recipe_Map_Internal(new NoConflictGTRecipeMap(), "gt.recipe.lftr.2", "Liquid Fluoride Thorium Reactor", null, RES_PATH_GUI + "basicmachines/LFTR", 0, 0, 0, 2, 1, "Start: ", 1, " EU", true, true); + public static final GTPP_Recipe_Map_Internal sLiquidFluorineThoriumReactorRecipes = new GTPP_Recipe_Map_Internal(new HashSet<GT_Recipe>(50), "gtpp.recipe.lftr", "Liquid Fluoride Thorium Reactor", null, RES_PATH_GUI + "basicmachines/LFTR", 0, 0, 0, 2, 1, "Start: ", 1, " EU", true, true); + public static final GTPP_Recipe_Map_Internal sLiquidFluorineThoriumReactorRecipesEx = new GTPP_Recipe_Map_Internal(new NoConflictGTRecipeMap(), "gtpp.recipe.lftr.2", "Liquid Fluoride Thorium Reactor", null, RES_PATH_GUI + "basicmachines/LFTR", 0, 0, 0, 2, 1, "Start: ", 1, " EU", true, true); // Ore Milling Map - public static final GTPP_Recipe_Map_Internal sOreMillRecipes = new GTPP_Recipe_Map_Internal(new HashSet<GT_Recipe>(10000), "gt.recipe.oremill", "Milling", null, RES_PATH_GUI + "basicmachines/LFTR", 3, 4, 1, 0, 1, E, 1, E, true, false); + public static final GTPP_Recipe_Map_Internal sOreMillRecipes = new GTPP_Recipe_Map_Internal(new HashSet<GT_Recipe>(10000), "gtpp.recipe.oremill", "Milling", null, RES_PATH_GUI + "basicmachines/LFTR", 3, 4, 1, 0, 1, E, 1, E, true, false); //Fission Fuel Plant Recipes - public static final GTPP_Recipe_Map_Internal sFissionFuelProcessing = new GTPP_Recipe_Map_Internal(new HashSet<GT_Recipe>(50), "gt.recipe.fissionfuel", "Nuclear Fuel Processing", null, RES_PATH_GUI + "basicmachines/FissionFuel", 0, 0, 0, 0, 1, E, 1, E, true, false); + public static final GTPP_Recipe_Map_Internal sFissionFuelProcessing = new GTPP_Recipe_Map_Internal(new HashSet<GT_Recipe>(50), "gtpp.recipe.fissionfuel", "Nuclear Fuel Processing", null, RES_PATH_GUI + "basicmachines/FissionFuel", 0, 0, 0, 0, 1, E, 1, E, true, false); //Basic Washer Map - public static final GTPP_Recipe_Map_Internal sSimpleWasherRecipes = new GTPP_Recipe_Map_Internal(new HashSet<GT_Recipe>(3), "gt.recipe.simplewasher", "Simple Dust Washer", null, RES_PATH_GUI + "basicmachines/PotionBrewer", 1, 1, 0, 0, 1, E, 1, E, true, true); + public static final GTPP_Recipe_Map_Internal sSimpleWasherRecipes = new GTPP_Recipe_Map_Internal(new HashSet<GT_Recipe>(3), "gtpp.recipe.simplewasher", "Simple Dust Washer", null, RES_PATH_GUI + "basicmachines/PotionBrewer", 1, 1, 0, 0, 1, E, 1, E, true, true); - //public static final GT_Recipe_Map sSimpleWasherRecipes_FakeFuckBW = new GT_Recipe_Map(new HashSet<GT_Recipe>(3), "gt.recipe.simplewasher", "Fuck you Bart", null, RES_PATH_GUI + "basicmachines/PotionBrewer", 1, 1, 0, 0, 1, E, 1, E, true, false); + //public static final GT_Recipe_Map sSimpleWasherRecipes_FakeFuckBW = new GT_Recipe_Map(new HashSet<GT_Recipe>(3), "gtpp.recipe.simplewasher", "Fuck you Bart", null, RES_PATH_GUI + "basicmachines/PotionBrewer", 1, 1, 0, 0, 1, E, 1, E, true, false); public static final GTPP_Recipe_Map sChemicalPlantRecipes = new GTPP_Recipe_Map( new HashSet<GTPP_Recipe>(100), - "gt.recipe.fluidchemicaleactor", + "gtpp.recipe.fluidchemicaleactor", "Chemical Plant", null, CORE.MODID+":textures/gui/FluidReactor", @@ -375,48 +375,48 @@ public class GTPP_Recipe extends GT_Recipe implements IComparableRecipe { //RTG Fuel Map public static final GT_Recipe.GT_Recipe_Map_Fuel sRTGFuels = new GTPP_Recipe.GT_Recipe_Map_Fuel( - new HashSet<GT_Recipe>(10), "gt.recipe.RTGgenerators", "RTG", null, + new HashSet<GT_Recipe>(10), "gtpp.recipe.RTGgenerators", "RTG", null, "gregtech:textures/gui/basicmachines/Default", 1, 1, 0, 0, 1, "Fuel Value: ", 365, " Minecraft Days", true, true); //Thermal Boiler map - public static final GT_Recipe.GT_Recipe_Map_Fuel sThermalFuels = new GT_Recipe_Map_Fuel(new HashSet<GT_Recipe>(10), "gt.recipe.thermalgeneratorfuel", + public static final GT_Recipe.GT_Recipe_Map_Fuel sThermalFuels = new GT_Recipe_Map_Fuel(new HashSet<GT_Recipe>(10), "gtpp.recipe.thermalgeneratorfuel", "Thermal Generator Fuel", null, "gregtech:textures/gui/basicmachines/Default", 1, 1, 0, 0, 1, "Fuel Value: ", 1000, " EU", true, false); //Cyclotron recipe map - public static final GTPP_Recipe_Map_Internal sCyclotronRecipes = new GTPP_Recipe_Map_Internal(new HashSet<GT_Recipe>(200), "gt.recipe.cyclotron", "COMET - Compact Cyclotron", null, RES_PATH_GUI + "basicmachines/BlastSmelter", 2, 16, 0, 0, 1, E, 1, E, true, true); + public static final GTPP_Recipe_Map_Internal sCyclotronRecipes = new GTPP_Recipe_Map_Internal(new HashSet<GT_Recipe>(200), "gtpp.recipe.cyclotron", "COMET - Compact Cyclotron", null, RES_PATH_GUI + "basicmachines/BlastSmelter", 2, 16, 0, 0, 1, E, 1, E, true, true); //Advanced Mixer - public static final GTPP_Recipe_Map_Internal sAdvancedMixerRecipes = new GTPP_Recipe_Map_Internal(new HashSet<GT_Recipe>(1000), "gt.recipe.advanced.mixer", + public static final GTPP_Recipe_Map_Internal sAdvancedMixerRecipes = new GTPP_Recipe_Map_Internal(new HashSet<GT_Recipe>(1000), "gtpp.recipe.advanced.mixer", "Advanced Material Combiner", null, "gregtech:textures/gui/basicmachines/MixerAdvanced", 4, 4, 1, 0, 2, "", 1, "", true, true); //Mini Fusion - public static final GTPP_Recipe_Map_Internal sSlowFusionRecipes = new GTPP_Recipe_Map_Internal(new HashSet<GT_Recipe>(50), "gt.recipe.slowfusionreactor", + public static final GTPP_Recipe_Map_Internal sSlowFusionRecipes = new GTPP_Recipe_Map_Internal(new HashSet<GT_Recipe>(50), "gtpp.recipe.slowfusionreactor", "Mimir - Slow Fusion", null, "gregtech:textures/gui/basicmachines/LFTR", 0, 0, 0, 2, 1, "Start: ", 1, " EU", true, true); //Component Assembler - public static final GT_Recipe_Map sComponentAssemblerRecipes = new GT_Recipe_Map_Assembler(new HashSet<GT_Recipe>(300), "gt.recipe.componentassembler", "Component Assembler", null, RES_PATH_GUI + "basicmachines/Assembler", 6, 1, 1, 0, 1, E, 1, E, true, true); + public static final GT_Recipe_Map sComponentAssemblerRecipes = new GT_Recipe_Map_Assembler(new HashSet<GT_Recipe>(300), "gtpp.recipe.componentassembler", "Component Assembler", null, RES_PATH_GUI + "basicmachines/Assembler", 6, 1, 1, 0, 1, E, 1, E, true, true); //Special Maps for Multis - public static final GTPP_Recipe_Map_Internal sFishPondRecipes = new GTPP_Recipe_Map_Internal(new HashSet<GT_Recipe>(3), "gt.recipe.fishpond", "Zhuhai - Fishing Port", null, RES_PATH_GUI + "basicmachines/PotionBrewer", 0, 1, 0, 0, 1, "Requires Circuit: ", 1, ".", true, true); + public static final GTPP_Recipe_Map_Internal sFishPondRecipes = new GTPP_Recipe_Map_Internal(new HashSet<GT_Recipe>(3), "gtpp.recipe.fishpond", "Zhuhai - Fishing Port", null, RES_PATH_GUI + "basicmachines/PotionBrewer", 0, 1, 0, 0, 1, "Requires Circuit: ", 1, ".", true, true); //public static final GTPP_Recipe_Map sMultiblockCentrifugeRecipes = new GT_Recipe_Map_LargeCentrifuge(); //public static final GTPP_Recipe_Map sMultiblockElectrolyzerRecipes = new GT_Recipe_Map_LargeElectrolyzer(); //public static final GTPP_Recipe_Map sAdvFreezerRecipes = new GT_Recipe_Map_AdvancedVacuumFreezer(); - public static final GTPP_Recipe_Map_Internal sAdvFreezerRecipes_GT = new GTPP_Recipe_Map_Internal(new HashSet<GT_Recipe>(2000), "gt.recipe.cryogenicfreezer", "Cryogenic Freezer", null, RES_PATH_GUI + "basicmachines/FissionFuel", 9, 9, 0, 0, 1, "", 0, "", false, true); - public static final GTPP_Recipe_Map_Internal sMultiblockCentrifugeRecipes_GT = new GTPP_Recipe_Map_Internal(new HashSet<GT_Recipe>(2000), "gt.recipe.multicentrifuge", "Multiblock Centrifuge", null, RES_PATH_GUI + "basicmachines/FissionFuel", 9, 9, 0, 0, 1, "", 0, "", false, true); - public static final GTPP_Recipe_Map_Internal sMultiblockElectrolyzerRecipes_GT = new GTPP_Recipe_Map_Internal(new HashSet<GT_Recipe>(2000), "gt.recipe.multielectro", "Multiblock Electrolyzer", null, RES_PATH_GUI + "basicmachines/FissionFuel", 9, 9, 0, 0, 1, "", 0, "", false, true); - public static final GTPP_Recipe_Map_Internal sChemicalPlant_GT = new GTPP_Recipe_Map_Internal(new HashSet<GT_Recipe>(2000), "gt.recipe.temp4", "temp4", null, RES_PATH_GUI + "basicmachines/PotionBrewer", 0, 0, 0, 0, 0, "", 0, "", false, false); + public static final GTPP_Recipe_Map_Internal sAdvFreezerRecipes_GT = new GTPP_Recipe_Map_Internal(new HashSet<GT_Recipe>(2000), "gtpp.recipe.cryogenicfreezer", "Cryogenic Freezer", null, RES_PATH_GUI + "basicmachines/FissionFuel", 9, 9, 0, 0, 1, "", 0, "", false, true); + public static final GTPP_Recipe_Map_Internal sMultiblockCentrifugeRecipes_GT = new GTPP_Recipe_Map_Internal(new HashSet<GT_Recipe>(2000), "gtpp.recipe.multicentrifuge", "Multiblock Centrifuge", null, RES_PATH_GUI + "basicmachines/FissionFuel", 9, 9, 0, 0, 1, "", 0, "", false, true); + public static final GTPP_Recipe_Map_Internal sMultiblockElectrolyzerRecipes_GT = new GTPP_Recipe_Map_Internal(new HashSet<GT_Recipe>(2000), "gtpp.recipe.multielectro", "Multiblock Electrolyzer", null, RES_PATH_GUI + "basicmachines/FissionFuel", 9, 9, 0, 0, 1, "", 0, "", false, true); + public static final GTPP_Recipe_Map_Internal sChemicalPlant_GT = new GTPP_Recipe_Map_Internal(new HashSet<GT_Recipe>(2000), "gtpp.recipe.temp4", "temp4", null, RES_PATH_GUI + "basicmachines/PotionBrewer", 0, 0, 0, 0, 0, "", 0, "", false, false); //Semi-Fluid Fuel Map - public static final GT_Recipe_Map_Fuel sSemiFluidLiquidFuels = new GT_Recipe_Map_Fuel(new HashSet<GT_Recipe>(10), "gt.recipe.semifluidgeneratorfuels", "Semifluid Generator Fuels", null, RES_PATH_GUI + "basicmachines/Default", 1, 1, 0, 0, 1, "Fuel Value: ", 1000, " EU", true, true); + public static final GT_Recipe_Map_Fuel sSemiFluidLiquidFuels = new GT_Recipe_Map_Fuel(new HashSet<GT_Recipe>(10), "gtpp.recipe.semifluidgeneratorfuels", "Semifluid Generator Fuels", null, RES_PATH_GUI + "basicmachines/Default", 1, 1, 0, 0, 1, "Fuel Value: ", 1000, " EU", true, true); // Flotation Cell - public static final GTPP_Recipe_Map_Internal sFlotationCellRecipes = new GTPP_Recipe_Map_Internal(new HashSet<GT_Recipe>(10000), "gt.recipe.flotationcell", "Flotation Cell", null, RES_PATH_GUI + "basicmachines/LFTR", 6, 4, 1, 1, 1, "Ore Key: ", 1, E, true, false); + public static final GTPP_Recipe_Map_Internal sFlotationCellRecipes = new GTPP_Recipe_Map_Internal(new HashSet<GT_Recipe>(10000), "gtpp.recipe.flotationcell", "Flotation Cell", null, RES_PATH_GUI + "basicmachines/LFTR", 6, 4, 1, 1, 1, "Ore Key: ", 1, E, true, false); diff --git a/src/Java/gtPlusPlus/GTplusplus.java b/src/Java/gtPlusPlus/GTplusplus.java index fdf4ea0712..405dbea790 100644 --- a/src/Java/gtPlusPlus/GTplusplus.java +++ b/src/Java/gtPlusPlus/GTplusplus.java @@ -43,6 +43,7 @@ import gtPlusPlus.core.util.minecraft.HazmatUtils; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.core.util.reflect.ReflectionUtils; import gtPlusPlus.core.util.sys.SystemUtils; +import gtPlusPlus.nei.NEI_IMC_Sender; import gtPlusPlus.plugin.manager.Core_Manager; import gtPlusPlus.xmod.gregtech.common.Meta_GT_Proxy; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; @@ -188,7 +189,7 @@ public class GTplusplus implements ActionListener { proxy.registerNetworkStuff(); Meta_GT_Proxy.init(); Core_Manager.init(); - + NEI_IMC_Sender.IMCSender(); // Used by foreign players to generate .lang files for translation. if (CORE.ConfigSwitches.dumpItemAndBlockData) { LocaleUtils.generateFakeLocaleFile(); diff --git a/src/Java/gtPlusPlus/core/item/base/BaseItemColourable.java b/src/Java/gtPlusPlus/core/item/base/BaseItemColourable.java index 05af9eaa58..ca7041617d 100644 --- a/src/Java/gtPlusPlus/core/item/base/BaseItemColourable.java +++ b/src/Java/gtPlusPlus/core/item/base/BaseItemColourable.java @@ -41,6 +41,7 @@ public class BaseItemColourable extends Item this.setCreativeTab(creativeTab); this.setMaxStackSize(stackSize); this.setMaxDamage(maxDmg); + this.setHasSubtypes(true); this.rarity = regRarity; this.itemDescription = description; this.descColour = colour; diff --git a/src/Java/gtPlusPlus/core/material/ELEMENT.java b/src/Java/gtPlusPlus/core/material/ELEMENT.java index ba2579aa97..3af8b560ad 100644 --- a/src/Java/gtPlusPlus/core/material/ELEMENT.java +++ b/src/Java/gtPlusPlus/core/material/ELEMENT.java @@ -27,7 +27,9 @@ public final class ELEMENT { public final Material SODIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Sodium); public final Material MAGNESIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Magnesium); public final Material ALUMINIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Aluminium); + public final Material ALUMINIUMOXIDE = MaterialUtils.generateMaterialFromGtENUM(Materials.Aluminiumoxide); public final Material SILICON = MaterialUtils.generateMaterialFromGtENUM(Materials.Silicon); + public final Material SILICONDIOXIDE = MaterialUtils.generateMaterialFromGtENUM(Materials.SiliconDioxide); public final Material PHOSPHORUS = MaterialUtils.generateMaterialFromGtENUM(Materials.Phosphor); public final Material SULFUR = MaterialUtils.generateMaterialFromGtENUM(Materials.Sulfur); public final Material CHLORINE = MaterialUtils.generateMaterialFromGtENUM(Materials.Chlorine); @@ -236,8 +238,8 @@ public final class ELEMENT { new MaterialStack[]{ new MaterialStack(getInstance().OXYGEN, 30), new MaterialStack(getInstance().IRON, 20), - new MaterialStack(getInstance().SILICON, 20), - new MaterialStack(getInstance().ALUMINIUM, 10), + new MaterialStack(getInstance().SILICONDIOXIDE, 20), + new MaterialStack(getInstance().ALUMINIUMOXIDE, 10), new MaterialStack(getInstance().POTASSIUM, 10), new MaterialStack(getInstance().CALCIUM, 5), new MaterialStack(getInstance().SODIUM, 5) diff --git a/src/Java/gtPlusPlus/nei/NEI_IMC_Sender.java b/src/Java/gtPlusPlus/nei/NEI_IMC_Sender.java new file mode 100644 index 0000000000..fb815ca063 --- /dev/null +++ b/src/Java/gtPlusPlus/nei/NEI_IMC_Sender.java @@ -0,0 +1,43 @@ +package gtPlusPlus.nei; + +import cpw.mods.fml.common.event.FMLInterModComms; +import net.minecraft.nbt.NBTTagCompound; + +public class NEI_IMC_Sender { + public static void IMCSender() { + setNBTInfoAndSendIt("gtpp.recipe.alloyblastsmelter", "gregtech:gt.blockmachines:810"); + setNBTInfoAndSendIt("gtpp.recipe.rocketenginefuel", "gregtech:gt.blockmachines:793"); + setNBTInfoAndSendIt("gtpp.recipe.cyclotron", "gregtech:gt.blockmachines:828"); + setNBTInfoAndSendIt("gtpp.recipe.chemicaldehydrator", "gregtech:gt.blockmachines:911"); + setNBTInfoAndSendIt("gtpp.recipe.slowfusionreactor", "gregtech:gt.blockmachines:31015"); + setNBTInfoAndSendIt("gtpp.recipe.RTGgenerators", "gregtech:gt.blockmachines:869"); + setNBTInfoAndSendIt("gtpp.recipe.cokeoven", "gregtech:gt.blockmachines:791"); + setNBTInfoAndSendIt("gtpp.recipe.semifluidgeneratorfuels", "gregtech:gt.blockmachines:837"); + setNBTInfoAndSendIt("gtpp.recipe.fishpond", "gregtech:gt.blockmachines:829"); + setNBTInfoAndSendIt("gtpp.recipe.advanced.mixer", "gregtech:gt.blockmachines:811"); + setNBTInfoAndSendIt("gtpp.recipe.cryogenicfreezer", "gregtech:gt.blockmachines:910"); + setNBTInfoAndSendIt("gtpp.recipe.fissionfuel", "gregtech:gt.blockmachines:835"); + setNBTInfoAndSendIt("gtpp.recipe.geothermalfuel", "gregtech:gt.blockmachines:830"); + setNBTInfoAndSendIt("gtpp.recipe.lftr", "gregtech:gt.blockmachines:751"); + setNBTInfoAndSendIt("gtpp.recipe.lftr.2", "gregtech:gt.blockmachines:751"); + setNBTInfoAndSendIt("gtpp.recipe.matterfab2", "gregtech:gt.blockmachines:799"); + setNBTInfoAndSendIt("gtpp.recipe.multicentrifuge", "gregtech:gt.blockmachines:790"); + setNBTInfoAndSendIt("gtpp.recipe.multielectro", "gregtech:gt.blockmachines:796"); + setNBTInfoAndSendIt("gtpp.recipe.simplewasher", "gregtech:gt.blockmachines:767"); + setNBTInfoAndSendIt("gtpp.recipe.vacfurnace", "gregtech:gt.blockmachines:995"); + } + + private static void setNBTInfoAndSendIt(String aRecipeName, String aBlock) { + NBTTagCompound aNBT = new NBTTagCompound(); + aNBT.setString("handler", aRecipeName); + aNBT.setString("modName", "GT++"); + aNBT.setString("modId", "miscutils"); + aNBT.setBoolean("modRequired", true); + aNBT.setString("itemName", aBlock); + aNBT.setInteger("yShift", 6); + aNBT.setInteger("handlerHeight", 135); + aNBT.setInteger("handlerWidth", 166); + aNBT.setInteger("maxRecipesPerPage", 2); + FMLInterModComms.sendMessage("NotEnoughItems", "registerHandlerInfo", aNBT); + } +} diff --git a/src/Java/gtPlusPlus/xmod/gregtech/HANDLER_GT.java b/src/Java/gtPlusPlus/xmod/gregtech/HANDLER_GT.java index a11a172df5..f623fe7405 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/HANDLER_GT.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/HANDLER_GT.java @@ -145,7 +145,7 @@ public class HANDLER_GT { public static void onLoadComplete(FMLLoadCompleteEvent event) { removeCrudeTurbineRotors(); - cleanAssemblyLineRecipeMap(); + //cleanAssemblyLineRecipeMap(); if (ConfigSwitches.enableHarderRecipesForHighTierCasings) { removeOldHighTierCasingRecipes(); } diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialAlloySmelter.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialAlloySmelter.java index 1e7e5cfcf2..910ae8bff6 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialAlloySmelter.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialAlloySmelter.java @@ -127,7 +127,7 @@ public class GregtechMetaTileEntity_IndustrialAlloySmelter extends GregtechMeta_ @Override public int getEuDiscountForParallelism() { - return 0; + return 100; } @Override @@ -215,7 +215,7 @@ public class GregtechMetaTileEntity_IndustrialAlloySmelter extends GregtechMeta_ } public boolean checkRecipe(ItemStack aStack) { - return checkRecipeGeneric(this.getMaxParallelRecipes(), 0, 5 * this.mLevel); // Will have to clone the logic from parent class to handle heating coil + return checkRecipeGeneric(this.getMaxParallelRecipes(), 100, 5 * this.mLevel); // Will have to clone the logic from parent class to handle heating coil // tiers. } @@ -256,9 +256,6 @@ public class GregtechMetaTileEntity_IndustrialAlloySmelter extends GregtechMeta_ // EU discount float tRecipeEUt = (tRecipe.mEUt * aEUPercent) / 100.0f; int tHeatCapacityDivTiers = mHeatingCapacity / 900; - if (tHeatCapacityDivTiers > 0) { - tRecipeEUt = (int) (tRecipeEUt * (Math.pow(0.95, tHeatCapacityDivTiers))); - } float tTotalEUt = 0.0f; int parallelRecipes = 0; @@ -282,12 +279,12 @@ public class GregtechMetaTileEntity_IndustrialAlloySmelter extends GregtechMeta_ // Convert speed bonus to duration multiplier // e.g. 100% speed bonus = 200% speed = 100%/200% = 50% recipe duration. - aSpeedBonusPercent = Math.max(-99, aSpeedBonusPercent); + aSpeedBonusPercent = mLevel * 5; float tTimeFactor = 100.0f / (100.0f + aSpeedBonusPercent); this.mMaxProgresstime = (int) (tRecipe.mDuration * tTimeFactor); int rInt = 2; - this.mEUt = (int) Math.ceil(tTotalEUt); + this.mEUt = (int) Math.max(Math.ceil(tTotalEUt), 1); this.mEfficiency = (10000 - (getIdealStatus() - getRepairStatus()) * 1000); this.mEfficiencyIncrease = 10000; diff --git a/src/resources/assets/miscutils/lang/zh_CN.lang b/src/resources/assets/miscutils/lang/zh_CN.lang index 07f9d3122a..e01d85a522 100644 --- a/src/resources/assets/miscutils/lang/zh_CN.lang +++ b/src/resources/assets/miscutils/lang/zh_CN.lang @@ -1,3240 +1,3243 @@ -//Creative Tabs -itemGroup.MiscUtilBlockTab=[GT++] 方块 -itemGroup.MiscUtilMiscTab=[GT++] 物品 -itemGroup.MiscUtilCombatTab=[GT++] 战斗 -itemGroup.MiscUtilToolsTab=[GT++] 工具 -itemGroup.MiscUtilMachineTab=[GT++] 机器 -itemGroup.MiscUtilOtherTab=[GT++] 物品 II -itemGroup.MiscUtilBOP=[GT++]超多生物群系附属 - -//Debug -item.AAA_Broken.name=[不存在的物品]请在Github上反馈这个合成 -item.itemBedLocator_Base.name=床定位器[NBT测试] -item.itemBaseItemWithCharge.name=基础可充电物品 -item.miscutils_itemDebugShapeSpawner.name=[调试用]塑形 - -//Fluids -tile.fluidSludge.name=不流动的废水 -tile.fluidSludge.0.name=不流动的废水 - -//Death Messages -death.attack.plasmabolt=%s 死于滚烫的等离子体. -death.attack.plasmabolt.player=%1$s 被 %2$s 使用等离子体击杀. -death.attack.gtpp.grinder=%s 被艾萨研磨机磨成了渣渣. - -//Alternative Materials -item.itemPlateBatteryAlloy.name=电池合金板 -item.itemIngotBatteryAlloy.name=电池合金锭 -item.itemStickyRubber.name=粘性橡胶团 - -//Unused Fuel rods -item.itemFuelRod_Empty.name=空燃料棒 -item.itemFuelRod_Thorium.name=钍燃料棒 -item.itemFuelRod_Uranium.name=铀燃料棒 -item.itemFuelRod_Plutonium.name=钚燃料棒 - -//Entities -entity.constructStaballoy.name=贫铀合金结构 -entity.sickBlaze.name=被感染的狂热者 - -//Tile Entities -tile.blockToolBuilder.name=格雷工具组装台 - -//Tools -item.itemBufferCore.name=能量核心 -item.itemStaballoyPickaxe.name=隧道挖掘者 -item.itemStaballoyAxe.name=树林砍伐者 -item.itemSandstoneHammer.name=圆石粉碎者 - -//Thermal Foundation Stuff -item.MiscUtils.bucket.bucketPyrotheum.name=烈焰之炽焱桶 -item.MiscUtils.bucket.bucketCryotheum.name=极寒之凛冰桶 -item.MiscUtils.bucket.bucketEnder.name=谐振熔融末影珍珠桶 -item.MiscUtils.material.dustPyrotheum.name=炽焱之尘 -item.MiscUtils.material.dustCryotheum.name=凛冰之尘 -item.MiscUtils.material.rodBlizz.name=暴雪棒 -item.MiscUtils.material.dustBlizz.name=暴雪粉 - -//============== -tile.miscutils.fluid.pyrotheum.name=烈焰之炽焱 -tile.miscutils.fluid.cryotheum.name=极寒之凛冰 -tile.miscutils.fluid.ender.name=谐振熔融末影珍珠 -//============== - -//Forestry Stuff -item.frameAccelerated.name=加速框架 -item.frameVoid.name=虚空框架 -item.frameMutagenic.name=诱变框架 -item.frameBusy.name=工作框架 -item.frameChocolate.name=巧克力框架 -item.frameRestraint.name=约束框架 -item.frameSoul.name=灵魂框架 -item.frameHealing.name=治愈框架 -item.frameNova.name=新星框架 -item.frameArborists.name=树艺框架 -item.frameDecaying.name=腐烂框架 -item.frameSlowing.name=减速框架 -item.frameStabilizing.name=稳定框架 -item.frameUseless.name=无用框架 - -//IC2 stuff -item.itemEnergeticRotorBlade.name=充能合金扇叶 -item.itemTungstenSteelRotorBlade.name=钨钢扇叶 -item.itemVibrantRotorBlade.name=脉冲合金扇叶 -item.itemIridiumRotorBlade.name=铱扇叶 -item.itemEnergeticShaft.name=充能合金轴 -item.itemTungstenSteelShaft.name=钨钢轴 -item.itemVibrantShaft.name=脉冲合金轴 -item.itemIridiumShaft.name=铱轴 -item.itemMagnaliumRotorBlade.name=镁铝合金扇叶 -item.itemUltimetRotorBlade.name=哈氏合金扇叶 -item.itemMagnaliumShaft.name=镁铝合金轴 -item.itemUltimetShaft.name=哈氏合金轴 - - -//Misc Items -item.itemPLACEHOLDER_Circuit.name=夸克操纵者 (UV) -item.itemPlateEnrichedSoularium.name=富集阳光合金板 -item.itemHeliumBlob.name=神秘氢气物质 -item.itemAlkalusDisk.name=Alkalus圆盘 -item.itemHotIngotRaisinBread.name=一份热葡萄干面包 -item.itemIngotRaisinBread.name=一份葡萄干面包 - -//Misc Blocks -tile.blockCompressedObsidian.0.name=压缩黑曜石(9) -tile.blockCompressedObsidian.1.name=二重压缩黑曜石(81) -tile.blockCompressedObsidian.2.name=三重压缩黑曜石(729) -tile.blockCompressedObsidian.3.name=四重压缩黑曜石(6561) -tile.blockCompressedObsidian.4.name=五重压缩黑曜石(59049) -tile.blockCompressedObsidian.5.name=反转黑曜石 -tile.blockNet.name=网 - - -//GT++ Items - -//Meta Tool -MU-metaitem.01.0.name=MU-metaitem.01.0.name - -//Cells -item.SulfurDioxide.name=优质二氧化硫单元 -item.mobessence.name=怪物精华液单元 -item.Fertiliser.name=流体肥料单元 -item.UN32Fertiliser.name=UN-32肥料单元 -item.UN18Fertiliser.name=UN-18肥料单元 -item.RaisinJuice.name=葡萄汁单元 -item.BerylliumHydroxide.name=氢氧化铍单元 -item.AmmoniumBifluoride.name=氟化氢铵单元 -item.Hydroxide.name=氢氧化物单元 -item.Ammonium.name=铵单元 -item.AmmoniumTetrafluoroberyllate.name=四氟硼酸铵单元 - -//Resources -item.itemStickyRubber.name=粘性橡胶团 -item.itemCoalCoke.name=焦煤 -item.itemHydrogenBlob.name=神秘氢气团 -item.itemHeliumBlob.name=神秘氢气物质 - -//Normal Items -item.itemAlkalusDisk.name=Alkalus圆盘 -item.itemSimpleFiremaker.name=基础起火器 -item.itemFiber.name=植物纤维 -item.itemRope.name=绳索 -item.backpackRed.name=红色背包 -item.backpackGreen.name=绿色背包 -item.backpackBlue.name=蓝色背包 -item.backpackYellow.name=黄色背包 -item.backpackPurple.name=紫色背包 -item.backpackCyan.name=青色背包 -item.backpackMaroon.name=棕色背包 -item.backpackOlive.name=橄榄绿色背包 -item.backpackDarkGreen.name=深绿色背包 -item.backpackDarkPurple.name=深紫色背包 -item.backpackTeal.name=蓝绿色背包 -item.backpackNavy.name=深蓝色背包 -item.backpackSilver.name=银色背包 -item.backpackGray.name=灰色背包 -item.backpackBlack.name=黑色背包 -item.backpackWhite.name=白色背包 -item.itemBlueprint.name=蓝图[无用] -item.itemGemShards.name=钻石碎片 -item.itemHalfCompleteCasings.name=半成品机械方块 -item.itemSulfuricPotion.name=喷溅型 硫酸 -item.itemHydrofluoricPotion.name=喷溅型 氢氟酸 -item.itemIngotRaisinBread.name=一份葡萄干面包 -item.itemHotIngotRaisinBread.name=一份热葡萄干面包 -item.itemFoodRaisinToast.name=一份葡萄干烤面包 -item.itemHotFoodRaisinToast.name=一份热葡萄干烤面包 -item.itemFoodCurriedSausages.name=一份咖喱香肠 -item.itemHotFoodCurriedSausages.name=一份热咖喱香肠 - - -//Conversion Dusts -item.dustNeptunium238.name=镎 238粉 -item.dustRadium226.name=镭 226粉 -item.itemDustDecayedRadium226.name=衰变镭 226粉 -item.itemDustSmallDecayedRadium226.name=小堆衰变镭 226粉 -item.itemDustTinyDecayedRadium226.name=小撮衰变镭 226粉 - -//Material Items -item.itemDustGadolinium.name=钆粉 -item.itemDustSmallGadolinium.name=小堆钆粉 -item.itemDustTinyGadolinium.name=小撮钆粉 -item.itemDustYtterbium.name=镱粉 -item.itemDustSmallYtterbium.name=小堆镱粉 -item.itemDustTinyYtterbium.name=小撮镱粉 -item.itemDustSamarium.name=钐粉 -item.itemDustSmallSamarium.name=小堆钐粉 -item.itemDustTinySamarium.name=小撮钐粉 -item.itemDustLanthanum.name=镧粉 -item.itemDustSmallLanthanum.name=小堆镧粉 -item.itemDustTinyLanthanum.name=小撮镧粉 -item.itemCellNeon.name=氖单元 -item.itemCellGermanium.name=锗单元 -item.itemCellSelenium.name=硒单元 -item.itemCellBromine.name=溴单元 -item.itemCellKrypton.name=氪单元 -item.itemCellZirconium.name=锆单元 -item.itemCellTechnetium.name=锝单元 -item.itemCellRuthenium.name=钌单元 -item.itemCellRhodium.name=铑单元 -item.itemCellIodine.name=碘单元 -item.itemCellXenon.name=氙单元 -item.itemCellHafnium.name=铪单元 -item.itemCellRhenium.name=铼单元 -item.itemCellThallium.name=铊单元 -item.itemCellPolonium.name=钋单元 -item.itemCellAstatine.name=砹单元 -item.itemCellFrancium.name=钫单元 -item.itemCellRadium.name=镭单元 -item.itemCellActinium.name=锕单元 -item.itemCellProtactinium.name=镤单元 -item.itemCellNeptunium.name=镎单元 -item.itemCellCurium.name=锔单元 -item.itemCellBerkelium.name=锫单元 -item.itemCellCalifornium.name=锎单元 -item.itemCellEinsteinium.name=锿单元 -item.itemCellFermium.name=镄单元 -item.itemCellRefinedTrinium.name=精制三元金属单元 -item.itemIngotSelenium.name=硒锭 -item.itemDustSelenium.name=硒粉 -item.itemDustTinySelenium.name=小撮硒粉 -item.itemDustSmallSelenium.name=小堆硒粉 -item.itemNuggetSelenium.name=硒粒 -item.itemPlateSelenium.name=硒板 -item.itemPlateDoubleSelenium.name=双重硒板 -item.itemBoltSelenium.name=硒螺栓 -item.itemRodSelenium.name=硒杆 -item.itemRodLongSelenium.name=长硒杆 -item.itemRingSelenium.name=硒环 -item.itemScrewSelenium.name=硒螺丝 -item.itemRotorSelenium.name=硒转子 -item.itemGearSelenium.name=硒齿轮 -item.itemCellUranium232.name=铀-232单元 -item.itemCellUranium233.name=铀-233单元 -item.itemCellThoriumTetrafluoride.name=四氟化钍单元 -item.itemCellThoriumHexafluoride.name=六氟化钍单元 -item.itemCellUraniumTetrafluoride.name=四氟化铀单元 -item.itemCellUraniumHexafluoride.name=六氟化铀单元 -item.itemCellZirconiumTetrafluoride.name=四氟化锆单元 -item.itemCellBerylliumFluoride.name=氟化铍单元 -item.itemCellLithiumFluoride.name=氟化锂单元 -item.itemCellHydroxide.name=氢氧化物单元 -item.itemCellAmmonium.name=铵单元 -item.itemCellAmmoniumBifluoride.name=氟化氢铵单元 -item.itemCellBerylliumHydroxide.name=氢氧化铍单元 -item.itemCellAmmoniumTetrafluoroberyllate.name=氟铍酸铵单元 -item.itemCellNeptuniumHexafluoride.name=六氟化铀单元 -item.itemCellTechnetiumHexafluoride.name=六氟化锝单元 -item.itemCellSeleniumHexafluoride.name=六氟化硒单元 -item.itemCellEnergyCrystal.name=能量水晶单元 -item.itemCellBloodSteel.name=血钢单元 -item.itemCellStaballoy.name=贫铀合金单元 -item.itemCellTantalloy60.name=钽钨合金-60单元 -item.itemCellTantalloy61.name=钽钨合金-61单元 -item.itemCellTumbaga.name=铜金合金单元 -item.itemCellPotin.name=粗青铜合金单元 -item.itemCellInconel625.name=镍铬基合金-625单元 -item.itemCellInconel690.name=镍铬基合金-690单元 -item.itemCellInconel792.name=镍铬基合金-792单元 -item.itemCellZeron100.name=塞龙-100单元 -item.itemCellMaragingSteel250.name=马氏体时效钢250单元 -item.itemCellMaragingSteel300.name=马氏体时效钢300单元 -item.itemCellMaragingSteel350.name=马氏体时效钢350单元 -item.itemCellStellite.name=铬钴锰钛合金单元 -item.itemCellTalonite.name=铬钴磷酸盐合金单元 -item.itemCellHastelloyW.name=哈斯特洛依合金-W单元 -item.itemCellHastelloyX.name=哈斯特洛依合金-X单元 -item.itemCellHastelloyN.name=哈斯特洛依合金-N单元 -item.itemCellHastelloyC276.name=哈斯特洛依合金-C276单元 -item.itemCellIncoloy020.name=耐热耐热铬铁合金-020单元 -item.itemCellIncoloyDS.name=耐热铬铁合金-DS单元 -item.itemCellIncoloyMA956.name=耐热耐热铬铁合金-MA956单元 -item.itemCellTungstenCarbide.name=碳化钨单元 -item.itemCellSiliconCarbide.name=碳化硅单元 -item.itemCellTantalumCarbide.name=碳化钽单元 -item.itemCellZirconiumCarbide.name=碳化锆单元 -item.itemCellNiobiumCarbide.name=碳化铌单元 -item.itemCellGrisium.name=灰钛合金单元 -item.itemCellEglinSteelBaseCompound.name=埃格林钢单元 -item.itemCellEglinSteel.name=埃格林钢单元 -item.itemCellHG1223.name=HG-1223单元 -item.itemCellTriniumTitaniumAlloy.name=三元钛合金单元 -item.itemCellTriniumNaquadahAlloy.name=三元硅岩合金单元 -item.itemCellTriniumNaquadahCarbonite.name=碳化三元硅岩合金单元 -item.itemCellQuantum.name=量子合金单元 -item.itemIngotBromine.name=溴锭 -item.itemDustBromine.name=溴粉 -item.itemDustTinyBromine.name=小撮溴粉 -item.itemDustSmallBromine.name=小堆溴粉 -item.itemNuggetBromine.name=溴粒 -item.itemPlateBromine.name=溴板 -item.itemPlateDoubleBromine.name=双重溴板 -item.itemIngotStrontium.name=锶锭 -item.itemDustStrontium.name=锶粉 -item.itemDustTinyStrontium.name=小撮锶粉 -item.itemDustSmallStrontium.name=小堆锶粉 -item.itemNuggetStrontium.name=锶粒 -item.itemPlateStrontium.name=锶板 -item.itemPlateDoubleStrontium.name=双重锶板 -item.itemBoltStrontium.name=锶螺栓 -item.itemRodStrontium.name=锶杆 -item.itemRodLongStrontium.name=长锶杆 -item.itemRingStrontium.name=锶环 -item.itemScrewStrontium.name=锶螺丝 -item.itemRotorStrontium.name=锶转子 -item.itemGearStrontium.name=锶齿轮 -item.itemIngotZirconium.name=锆锭 -item.itemDustZirconium.name=锆粉 -item.itemDustTinyZirconium.name=小撮锆粉 -item.itemDustSmallZirconium.name=小堆锆粉 -item.itemNuggetZirconium.name=锆粒 -item.itemPlateZirconium.name=锆板 -item.itemPlateDoubleZirconium.name=双重锆板 -item.itemBoltZirconium.name=锆螺栓 -item.itemRodZirconium.name=锆杆 -item.itemRodLongZirconium.name=长锆杆 -item.itemRingZirconium.name=锆环 -item.itemScrewZirconium.name=锆螺丝 -item.itemRotorZirconium.name=锆转子 -item.itemGearZirconium.name=锆齿轮 -item.itemIngotRuthenium.name=钌锭 -item.itemDustRuthenium.name=钌粉 -item.itemDustTinyRuthenium.name=小撮钌粉 -item.itemDustSmallRuthenium.name=小堆钌粉 -item.itemNuggetRuthenium.name=钌粒 -item.itemPlateRuthenium.name=钌板 -item.itemPlateDoubleRuthenium.name=双重钌板 -item.itemBoltRuthenium.name=钌螺栓 -item.itemRodRuthenium.name=钌杆 -item.itemRodLongRuthenium.name=长钌杆 -item.itemRingRuthenium.name=钌环 -item.itemScrewRuthenium.name=钌螺丝 -item.itemRotorRuthenium.name=钌转子 -item.itemGearRuthenium.name=钌齿轮 -item.itemIngotIodine.name=碘锭 -item.itemDustIodine.name=碘粉 -item.itemDustTinyIodine.name=小撮碘粉 -item.itemDustSmallIodine.name=小堆碘粉 -item.itemNuggetIodine.name=碘粒 -item.itemPlateIodine.name=碘板 -item.itemPlateDoubleIodine.name=双重碘板 -item.itemBoltI |