diff --git a/src/main/java/emt/EMT.java b/src/main/java/emt/EMT.java index 852bcc7..5834cb8 100644 --- a/src/main/java/emt/EMT.java +++ b/src/main/java/emt/EMT.java @@ -19,7 +19,6 @@ import cpw.mods.fml.relauncher.Side; import emt.command.CommandOutputs; import emt.init.EMTEntities; import emt.init.Registry; -import emt.nei.NEI_Config; import emt.network.PacketEMTKeys; import emt.network.PacketNodeInfo; import emt.proxy.CommonProxy; @@ -90,8 +89,6 @@ public class EMT { } EMTDungeonChestGenerator.generateLoot(); EMTEntities.registerEMTEntities(); - - NEI_Config.Init(); } @Mod.EventHandler diff --git a/src/main/java/emt/gthandler/common/blocks/EMT_GT_Block.java b/src/main/java/emt/gthandler/common/blocks/EMT_GT_Block.java deleted file mode 100644 index 270aea7..0000000 --- a/src/main/java/emt/gthandler/common/blocks/EMT_GT_Block.java +++ /dev/null @@ -1,64 +0,0 @@ -package emt.gthandler.common.blocks; - -import java.util.List; - -import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import emt.EMT; -import emt.gthandler.common.items.EMT_CasingBlock; -import gregtech.api.enums.Textures; -import gregtech.api.render.TextureFactory; -import gregtech.common.blocks.GT_Block_Casings_Abstract; - -public class EMT_GT_Block extends GT_Block_Casings_Abstract { - - @SideOnly(Side.CLIENT) - private IIcon[] texture; - - private final String[] textureNames; - - public EMT_GT_Block(String[] texture) { - super(EMT_CasingBlock.class, "EMT_GTBLOCK_CASEING", Material.anvil); - this.setHardness(15.0F); - this.setResistance(30.0F); - this.textureNames = texture; - this.setCreativeTab(EMT.TAB); - - // Taking one texture slot :P - Textures.BlockIcons.setCasingTexture((byte) 1, (byte) (15 + 48), TextureFactory.of(this, 7)); - } - - @Override - public int damageDropped(final int meta) { - return meta; - } - - @Override - public void getSubBlocks(final Item item, final CreativeTabs tab, final List list) { - for (int i = 0; i < textureNames.length; i++) { - list.add(new ItemStack(item, 1, i)); - } - } - - @Override - @SideOnly(Side.CLIENT) - public IIcon getIcon(int side, int meta) { - return meta < texture.length ? texture[meta] : texture[1]; - } - - @Override - @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister par1IconRegister) { - texture = new IIcon[textureNames.length]; - for (int i = 0; i < textureNames.length; i++) { - texture[i] = par1IconRegister.registerIcon(textureNames[i]); - } - } -} diff --git a/src/main/java/emt/gthandler/common/items/EMT_CasingBlock.java b/src/main/java/emt/gthandler/common/items/EMT_CasingBlock.java deleted file mode 100644 index 1dd59ad..0000000 --- a/src/main/java/emt/gthandler/common/items/EMT_CasingBlock.java +++ /dev/null @@ -1,101 +0,0 @@ -package emt.gthandler.common.items; - -import java.util.List; - -import net.minecraft.block.Block; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import emt.EMT; -import emt.gthandler.common.blocks.EMT_GT_Block; -import gregtech.api.util.GT_LanguageManager; -import gregtech.common.blocks.GT_Item_Casings_Abstract; - -public class EMT_CasingBlock extends GT_Item_Casings_Abstract { - - public static final Block[] EMT_GT_BLOCKS = { new EMT_GT_Block( - new String[] { EMT.TEXTURE_PATH + ":machines/side", EMT.TEXTURE_PATH + ":machines/GT/inner", - EMT.TEXTURE_PATH + ":machines/GT/siderawI", EMT.TEXTURE_PATH + ":machines/GT/rawcoreI", - EMT.TEXTURE_PATH + ":machines/GT/siderawII", EMT.TEXTURE_PATH + ":machines/GT/rawcoreII", - EMT.TEXTURE_PATH + ":machines/GT/rawcoreII", // unused? - EMT.TEXTURE_PATH + ":machines/GT/ROBUST_NAQUADAH_ALLOY", - EMT.TEXTURE_PATH + ":machines/GT/BLOODY_ICHORIUM", EMT.TEXTURE_PATH + ":machines/GT/DRACONIUM", - EMT.TEXTURE_PATH + ":machines/GT/WYVERN", EMT.TEXTURE_PATH + ":machines/GT/AWAKENED_DRACONIUM", - EMT.TEXTURE_PATH + ":machines/GT/CHAOTIC", }) }; - - protected final String deccCasing01Tooltip = GT_LanguageManager - .addStringLocalization("gt.casing01tooltip", "Draconic Evolution Fusion Crafter Casing, Tier 1"); - protected final String deccCasing02Tooltip = GT_LanguageManager - .addStringLocalization("gt.casing02tooltip", "Draconic Evolution Fusion Crafter Casing, Tier 2"); - protected final String deccCasing03Tooltip = GT_LanguageManager - .addStringLocalization("gt.casing03tooltip", "Draconic Evolution Fusion Crafter Casing, Tier 3"); - protected final String deccCasing04Tooltip = GT_LanguageManager - .addStringLocalization("gt.casing04tooltip", "Draconic Evolution Fusion Crafter Casing, Tier 4"); - protected final String deccCasing05Tooltip = GT_LanguageManager - .addStringLocalization("gt.casing05tooltip", "Draconic Evolution Fusion Crafter Casing, Tier 5"); - - public EMT_CasingBlock(final Block par1) { - super(par1); - this.setMaxDamage(0); - this.setHasSubtypes(true); - this.setCreativeTab(EMT.TAB); - } - - @Override - public int getMetadata(final int aMeta) { - return aMeta; - } - - @Override - public String getUnlocalizedName(final ItemStack aStack) { - return this.field_150939_a.getUnlocalizedName() + "." + this.getDamage(aStack); - } - - @Override - @SideOnly(Side.CLIENT) // so it only gets sent clientside? - public void addInformation(final ItemStack aStack, final EntityPlayer aPlayer, final List aList, - final boolean aF3_H) { - super.addInformation(aStack, aPlayer, aList, aF3_H); - - switch (getDamage(aStack)) { - case 8: - aList.add(this.deccCasing01Tooltip); - break; - case 9: - aList.add(this.deccCasing02Tooltip); - break; - case 10: - aList.add(this.deccCasing03Tooltip); - break; - case 11: - aList.add(this.deccCasing04Tooltip); - break; - case 12: - aList.add(this.deccCasing05Tooltip); - break; - default: - break; - } - } - - @Override - @SideOnly(Side.CLIENT) - public IIcon getIcon(ItemStack stack, int pass) { - return this.field_150939_a.getIcon(0, stack.getItemDamage()); - } - - @Override - @SideOnly(Side.CLIENT) - public IIcon getIcon(ItemStack stack, int renderPass, EntityPlayer player, ItemStack usingItem, int useRemaining) { - return getIcon(stack, renderPass); - } - - @Override - @SideOnly(Side.CLIENT) - public IIcon getIconFromDamageForRenderPass(int p_77618_1_, int p_77618_2_) { - return this.field_150939_a.getIcon(0, p_77618_2_); - } -} diff --git a/src/main/java/emt/gthandler/common/loader/EMT_GT_Loader.java b/src/main/java/emt/gthandler/common/loader/EMT_GT_Loader.java index 2944072..1178a81 100644 --- a/src/main/java/emt/gthandler/common/loader/EMT_GT_Loader.java +++ b/src/main/java/emt/gthandler/common/loader/EMT_GT_Loader.java @@ -2,165 +2,24 @@ package emt.gthandler.common.loader; import static emt.command.CommandOutputs.mkbook; -import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidRegistry; -import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.oredict.OreDictionary; -import cpw.mods.fml.common.Loader; -import emt.gthandler.common.items.EMT_CasingBlock; -import emt.gthandler.common.tileentities.machines.multi.DE_Fusion_Crafter; import emt.tile.GT_MetaTileEntity_ResearchCompleter; import gregtech.api.enums.GT_Values; -import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; -import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; -import thaumcraft.common.config.ConfigBlocks; import thaumcraft.common.config.ConfigItems; public class EMT_GT_Loader implements Runnable { - public static final int TIERS = GT_Values.VN.length - 1; public static int aIDoffset = 13000 - GT_Values.VN.length - 1; - public static ItemStack[] EHatch = new ItemStack[TIERS]; - public static ItemStack DECC; public static ItemStack ResearchMultiblock; @Override public void run() { - - // Dragonblood recipe for magics haters - if (Loader.isModLoaded("miscutils")) { - GT_Values.RA.addMixerRecipe( - new ItemStack[] { new ItemStack(Blocks.dragon_egg, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.DraconiumAwakened, 64L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.DraconiumAwakened, 64L) }, - new FluidStack[] { Materials.Radon.getPlasma(144) }, - new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 8L) }, - new FluidStack[] { new FluidStack(FluidRegistry.getFluid("molten.dragonblood"), 288) }, - 14000, - 1966080); - } - // Casing blocks - GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Iridium, 1L), - GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Osmiridium, 4L) }, - Materials.SolderingAlloy.getMolten(576L), - new ItemStack(EMT_CasingBlock.EMT_GT_BLOCKS[0], 1, 2), - 100, - (int) (GT_Values.V[5] - (GT_Values.V[5] / 10))); - GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Indium, 1L), - GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Tungsten, 4L) }, - Materials.SolderingAlloy.getMolten(576L), - new ItemStack(EMT_CasingBlock.EMT_GT_BLOCKS[0], 1, 3), - 100, - (int) (GT_Values.V[5] - (GT_Values.V[5] / 10))); - if (Loader.isModLoaded("ThaumicTinkerer")) GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { new ItemStack(EMT_CasingBlock.EMT_GT_BLOCKS[0], 1, 2), - GT_ModHandler.getModItem("ThaumicTinkerer", "kamiResource", 2L, 2) }, - Materials.Concrete.getMolten(2304L), - new ItemStack(EMT_CasingBlock.EMT_GT_BLOCKS[0], 1, 4), - 100, - (int) (GT_Values.V[5] - (GT_Values.V[5] / 10))); - else GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { new ItemStack(EMT_CasingBlock.EMT_GT_BLOCKS[0], 1, 2), - Materials.ElectrumFlux.getPlates(8) }, - Materials.Concrete.getMolten(2304L), - new ItemStack(EMT_CasingBlock.EMT_GT_BLOCKS[0], 1, 4), - 100, - (int) (GT_Values.V[5] - (GT_Values.V[5] / 10))); - GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { new ItemStack(EMT_CasingBlock.EMT_GT_BLOCKS[0], 1, 3), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iridium, 8L) }, - Materials.Osmiridium.getMolten(576L), - new ItemStack(EMT_CasingBlock.EMT_GT_BLOCKS[0], 1, 5), - 100, - (int) (GT_Values.V[5] - (GT_Values.V[5] / 10))); - GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.NaquadahAlloy, 6L), - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.NaquadahAlloy, 6L) }, - Materials.Void.getMolten(1152L), - new ItemStack(EMT_CasingBlock.EMT_GT_BLOCKS[0], 1, 7), - 24000, - 491520); - GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { GT_ModHandler.getModItem("dreamcraft", "tile.BloodyIchorium", 1, 0), - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Osmiridium, 6L) }, - Materials.Void.getMolten(1152L), - new ItemStack(EMT_CasingBlock.EMT_GT_BLOCKS[0], 1, 8), - 24000, - 491520); - GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { new ItemStack(EMT_CasingBlock.EMT_GT_BLOCKS[0], 1, 8), - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Draconium, 6L), - GT_ModHandler.getModItem("DraconicEvolution", "draconicCore", 1, 0) }, - Materials.Void.getMolten(2304L), - new ItemStack(EMT_CasingBlock.EMT_GT_BLOCKS[0], 1, 9), - 24000, - 491520); // uv - GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { new ItemStack(EMT_CasingBlock.EMT_GT_BLOCKS[0], 1, 9), - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.CosmicNeutronium, 6L), - GT_ModHandler.getModItem("DraconicEvolution", "wyvernCore", 2, 0) }, - Materials.Void.getMolten(4608L), - new ItemStack(EMT_CasingBlock.EMT_GT_BLOCKS[0], 1, 10), - 12000, - 1996080); // uhv, you need uhv to get the thing anyway? - GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { new ItemStack(EMT_CasingBlock.EMT_GT_BLOCKS[0], 1, 10), - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.DraconiumAwakened, 6L), - GT_ModHandler.getModItem("DraconicEvolution", "awakenedCore", 3, 0) }, - Materials.Void.getMolten(9216L), - new ItemStack(EMT_CasingBlock.EMT_GT_BLOCKS[0], 1, 11), - 12000, - 7864320); // uev - GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { new ItemStack(EMT_CasingBlock.EMT_GT_BLOCKS[0], 1, 11), - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Infinity, 6L), - GT_ModHandler.getModItem("DraconicEvolution", "chaoticCore", 4, 0) }, - Materials.Void.getMolten(18432L), - new ItemStack(EMT_CasingBlock.EMT_GT_BLOCKS[0], 1, 12), - 12000, - 31457280); // uiv, use the multi - - EMT_RecipeAdder.Run(); - - DECC = new DE_Fusion_Crafter(5001, "de_fusion_crafter", "Draconic Evolution Fusion Crafter").getStackForm(1L); - - /* - * New DECF controller recipe moved to TT. only create the old one here if tectech or blood magic is not around. - */ - - if (!(Loader.isModLoaded("tectech") && Loader.isModLoaded("AWWayofTime"))) { - GT_Values.RA.addAssemblylineRecipe( - GT_ModHandler.getModItem("gregtech", "gt.blockmachines", 1, 10780), - 144000, - new Object[] { GT_ModHandler.getModItem("gregtech", "gt.blockmachines", 1, 10780), - ItemList.Robot_Arm_LuV.get(2L), ItemList.Electric_Motor_LuV.get(2L), - ItemList.Field_Generator_LuV.get(1L), - new Object[] { OrePrefixes.circuit.get(Materials.Master), 2 }, - ItemList.Casing_Coil_Naquadah.get(8L), }, - new FluidStack[] { Materials.SolderingAlloy.getMolten(2304L), - Materials.Thaumium.getMolten(1440L), }, - DECC, - 1500, - 16384); - } - - for (int i = 0; i < ItemList.HATCHES_INPUT.length; i++) { - GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { ItemList.HATCHES_INPUT[i].get(1L), new ItemStack(ConfigBlocks.blockTube, 1, 4) }, - Materials.Thaumium.getMolten(288L), - EHatch[i], - 100, - (int) (GT_Values.V[i] - (GT_Values.V[i] / 10))); - } - ResearchMultiblock = new GT_MetaTileEntity_ResearchCompleter( aIDoffset + GT_Values.VN.length + 2, "Research Completer", diff --git a/src/main/java/emt/gthandler/common/loader/EMT_RecipeAdder.java b/src/main/java/emt/gthandler/common/loader/EMT_RecipeAdder.java deleted file mode 100644 index cd486a6..0000000 --- a/src/main/java/emt/gthandler/common/loader/EMT_RecipeAdder.java +++ /dev/null @@ -1,189 +0,0 @@ -package emt.gthandler.common.loader; - -import static gregtech.api.enums.GT_Values.E; -import static gregtech.api.enums.GT_Values.RES_PATH_GUI; - -import java.util.HashSet; - -import net.minecraft.init.Blocks; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidRegistry; -import net.minecraftforge.fluids.FluidStack; - -import cpw.mods.fml.common.Loader; -import emt.client.gui.EMT_UITextures; -import emt.init.EMTItems; -import gregtech.api.enums.GT_Values; -import gregtech.api.enums.ItemList; -import gregtech.api.enums.Materials; -import gregtech.api.enums.MaterialsUEVplus; -import gregtech.api.enums.OrePrefixes; -import gregtech.api.util.GT_ModHandler; -import gregtech.api.util.GT_OreDictUnificator; -import gregtech.api.util.GT_Recipe; - -public class EMT_RecipeAdder { - - public static final GT_Recipe.GT_Recipe_Map sFusionCraftingRecipes = new GT_Recipe.GT_Recipe_Map( - new HashSet<>(16), - "emt.recipe.fusioncrafting", - "Draconic Evolution Fusion Crafter", - null, - RES_PATH_GUI + "basicmachines/FusionCrafter", - 9, - 1, - 1, - 0, - 1, - "Tier Casing: ", - 1, - E, - false, - true).setSlotOverlay(false, false, EMT_UITextures.OVERLAY_SLOT_FUSION_CRAFTING); - - public static void addFusionCraftingRecipe(ItemStack[] inputs, FluidStack[] fluidinputs, ItemStack[] outputs, - FluidStack[] fluidoutputs, int aDuration, int aEUt, int aTier) { - sFusionCraftingRecipes - .addRecipe(true, inputs, outputs, null, fluidinputs, fluidoutputs, aDuration, aEUt, aTier); - } - - public static void addFusionCraftingRecipeNonOptimized(ItemStack[] inputs, FluidStack[] fluidinputs, - ItemStack[] outputs, FluidStack[] fluidoutputs, int aDuration, int aEUt, int aTier) { - sFusionCraftingRecipes - .addRecipe(false, inputs, outputs, null, fluidinputs, fluidoutputs, aDuration, aEUt, aTier); - } - - public static void addFusionCraftingRecipe(ItemStack[] inputs, ItemStack output, int aDuration, int aEUt, - int aTier) { - addFusionCraftingRecipe(inputs, null, new ItemStack[] { output }, null, aDuration, aEUt, aTier); - } - - // Use this if you don't want your recipes quantity to be splitted - public static void addFusionCraftingRecipeNonOptimized(ItemStack[] inputs, FluidStack fluidinput, ItemStack output, - FluidStack fluidoutput, int aDuration, int aEUt, int aTier) { - addFusionCraftingRecipeNonOptimized( - inputs, - new FluidStack[] { fluidinput }, - new ItemStack[] { output }, - new FluidStack[] { fluidoutput }, - aDuration, - aEUt, - aTier); - } - - public static void Run() { - - // CORES - - addFusionCraftingRecipeNonOptimized( - new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Osmiridium, 4), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Ichorium, 1), ItemList.QuantumEye.get(1L), - new ItemStack(EMTItems.itemEMTItems, 0, 16) }, - Materials.Sunnarium.getMolten(1440), - GT_ModHandler.getModItem("DraconicEvolution", "draconicCore", 1, 0), - GT_Values.NF, - 400, - 500000, - 1); - - addFusionCraftingRecipeNonOptimized( - new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Draconium, 8), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 4), - GT_ModHandler.getModItem("DraconicEvolution", "draconicCore", 4, 0), - ItemList.QuantumStar.get(1L), new ItemStack(EMTItems.itemEMTItems, 0, 17), }, - Materials.Neutronium.getMolten(1440), - GT_ModHandler.getModItem("DraconicEvolution", "wyvernCore", 1, 0), - GT_Values.NF, - 800, - 2000000, - 2); - if (Loader.isModLoaded("supersolarpanel")) { - addFusionCraftingRecipeNonOptimized( - new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.DraconiumAwakened, 12), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Draconium, 4), - GT_ModHandler.getModItem("DraconicEvolution", "wyvernCore", 4, 0), - GT_ModHandler.getModItem("supersolarpanel", "enderquantumcomponent", 1, 0), - new ItemStack(EMTItems.itemEMTItems, 0, 18) }, - Materials.Infinity.getMolten(1440), - GT_ModHandler.getModItem("DraconicEvolution", "awakenedCore", 1, 0), - GT_Values.NF, - 1600, - 8000000, - 3); - } else { - addFusionCraftingRecipeNonOptimized( - new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.DraconiumAwakened, 12), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Draconium, 4), - GT_ModHandler.getModItem("DraconicEvolution", "wyvernCore", 4, 0), - GT_ModHandler.getModItem("dreamcraft", "item.ManyullynCrystal", 1, 0), - new ItemStack(EMTItems.itemEMTItems, 0, 18) }, - Materials.Infinity.getMolten(1440), - GT_ModHandler.getModItem("DraconicEvolution", "awakenedCore", 1, 0), - GT_Values.NF, - 1600, - 8000000, - 3); - } - - addFusionCraftingRecipeNonOptimized( - new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.DraconiumAwakened, 16), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.BlackPlutonium, 4), - GT_ModHandler.getModItem("DraconicEvolution", "awakenedCore", 4, 0), - GT_ModHandler.getModItem("DraconicEvolution", "chaosFragment", 2, 2), - new ItemStack(EMTItems.itemEMTItems, 0, 19) }, - MaterialsUEVplus.SpaceTime.getMolten(1440), - GT_ModHandler.getModItem("DraconicEvolution", "chaoticCore", 1, 0), - GT_Values.NF, - 3200, - 24000000, - 4); - - // ENERGY CORES - - addFusionCraftingRecipe( - new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Draconium, 8), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.StellarAlloy, 4), - GT_ModHandler.getModItem("AdvancedSolarPanel", "asp_crafting_items", 4, 1), - GT_ModHandler.getModItem("DraconicEvolution", "draconicCore", 1, 0), - new ItemStack(EMTItems.itemEMTItems, 0, 17) }, - GT_ModHandler.getModItem("DraconicEvolution", "draconiumEnergyCore", 1, 0), - 1000, - 500000, - 2); - - addFusionCraftingRecipe( - new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.DraconiumAwakened, 8), - GT_ModHandler.getModItem("DraconicEvolution", "draconiumEnergyCore", 4, 0), - GT_ModHandler.getModItem("AdvancedSolarPanel", "asp_crafting_items", 4, 4), - GT_ModHandler.getModItem("DraconicEvolution", "wyvernCore", 1, 0), - new ItemStack(EMTItems.itemEMTItems, 0, 18) }, - GT_ModHandler.getModItem("DraconicEvolution", "draconiumEnergyCore", 1, 1), - 2000, - 2000000, - 3); - - // Dragon Blood - if (Loader.isModLoaded("miscutils")) { - - addFusionCraftingRecipeNonOptimized( - new ItemStack[] { new ItemStack(Blocks.dragon_egg, 0), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.DraconiumAwakened, 64) }, - Materials.Radon.getPlasma(144), - null, - new FluidStack(FluidRegistry.getFluid("molten.dragonblood"), 288), - 4200, - 1966080, - 3); - - addFusionCraftingRecipeNonOptimized( - new ItemStack[] { GT_ModHandler.getModItem("witchery", "infinityegg", 0), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.DraconiumAwakened, 64) }, - Materials.Radon.getPlasma(72), - null, - new FluidStack(FluidRegistry.getFluid("molten.dragonblood"), 432), - 3600, - 1966080, - 3); - } - } -} diff --git a/src/main/java/emt/gthandler/common/tileentities/machines/multi/DE_Fusion_Crafter.java b/src/main/java/emt/gthandler/common/tileentities/machines/multi/DE_Fusion_Crafter.java deleted file mode 100644 index c1d35d1..0000000 --- a/src/main/java/emt/gthandler/common/tileentities/machines/multi/DE_Fusion_Crafter.java +++ /dev/null @@ -1,217 +0,0 @@ -package emt.gthandler.common.tileentities.machines.multi; - -import static com.gtnewhorizon.structurelib.structure.StructureUtility.*; -import static gregtech.api.enums.GT_Values.V; -import static gregtech.api.enums.Textures.BlockIcons.*; -import static gregtech.api.util.GT_StructureUtility.ofHatchAdder; - -import java.util.Arrays; -import java.util.List; - -import net.minecraft.block.Block; -import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumChatFormatting; -import net.minecraftforge.common.util.ForgeDirection; -import net.minecraftforge.fluids.FluidStack; - -import org.apache.commons.lang3.tuple.Pair; - -import com.gtnewhorizon.structurelib.structure.IStructureDefinition; -import com.gtnewhorizon.structurelib.structure.StructureDefinition; - -import emt.EMT; -import emt.gthandler.common.items.EMT_CasingBlock; -import emt.gthandler.common.loader.EMT_RecipeAdder; -import gregtech.api.GregTech_API; -import gregtech.api.interfaces.ITexture; -import gregtech.api.interfaces.metatileentity.IMetaTileEntity; -import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_EnhancedMultiBlockBase; -import gregtech.api.render.TextureFactory; -import gregtech.api.util.GT_Multiblock_Tooltip_Builder; -import gregtech.api.util.GT_Recipe; -import gregtech.api.util.GT_Utility; - -public class DE_Fusion_Crafter extends GT_MetaTileEntity_EnhancedMultiBlockBase { - - private static final int CASING_INDEX = (1 << 7) + (15 + 48); - private int mTierCasing = 0; - private int mFusionTierCasing = 0; - private int mCasing = 0; - - public DE_Fusion_Crafter(int aID, String aName, String aNameRegional) { - super(aID, aName, aNameRegional); - } - - public DE_Fusion_Crafter(String aName) { - super(aName); - } - - @Override - public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new DE_Fusion_Crafter(mName); - } - - private static final String STRUCTURE_PIECE_MAIN = "main"; - private static final List> fusionCasingTiers = Arrays - .asList(Pair.of(GregTech_API.sBlockCasings4, 6), Pair.of(GregTech_API.sBlockCasings4, 8)); - private static final List> coreTiers = Arrays.asList( - Pair.of(EMT_CasingBlock.EMT_GT_BLOCKS[0], 8), - Pair.of(EMT_CasingBlock.EMT_GT_BLOCKS[0], 9), - Pair.of(EMT_CasingBlock.EMT_GT_BLOCKS[0], 10), - Pair.of(EMT_CasingBlock.EMT_GT_BLOCKS[0], 11), - Pair.of(EMT_CasingBlock.EMT_GT_BLOCKS[0], 12)); - private static final IStructureDefinition STRUCTURE_DEFINITION = StructureDefinition - .builder() - .addShape( - STRUCTURE_PIECE_MAIN, - transpose( - new String[][] { { "nnnnn", "nnnnn", "nnnnn", "nnnnn", "nnnnn" }, - { " ", " F ", " FfF ", " F ", " " }, - { " ", " F ", " FfF ", " F ", " " }, - { "RRRRR", "R F R", "RFfFR", "R F R", "RRRRR" }, - { " ", " F ", " FfF ", " F ", " " }, - { " ", " F ", " FfF ", " F ", " " }, - { "RRRRR", "R F R", "RFfFR", "R F R", "RRRRR" }, - { " ", " F ", " FfF ", " F ", " " }, - { " ", " F ", " FfF ", " F ", " " }, - { "NN~NN", "NNNNN", "NNNNN", "NNNNN", "NNNNN" } })) - .addElement( - 'N', - ofChain( - onElementPass(e -> e.mCasing++, ofBlock(EMT_CasingBlock.EMT_GT_BLOCKS[0], 7)), - ofHatchAdder(DE_Fusion_Crafter::addEnergyInputToMachineList, CASING_INDEX, 1), - ofHatchAdder(DE_Fusion_Crafter::addInputToMachineList, CASING_INDEX, 1), - ofHatchAdder(DE_Fusion_Crafter::addOutputToMachineList, CASING_INDEX, 1), - ofHatchAdder(DE_Fusion_Crafter::addMaintenanceToMachineList, CASING_INDEX, 1))) - .addElement('n', onElementPass(e -> e.mCasing++, ofBlock(EMT_CasingBlock.EMT_GT_BLOCKS[0], 7))) - .addElement('f', ofBlock(GregTech_API.sBlockCasings4, 7)) - .addElement('F', ofBlocksTiered((Block b, int m) -> { - if (b != GregTech_API.sBlockCasings4 || (m != 6 && m != 8)) return -2; - return m == 6 ? 1 : 2; - }, fusionCasingTiers, -1, (e, i) -> e.mFusionTierCasing = i, e -> e.mFusionTierCasing)) - .addElement('R', ofBlocksTiered((Block b, int m) -> { - if (b != EMT_CasingBlock.EMT_GT_BLOCKS[0] || m < 8 || m > 12) return -2; - return m - 7; - }, coreTiers, -1, (e, i) -> e.mTierCasing = i, e -> e.mTierCasing)).build(); - - @Override - public IStructureDefinition getStructureDefinition() { - return STRUCTURE_DEFINITION; - } - - public boolean checkMachine(IGregTechTileEntity aBaseMetaTileEntity, ItemStack aStack) { - mCasing = 0; - mTierCasing = -1; - mFusionTierCasing = -1; - if (!checkPiece(STRUCTURE_PIECE_MAIN, 2, 9, 0)) return false; - if (mCasing < 19) return false; - if (mTierCasing == -2 || mFusionTierCasing == -2) return false; - if (mTierCasing > 3 && mFusionTierCasing < 2) return false; - return mMaintenanceHatches.size() == 1; - } - - @Override - protected GT_Multiblock_Tooltip_Builder createTooltip() { - GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); - tt.addMachineType("Fusion Crafter").addInfo("Controller Block for the Draconic Evolution Fusion Crafter") - .addInfo("Machine can be overclocked by using casings above the recipe tier:") - .addInfo("Recipe time is divided by number of tiers above the recipe") - .addInfo("Normal EU OC still applies !") - .addInfo( - "To see the structure, use a " + EnumChatFormatting.BLUE - + "Tec" - + EnumChatFormatting.DARK_BLUE - + "Tech" - + EnumChatFormatting.GRAY - + " structure hologram on the Controller!") - .addSeparator().beginStructureBlock(5, 10, 5, false).addController("Front bottom center") - .addCasingInfo("Naquadah Alloy Fusion Casing", 19) - .addOtherStructurePart("Fusion Coil Block", "Center pillar") - .addOtherStructurePart("Fusion Machine Casing", "Touching Fusion Coil Block at every side") - .addOtherStructurePart("Tiered Fusion Casing", "Rings (5x5 hollow) at layer 4 and 7") - .addStructureInfo("Bloody Ichorium for tier 1, Draconium for tier 2, etc") - .addStructureInfo("To use tier 3 + you have to use fusion casing MK II") - .addInputBus("Any bottom casing", 1).addInputHatch("Any bottom casing", 1) - .addOutputBus("Any bottom casing", 1).addOutputHatch("Any bottom casing", 1) - .addEnergyHatch("Any bottom casing", 1).addMaintenanceHatch("Any bottom casing", 1) - .toolTipFinisher(EMT.NAME); - return tt; - } - - public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, ForgeDirection side, ForgeDirection facing, - int colorIndex, boolean aActive, boolean aRedstone) { - if (side == facing) { - if (aActive) return new ITexture[] { TextureFactory.of(MACHINE_CASING_MAGIC), - TextureFactory.builder().addIcon(OVERLAY_TELEPORTER_ACTIVE).extFacing().build(), - TextureFactory.builder().addIcon(OVERLAY_TELEPORTER_ACTIVE_GLOW).extFacing().glow().build() }; - return new ITexture[] { TextureFactory.of(MACHINE_CASING_MAGIC), - TextureFactory.builder().addIcon(OVERLAY_TELEPORTER).extFacing().build(), - TextureFactory.builder().addIcon(OVERLAY_TELEPORTER_GLOW).extFacing().glow().build() }; - } - if (aActive) return new ITexture[] { TextureFactory.of(MACHINE_CASING_MAGIC), - TextureFactory.builder().addIcon(MACHINE_CASING_MAGIC_ACTIVE).extFacing().build(), - TextureFactory.builder().addIcon(MACHINE_CASING_MAGIC_ACTIVE_GLOW).extFacing().glow().build() }; - return new ITexture[] { TextureFactory.of(MACHINE_CASING_MAGIC), - TextureFactory.builder().addIcon(MACHINE_CASING_MAGIC).extFacing().build(), - TextureFactory.builder().addIcon(MACHINE_CASING_MAGIC_GLOW).extFacing().glow().build() }; - } - - @Override - public boolean isCorrectMachinePart(ItemStack aStack) { - return true; - } - - @Override - public GT_Recipe.GT_Recipe_Map getRecipeMap() { - return EMT_RecipeAdder.sFusionCraftingRecipes; - } - - @Override - public boolean checkRecipe(ItemStack aStack) { - ItemStack[] tInputs = getCompactedInputs(); - FluidStack[] tFluids = getCompactedFluids(); - - if (tInputs.length > 0) { - long tVoltage = getMaxInputVoltage(); - byte tTier = (byte) Math.max(1, GT_Utility.getTier(tVoltage)); - GT_Recipe tRecipe = EMT_RecipeAdder.sFusionCraftingRecipes - .findRecipe(getBaseMetaTileEntity(), false, V[tTier], tFluids, tInputs); - if ((tRecipe != null) && (this.mTierCasing >= tRecipe.mSpecialValue) - && (tRecipe.isRecipeInputEqual(true, tFluids, tInputs))) { - calculateOverclockedNessMulti(tRecipe.mEUt, tRecipe.mDuration, 2, tVoltage); - if (this.mEUt > 0) this.mEUt = (-this.mEUt); - this.mEfficiency = (10000 - (getIdealStatus() - getRepairStatus()) * 1000); - this.mEfficiencyIncrease = 10000; - this.mMaxProgresstime /= ((mTierCasing - tRecipe.mSpecialValue) + 1); - this.mMaxProgresstime = Math.max(1, this.mMaxProgresstime); - this.mOutputItems = new ItemStack[] { tRecipe.getOutput(0), tRecipe.getOutput(1) }; - this.mOutputFluids = new FluidStack[] { tRecipe.getFluidOutput(0) }; - updateSlots(); - return true; - } - } - return false; - } - - public int getMaxEfficiency(ItemStack aStack) { - return 10000; - } - - public int getPollutionPerTick(ItemStack aStack) { - return 0; - } - - public int getDamageToComponent(ItemStack aStack) { - return 0; - } - - public boolean explodesOnComponentBreak(ItemStack aStack) { - return false; - } - - @Override - public void construct(ItemStack itemStack, boolean b) { - buildPiece(STRUCTURE_PIECE_MAIN, itemStack, b, 2, 9, 0); - } -} diff --git a/src/main/java/emt/item/ItemMaterials.java b/src/main/java/emt/item/ItemMaterials.java index bbe1825..f17aada 100644 --- a/src/main/java/emt/item/ItemMaterials.java +++ b/src/main/java/emt/item/ItemMaterials.java @@ -17,7 +17,6 @@ import net.minecraft.util.IIcon; import net.minecraft.util.MathHelper; import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.MovingObjectPosition.MovingObjectType; -import net.minecraft.util.StatCollector; import net.minecraft.util.Vec3; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; @@ -115,7 +114,10 @@ public class ItemMaterials extends Item { public void addInformation(ItemStack stack, EntityPlayer player, List result, boolean advanced) { switch (stack.getItemDamage()) { case 16: - result.add(EnumChatFormatting.GOLD + StatCollector.translateToLocal("tooltip.EMT.draconicSchematic")); + case 17: + case 18: + case 19: + result.add(EnumChatFormatting.RED + "[DEPRECATED] Please put in the crafting table to get back!"); break; } } diff --git a/src/main/java/emt/nei/NEI_Config.java b/src/main/java/emt/nei/NEI_Config.java index bafb086..e1845c6 100644 --- a/src/main/java/emt/nei/NEI_Config.java +++ b/src/main/java/emt/nei/NEI_Config.java @@ -1,19 +1,20 @@ package emt.nei; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.item.ItemStack; +import codechicken.nei.api.API; import codechicken.nei.api.IConfigureNEI; -import cpw.mods.fml.common.event.FMLInterModComms; import emt.EMT; +import emt.init.EMTItems; public class NEI_Config implements IConfigureNEI { - public static boolean isAdded = true; - @Override public void loadConfig() { - NEI_Config.isAdded = false; - NEI_Config.isAdded = true; + API.hideItem(new ItemStack(EMTItems.itemEMTItems, 1, 16)); + API.hideItem(new ItemStack(EMTItems.itemEMTItems, 1, 17)); + API.hideItem(new ItemStack(EMTItems.itemEMTItems, 1, 18)); + API.hideItem(new ItemStack(EMTItems.itemEMTItems, 1, 19)); } @Override @@ -25,35 +26,4 @@ public class NEI_Config implements IConfigureNEI { public String getVersion() { return EMT.VERSION; } - - public static void Init() { - sendHandler("emt.recipe.fusioncrafting", "gregtech:gt.blockmachines:5001"); - sendCatalyst("emt.recipe.fusioncrafting", "gregtech:gt.blockmachines:5001"); - } - - private static void sendHandler(String name, String block) { - NBTTagCompound aNBT = new NBTTagCompound(); - aNBT.setString("handler", name); - aNBT.setString("modName", EMT.NAME); - aNBT.setString("modId", EMT.MOD_ID); - aNBT.setBoolean("modRequired", true); - aNBT.setString("itemName", block); - aNBT.setInteger("handlerHeight", 135); - aNBT.setInteger("handlerWidth", 166); - aNBT.setInteger("maxRecipesPerPage", 2); - aNBT.setInteger("yShift", 6); - FMLInterModComms.sendMessage("NotEnoughItems", "registerHandlerInfo", aNBT); - } - - private static void sendCatalyst(String name, String stack, int priority) { - NBTTagCompound aNBT = new NBTTagCompound(); - aNBT.setString("handlerID", name); - aNBT.setString("itemName", stack); - aNBT.setInteger("priority", priority); - FMLInterModComms.sendMessage("NotEnoughItems", "registerCatalystInfo", aNBT); - } - - private static void sendCatalyst(String name, String stack) { - sendCatalyst(name, stack, 0); - } } diff --git a/src/main/resources/assets/emt/lang/de_DE.lang b/src/main/resources/assets/emt/lang/de_DE.lang index 51f71a9..117f8e0 100644 --- a/src/main/resources/assets/emt/lang/de_DE.lang +++ b/src/main/resources/assets/emt/lang/de_DE.lang @@ -41,7 +41,6 @@ tooltip.EMT.output.double.nether=wenn es im Nether steht tooltip.EMT.output.double.lava=wenn mit Ignis Centivis befüllt tooltip.EMT.output.double.half.height=höhere Leistung in Höhen (x1 bei y=5, x3 bei y=220) tooltip.EMT.output.double.half.low=höhere Leistung in Tiefen (x1 bei y=220, x3 bei y=5) -tooltip.EMT.draconicSchematic=Diesen Bauplan kann man in Pluto Dungeons finden #=============Entity Names============= entity.EMT.laser.name=Laser @@ -136,14 +135,6 @@ tile.EMT.solar2.earth.name=Erde Infundierte Verdichte Solarzelle tile.EMT.solar2.doubleearth.name=Erde Infundierte Doppelt Verdichte Solarzelle tile.EMT.solar2.tripleearth.name=Erde Infundierte Dreifach Verdichte Solarzelle -#===============Gregtech Compat=============== -EMT_GTBLOCK_CASEING.0.name=Magie Zurückhaltender Strahlenschutz -EMT_GTBLOCK_CASEING.1.name=Essenz Diffusions Zelle -EMT_GTBLOCK_CASEING.2.name=Iridium Osmiridium Bewehrungskorb -EMT_GTBLOCK_CASEING.3.name=Indium Tungsten Bewehrungskorb -EMT_GTBLOCK_CASEING.4.name=Halb-Fertiger Magie Zurückhaltender Strahlenschutz -EMT_GTBLOCK_CASEING.5.name=Halb-Fertige Essenz Diffusions Zelle - #=============Thaumonomicon Texts============= emt.rsname.Electric Magic Tools=Electric Magic Tools diff --git a/src/main/resources/assets/emt/lang/en_US.lang b/src/main/resources/assets/emt/lang/en_US.lang index 78e5bae..3211c68 100644 --- a/src/main/resources/assets/emt/lang/en_US.lang +++ b/src/main/resources/assets/emt/lang/en_US.lang @@ -44,7 +44,6 @@ tooltip.EMT.output.double.nether=when located in the Nether tooltip.EMT.output.double.lava=when fed with Ignis Centivis tooltip.EMT.output.double.half.height=Higher output at heights (x1 at y = 5, x3 at y=220) tooltip.EMT.output.double.half.low=Higher output at depths (x1 at y = 220, x3 at y=5) -tooltip.EMT.draconicSchematic=This Schematic can be found in Pluto Dungeons #=============Entity Names============= entity.EMT.laser.name=Laser @@ -69,10 +68,10 @@ item.EMT.denseIronSheet.name=Dense Iron Sheet item.EMT.taintedFeather.name=Tainted Feather item.EMT.thaumiumWing.name=Thaumium Reinforced Wing item.EMT.uumatterDrop.name=Crystallized UU-Matter Drop -item.EMT.draconicSchematic.name=Draconic Core Schematic -item.EMT.wyvernSchematic.name=Wyvern Core Schematic -item.EMT.awakenedSchematic.name=Awakened Core Schematic -item.EMT.chaoticSchematic.name=Chaotic Core Schematic +item.EMT.draconicSchematic.name=[DEPRECATED] Draconic Core Schematic +item.EMT.wyvernSchematic.name=[DEPRECATED] Wyvern Core Schematic +item.EMT.awakenedSchematic.name=[DEPRECATED] Awakened Core Schematic +item.EMT.chaoticSchematic.name=[DEPRECATED] Chaotic Core Schematic item.EMT.bauble.euMaker.armor.name=Armor Charging Ring item.EMT.bauble.euMaker.inventory.name=Inventory Charging Ring item.EMT.bauble.oneRing.name=The One Ring @@ -180,20 +179,6 @@ tile.EMT.Sextuple_Compressed_Terra_Solar.name=Sextuple Compressed Terra Solar tile.EMT.Septuple_Compressed_Terra_Solar.name=Septuple Compressed Terra Solar tile.EMT.Octuple_Compressed_Terra_Solar.name=Octuple Compressed Terra Solar -#===============Gregtech Compat=============== -EMT_GTBLOCK_CASEING.0.name=Magic Containing Casing - Marked for deprecation -EMT_GTBLOCK_CASEING.1.name=Essentia Diffusion Cell - Marked for deprecation -EMT_GTBLOCK_CASEING.2.name=Iridium Ruridit Framebox -EMT_GTBLOCK_CASEING.3.name=Indium Tungsten Framebox -EMT_GTBLOCK_CASEING.4.name=Raw Magic Containing Casing -EMT_GTBLOCK_CASEING.5.name=Raw Essentia Diffusion Cell - Marked for deprecation -EMT_GTBLOCK_CASEING.7.name=Naquadah Alloy Fusion Casing -EMT_GTBLOCK_CASEING.8.name=Bloody Ichorium Fusion Casing -EMT_GTBLOCK_CASEING.9.name=Draconium Fusion Casing -EMT_GTBLOCK_CASEING.10.name=Wyvern Fusion Casing -EMT_GTBLOCK_CASEING.11.name=Awakened Draconium Fusion Casing -EMT_GTBLOCK_CASEING.12.name=Chaotic Fusion Casing - #=============Thaumonomicon Texts============= emt.rsname.Electric Magic Tools=Electric Magic Tools emt.tag.Electric Magic Tools=Who says magic and technology can't go together? diff --git a/src/main/resources/assets/emt/lang/ru_RU.lang b/src/main/resources/assets/emt/lang/ru_RU.lang index 82ded27..a649d55 100644 --- a/src/main/resources/assets/emt/lang/ru_RU.lang +++ b/src/main/resources/assets/emt/lang/ru_RU.lang @@ -137,14 +137,6 @@ tile.EMT.solar2.earth.name=Наполненная землёй, сжатая с tile.EMT.solar2.doubleearth.name=Наполненная землёй, дважды сжатая солнечная панель tile.EMT.solar2.tripleearth.name=Наполненная землёй, трижды сжатая солнечная панель -#===============Gregtech Compat=============== -EMT_GTBLOCK_CASEING.0.name=Магический Корпус -EMT_GTBLOCK_CASEING.1.name=Эфирная Диффузионная Ячейка -EMT_GTBLOCK_CASEING.2.name=Иридиево-Осмиридиевый Framebox -EMT_GTBLOCK_CASEING.3.name=Иридиево-Вольфрамовый Framebox -EMT_GTBLOCK_CASEING.4.name=Необработанный Магический Корпус -EMT_GTBLOCK_CASEING.5.name=Необработанная Эфирная Диффузионная Ячейка - #=============Thaumonomicon============= emt.rsname.Electric Magic Tools=Electric Magic Tools emt.tag.Electric Magic Tools=Кто сказал что магия и технология не дружат вместе? diff --git a/src/main/resources/assets/emt/lang/zh_CN.lang b/src/main/resources/assets/emt/lang/zh_CN.lang index 80df2b3..70daba6 100644 --- a/src/main/resources/assets/emt/lang/zh_CN.lang +++ b/src/main/resources/assets/emt/lang/zh_CN.lang @@ -43,7 +43,6 @@ tooltip.EMT.output.double.nether=处于下界时发电量 tooltip.EMT.output.double.lava=每秒供给0.01vis火之要素时发电量 tooltip.EMT.output.double.half.height=位置越高发电量越高(y=5时1倍,y=220时3倍) tooltip.EMT.output.double.half.low=位置越低发电量越高(y=220时1倍,y=5时3倍) -tooltip.EMT.draconicSchematic=可在冥王星地牢找到相关图纸 #=============Entity Names============= entity.EMT.laser.name=镭射器 @@ -68,10 +67,6 @@ item.EMT.denseIronSheet.name=致密铁片 item.EMT.taintedFeather.name=腐化羽毛 item.EMT.thaumiumWing.name=神秘增强羽翼 item.EMT.uumatterDrop.name=结晶UU物质液滴 -item.EMT.draconicSchematic.name=龙芯图纸 -item.EMT.wyvernSchematic.name=双足飞龙核心图纸 -item.EMT.awakenedSchematic.name=觉醒核心图纸 -item.EMT.chaoticSchematic.name=混沌核心图纸 item.EMT.bauble.euMaker.armor.name=装备充电指环 item.EMT.bauble.euMaker.inventory.name=物品充能指环 item.EMT.bauble.oneRing.name=魔戒 @@ -178,20 +173,6 @@ tile.EMT.Sextuple_Compressed_Terra_Solar.name=地注魔太阳能(6级) tile.EMT.Septuple_Compressed_Terra_Solar.name=地注魔太阳能(7级) tile.EMT.Octuple_Compressed_Terra_Solar.name=地注魔太阳能(8级) -#===============Gregtech Compat=============== -EMT_GTBLOCK_CASEING.0.name=魔法机械方块 -EMT_GTBLOCK_CASEING.1.name=源质扩散单元 -EMT_GTBLOCK_CASEING.2.name=铱锇魔法框架 -EMT_GTBLOCK_CASEING.3.name=铟钨魔法框架 -EMT_GTBLOCK_CASEING.4.name=源质扩散单元半成品 -EMT_GTBLOCK_CASEING.5.name=魔法机械方块半成品 -EMT_GTBLOCK_CASEING.7.name=硅岩合金聚合机械方块 -EMT_GTBLOCK_CASEING.8.name=血腥灵宝聚合机械方块 -EMT_GTBLOCK_CASEING.9.name=龙锭聚合机械方块 -EMT_GTBLOCK_CASEING.10.name=双足飞龙聚合机械方块 -EMT_GTBLOCK_CASEING.11.name=觉醒龙聚合机械方块 -EMT_GTBLOCK_CASEING.12.name=混沌聚合机械方块 - #=============Thaumonomicon Texts============= emt.rsname.Electric Magic Tools=电力魔法工具 emt.tag.Electric Magic Tools=谁说科技和魔法不能互相结合? @@ -428,4 +409,4 @@ emt.text.Infused Quantum Armor=你已经无事可做,但是你决定做一些有 emt.rsname.ResearchCompleter=自动化研究 emt.tag.ResearchCompleter=再也不用担心秩序危机了 -emt.text.ResearchCompleter=连连看一开始很有趣,但你已经决定寻找一种更好的方法解决所有的研究.最终,你结合科技与魔法,制造出了一台多方块机器,可以自动完成研究笔记.

需要将灵气节点放在机器内部才能使其正常运行,而且在运行过程中,机器会缓慢摧毁这些节点.节点稳定器不是必须品,但为了让这么多节点不互相打架,我们还是推荐使用节点稳定器. \ No newline at end of file +emt.text.ResearchCompleter=连连看一开始很有趣,但你已经决定寻找一种更好的方法解决所有的研究.最终,你结合科技与魔法,制造出了一台多方块机器,可以自动完成研究笔记.

需要将灵气节点放在机器内部才能使其正常运行,而且在运行过程中,机器会缓慢摧毁这些节点.节点稳定器不是必须品,但为了让这么多节点不互相打架,我们还是推荐使用节点稳定器.