diff --git a/CHANGELOG.md b/CHANGELOG.md index 8e2c13cd..386b25cf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ +# v2.4.2 +- Delete unused steam machines. + +* * * + # v2.4.1 -- A recipe for processing FluixAlloy Molten in AlloyBlastFurnace into Ingot using Mold has been added +- A recipe for processing FluixAlloy Molten in AlloyBlastFurnace into Ingot using Mold has been added. * * * diff --git a/src/main/java/gtexpert/api/recipes/GTERecipeMaps.java b/src/main/java/gtexpert/api/recipes/GTERecipeMaps.java index 2f256a52..7046a620 100644 --- a/src/main/java/gtexpert/api/recipes/GTERecipeMaps.java +++ b/src/main/java/gtexpert/api/recipes/GTERecipeMaps.java @@ -37,26 +37,4 @@ public class GTERecipeMaps { .setSlotOverlay(true, true, GuiTextures.CENTRIFUGE_OVERLAY) .setProgressBar(GuiTextures.PROGRESS_BAR_GAS_COLLECTOR, ProgressWidget.MoveType.HORIZONTAL) .setSound(GTSoundEvents.COOLING); - - @ZenProperty - public static final RecipeMap STEAM_MIXER_RECIPES = new RecipeMap<>( - "steam_mixer", 6, 2, 0, 0, new SimpleRecipeBuilder(), false) - .setSlotOverlay(false, false, GuiTextures.DUST_OVERLAY) - .setSlotOverlay(true, false, GuiTextures.DUST_OVERLAY) - .setProgressBar(GuiTextures.PROGRESS_BAR_MIXER, ProgressWidget.MoveType.CIRCULAR) - .setSound(GTSoundEvents.MIXER); - - @ZenProperty - public static final RecipeMap STEAM_ASSEMBLER_RECIPES = new RecipeMap<>( - "steam_assembler", 9, 2, 0, 0, new SimpleRecipeBuilder(), false) - .setSlotOverlay(false, false, GuiTextures.CIRCUIT_OVERLAY) - .setProgressBar(GuiTextures.PROGRESS_BAR_CIRCUIT, ProgressWidget.MoveType.HORIZONTAL) - .setSound(GTSoundEvents.ASSEMBLER); - - @ZenProperty - public static final RecipeMap STEAM_CIRCUIT_ASSEMBLER_RECIPES = new RecipeMap<>( - "steam_circuit_assembler", 6, 2, 0, 0, new SimpleRecipeBuilder(), false) - .setSlotOverlay(false, false, GuiTextures.CIRCUIT_OVERLAY) - .setProgressBar(GuiTextures.PROGRESS_BAR_CIRCUIT_ASSEMBLER, ProgressWidget.MoveType.HORIZONTAL) - .setSound(GTSoundEvents.ASSEMBLER); } diff --git a/src/main/java/gtexpert/common/GTEConfigHolder.java b/src/main/java/gtexpert/common/GTEConfigHolder.java index 285baf7a..d16e4f6a 100644 --- a/src/main/java/gtexpert/common/GTEConfigHolder.java +++ b/src/main/java/gtexpert/common/GTEConfigHolder.java @@ -38,17 +38,6 @@ public static class ModpackFlag { "Default: easy" }) public String componentsRecipeType = "easy"; - @Config.Comment({ - "Enable the new steam machines.", - "Steam Mixer, Steam Assembler, Steam Circuit Assembler", - "Default: false" }) - public boolean steamNewMachine = false; - - @Config.Comment({ - "Recipe Type. Options: none (no generated recipes), easy (2x2 crafting(WIP)), normal (3x3 crafting).", - "The steamNewMachine must also be enabled.", "Default: normal" }) - public String steamRecipeType = "normal"; - @Config.Comment({ "1. When enabled, the following recipes will be changed to Peaceful difficulty: ", "Nether Star Dust, Skeleton Skull, Wither Skeleton Skull, Zombie Head, Creeper Head, Enderman Head", diff --git a/src/main/java/gtexpert/common/metatileentities/GTEMetaTileEntities.java b/src/main/java/gtexpert/common/metatileentities/GTEMetaTileEntities.java index 2976c864..b8ad3416 100644 --- a/src/main/java/gtexpert/common/metatileentities/GTEMetaTileEntities.java +++ b/src/main/java/gtexpert/common/metatileentities/GTEMetaTileEntities.java @@ -13,19 +13,10 @@ import gtexpert.common.GTEConfigHolder; import gtexpert.common.metatileentities.multi.*; -import gtexpert.common.metatileentities.single.SteamAssembler; -import gtexpert.common.metatileentities.single.SteamCircuitAssembler; -import gtexpert.common.metatileentities.single.SteamMixer; public class GTEMetaTileEntities { // Single Machine - public static SteamMixer STEAM_MIXER_BRONZE; - public static SteamMixer STEAM_MIXER_STEEL; - public static SteamAssembler STEAM_ASSEMBLER_BRONZE; - public static SteamAssembler STEAM_ASSEMBLER_STEEL; - public static SteamCircuitAssembler STEAM_CIRCUIT_ASSEMBLER_BRONZE; - public static SteamCircuitAssembler STEAM_CIRCUIT_ASSEMBLER_STEEL; // Multi Machine public static MetaTileEntityLargeCrackingUnit LARGE_CRACKER; @@ -35,21 +26,7 @@ public class GTEMetaTileEntities { public static void init() { // Single Machine - // Steam machine 11004~11009 - if (GTEConfigHolder.gteFlag.steamNewMachine) { - STEAM_MIXER_BRONZE = registerMetaTileEntity(11004, - new SteamMixer(gteId("steam_mixer_bronze"), false)); - STEAM_MIXER_STEEL = registerMetaTileEntity(11005, - new SteamMixer(gteId("steam_mixer_steel"), true)); - STEAM_ASSEMBLER_BRONZE = registerMetaTileEntity(11006, - new SteamAssembler(gteId("steam_assembler_bronze"), false)); - STEAM_ASSEMBLER_STEEL = registerMetaTileEntity(11007, - new SteamAssembler(gteId("steam_assembler_steel"), true)); - STEAM_CIRCUIT_ASSEMBLER_BRONZE = registerMetaTileEntity(11008, - new SteamCircuitAssembler(gteId("steam_circuit_assembler_bronze"), false)); - STEAM_CIRCUIT_ASSEMBLER_STEEL = registerMetaTileEntity(11009, - new SteamCircuitAssembler(gteId("steam_circuit_assembler_steel"), true)); - } + // Free: 11004~11999 // Multi Machine // Free: 12000~12001 diff --git a/src/main/java/gtexpert/common/metatileentities/single/SteamAssembler.java b/src/main/java/gtexpert/common/metatileentities/single/SteamAssembler.java deleted file mode 100644 index 200d5852..00000000 --- a/src/main/java/gtexpert/common/metatileentities/single/SteamAssembler.java +++ /dev/null @@ -1,82 +0,0 @@ -package gtexpert.common.metatileentities.single; - -import java.util.List; - -import net.minecraft.client.resources.I18n; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; -import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; -import net.minecraftforge.items.IItemHandlerModifiable; - -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; - -import gregtech.api.capability.impl.NotifiableItemStackHandler; -import gregtech.api.gui.GuiTextures; -import gregtech.api.gui.ModularUI; -import gregtech.api.gui.widgets.ProgressWidget; -import gregtech.api.metatileentity.MetaTileEntity; -import gregtech.api.metatileentity.SteamMetaTileEntity; -import gregtech.api.metatileentity.interfaces.IGregTechTileEntity; -import gregtech.client.renderer.texture.Textures; - -import gtexpert.api.gui.GTEGuiTextures; -import gtexpert.api.recipes.GTERecipeMaps; - -public class SteamAssembler extends SteamMetaTileEntity { - - public SteamAssembler(ResourceLocation metaTileEntityId, boolean isHighPressure) { - super(metaTileEntityId, GTERecipeMaps.STEAM_ASSEMBLER_RECIPES, Textures.ASSEMBLER_OVERLAY, isHighPressure); - } - - @Override - public MetaTileEntity createMetaTileEntity(IGregTechTileEntity tileEntity) { - return new SteamAssembler(metaTileEntityId, isHighPressure); - } - - @Override - protected IItemHandlerModifiable createImportItemHandler() { - return new NotifiableItemStackHandler(this, 9, this, false); - } - - @Override - protected IItemHandlerModifiable createExportItemHandler() { - return new NotifiableItemStackHandler(this, 2, this, true); - } - - @Override - public ModularUI createUI(EntityPlayer player) { - return createUITemplate(player) - .slot(this.importItems, 0, 16, 17, GuiTextures.SLOT_STEAM.get(isHighPressure)) - .slot(this.importItems, 1, 34, 17, GuiTextures.SLOT_STEAM.get(isHighPressure)) - .slot(this.importItems, 2, 52, 17, GuiTextures.SLOT_STEAM.get(isHighPressure)) - .slot(this.importItems, 3, 16, 35, GuiTextures.SLOT_STEAM.get(isHighPressure)) - .slot(this.importItems, 4, 34, 35, GuiTextures.SLOT_STEAM.get(isHighPressure)) - .slot(this.importItems, 5, 52, 35, GuiTextures.SLOT_STEAM.get(isHighPressure)) - .slot(this.importItems, 6, 16, 53, GuiTextures.SLOT_STEAM.get(isHighPressure)) - .slot(this.importItems, 7, 34, 53, GuiTextures.SLOT_STEAM.get(isHighPressure)) - .slot(this.importItems, 8, 52, 53, GuiTextures.SLOT_STEAM.get(isHighPressure)) - .progressBar(workableHandler::getProgressPercent, 79, 34, 20, 20, - GTEGuiTextures.PROGRESS_BAR_STEAM_ASSEMBLER_STEAM.get(isHighPressure), - ProgressWidget.MoveType.HORIZONTAL, - workableHandler.getRecipeMap()) - .slot(this.exportItems, 0, 106, 35, true, false, GuiTextures.SLOT_STEAM.get(isHighPressure)) - .slot(this.exportItems, 1, 124, 35, true, false, GuiTextures.SLOT_STEAM.get(isHighPressure)) - .build(getHolder(), player); - } - - @Override - public void addInformation(ItemStack stack, @Nullable World player, @NotNull List tooltip, - boolean advanced) { - super.addInformation(stack, player, tooltip, advanced); - tooltip.add(I18n.format("gtexpert.machine.steam_assembler.tooltip")); - tooltip.add(I18n.format("gtexpert.machine.steam_assembler.tooltip.1")); - } - - @SideOnly(Side.CLIENT) - @Override - public void randomDisplayTick() {} -} diff --git a/src/main/java/gtexpert/common/metatileentities/single/SteamCircuitAssembler.java b/src/main/java/gtexpert/common/metatileentities/single/SteamCircuitAssembler.java deleted file mode 100644 index c2f17c90..00000000 --- a/src/main/java/gtexpert/common/metatileentities/single/SteamCircuitAssembler.java +++ /dev/null @@ -1,80 +0,0 @@ -package gtexpert.common.metatileentities.single; - -import java.util.List; - -import net.minecraft.client.resources.I18n; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; -import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; -import net.minecraftforge.items.IItemHandlerModifiable; - -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; - -import gregtech.api.capability.impl.NotifiableItemStackHandler; -import gregtech.api.gui.GuiTextures; -import gregtech.api.gui.ModularUI; -import gregtech.api.gui.widgets.ProgressWidget; -import gregtech.api.metatileentity.MetaTileEntity; -import gregtech.api.metatileentity.SteamMetaTileEntity; -import gregtech.api.metatileentity.interfaces.IGregTechTileEntity; -import gregtech.client.renderer.texture.Textures; - -import gtexpert.api.gui.GTEGuiTextures; -import gtexpert.api.recipes.GTERecipeMaps; - -public class SteamCircuitAssembler extends SteamMetaTileEntity { - - public SteamCircuitAssembler(ResourceLocation metaTileEntityId, boolean isHighPressure) { - super(metaTileEntityId, GTERecipeMaps.STEAM_CIRCUIT_ASSEMBLER_RECIPES, Textures.ASSEMBLER_OVERLAY, - isHighPressure); - } - - @Override - public MetaTileEntity createMetaTileEntity(IGregTechTileEntity tileEntity) { - return new SteamCircuitAssembler(metaTileEntityId, isHighPressure); - } - - @Override - protected IItemHandlerModifiable createImportItemHandler() { - return new NotifiableItemStackHandler(this, 6, this, false); - } - - @Override - protected IItemHandlerModifiable createExportItemHandler() { - return new NotifiableItemStackHandler(this, 2, this, true); - } - - @Override - public ModularUI createUI(EntityPlayer player) { - return createUITemplate(player) - .slot(this.importItems, 0, 16, 17, GuiTextures.SLOT_STEAM.get(isHighPressure)) - .slot(this.importItems, 1, 34, 17, GuiTextures.SLOT_STEAM.get(isHighPressure)) - .slot(this.importItems, 2, 52, 17, GuiTextures.SLOT_STEAM.get(isHighPressure)) - .slot(this.importItems, 3, 16, 35, GuiTextures.SLOT_STEAM.get(isHighPressure)) - .slot(this.importItems, 4, 34, 35, GuiTextures.SLOT_STEAM.get(isHighPressure)) - .slot(this.importItems, 5, 52, 35, GuiTextures.SLOT_STEAM.get(isHighPressure)) - .progressBar(workableHandler::getProgressPercent, 77, 34, 20, 20, - GTEGuiTextures.PROGRESS_BAR_STEAM_CIRCUIT_ASSEMBLER_STEAM.get(isHighPressure), - ProgressWidget.MoveType.HORIZONTAL, - workableHandler.getRecipeMap()) - .slot(this.exportItems, 0, 106, 35, true, false, GuiTextures.SLOT_STEAM.get(isHighPressure)) - .slot(this.exportItems, 1, 124, 35, true, false, GuiTextures.SLOT_STEAM.get(isHighPressure)) - .build(getHolder(), player); - } - - @Override - public void addInformation(ItemStack stack, @Nullable World player, @NotNull List tooltip, - boolean advanced) { - super.addInformation(stack, player, tooltip, advanced); - tooltip.add(I18n.format("gtexpert.machine.steam_circuit_assembler.tooltip")); - tooltip.add(I18n.format("gtexpert.machine.steam_circuit_assembler.tooltip.1")); - } - - @SideOnly(Side.CLIENT) - @Override - public void randomDisplayTick() {} -} diff --git a/src/main/java/gtexpert/common/metatileentities/single/SteamMixer.java b/src/main/java/gtexpert/common/metatileentities/single/SteamMixer.java deleted file mode 100644 index b38959bf..00000000 --- a/src/main/java/gtexpert/common/metatileentities/single/SteamMixer.java +++ /dev/null @@ -1,79 +0,0 @@ -package gtexpert.common.metatileentities.single; - -import java.util.List; - -import net.minecraft.client.resources.I18n; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; -import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; -import net.minecraftforge.items.IItemHandlerModifiable; - -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; - -import gregtech.api.capability.impl.NotifiableItemStackHandler; -import gregtech.api.gui.GuiTextures; -import gregtech.api.gui.ModularUI; -import gregtech.api.gui.widgets.ProgressWidget; -import gregtech.api.metatileentity.MetaTileEntity; -import gregtech.api.metatileentity.SteamMetaTileEntity; -import gregtech.api.metatileentity.interfaces.IGregTechTileEntity; -import gregtech.client.renderer.texture.Textures; - -import gtexpert.api.gui.GTEGuiTextures; -import gtexpert.api.recipes.GTERecipeMaps; - -public class SteamMixer extends SteamMetaTileEntity { - - public SteamMixer(ResourceLocation metaTileEntityId, boolean isHighPressure) { - super(metaTileEntityId, GTERecipeMaps.STEAM_MIXER_RECIPES, Textures.MIXER_OVERLAY, isHighPressure); - } - - @Override - public MetaTileEntity createMetaTileEntity(IGregTechTileEntity tileEntity) { - return new SteamMixer(metaTileEntityId, isHighPressure); - } - - @Override - protected IItemHandlerModifiable createImportItemHandler() { - return new NotifiableItemStackHandler(this, 6, this, false); - } - - @Override - protected IItemHandlerModifiable createExportItemHandler() { - return new NotifiableItemStackHandler(this, 2, this, true); - } - - @Override - public ModularUI createUI(EntityPlayer player) { - return createUITemplate(player) - .slot(this.importItems, 0, 16, 17, GuiTextures.SLOT_STEAM.get(isHighPressure)) - .slot(this.importItems, 1, 34, 17, GuiTextures.SLOT_STEAM.get(isHighPressure)) - .slot(this.importItems, 2, 52, 17, GuiTextures.SLOT_STEAM.get(isHighPressure)) - .slot(this.importItems, 3, 16, 35, GuiTextures.SLOT_STEAM.get(isHighPressure)) - .slot(this.importItems, 4, 34, 35, GuiTextures.SLOT_STEAM.get(isHighPressure)) - .slot(this.importItems, 5, 52, 35, GuiTextures.SLOT_STEAM.get(isHighPressure)) - .progressBar(workableHandler::getProgressPercent, 77, 35, 20, 20, - GTEGuiTextures.PROGRESS_BAR_STEAM_MIXER_STEAM.get(isHighPressure), - ProgressWidget.MoveType.HORIZONTAL, - workableHandler.getRecipeMap()) - .slot(this.exportItems, 0, 106, 35, true, false, GuiTextures.SLOT_STEAM.get(isHighPressure)) - .slot(this.exportItems, 1, 124, 35, true, false, GuiTextures.SLOT_STEAM.get(isHighPressure)) - .build(getHolder(), player); - } - - @Override - public void addInformation(ItemStack stack, @Nullable World player, @NotNull List tooltip, - boolean advanced) { - super.addInformation(stack, player, tooltip, advanced); - tooltip.add(I18n.format("gtexpert.machine.steam_mixer.tooltip")); - tooltip.add(I18n.format("gtexpert.machine.steam_mixer.tooltip.1")); - } - - @SideOnly(Side.CLIENT) - @Override - public void randomDisplayTick() {} -} diff --git a/src/main/java/gtexpert/integration/ae/recipes/AEItemsRecipe.java b/src/main/java/gtexpert/integration/ae/recipes/AEItemsRecipe.java index 87391ca2..da602827 100644 --- a/src/main/java/gtexpert/integration/ae/recipes/AEItemsRecipe.java +++ b/src/main/java/gtexpert/integration/ae/recipes/AEItemsRecipe.java @@ -542,10 +542,10 @@ public static void init() { // Formation Core ModHandler.removeRecipeByName(Mods.AppliedEnergistics2.getResource("materials/formationcore")); ModHandler.addShapedRecipe(true, "formation_core", - Mods.AppliedEnergistics2.getItem("material", 2, 43), + Mods.AppliedEnergistics2.getItem("material", 1, 43), "SES", "LQL", "SES", 'S', OreDictUnifier.get(stick, tierMaterials[GTEValues.ae2VoltageTier - 1]), - 'Q', "gemMaterials.NetherQuartz", + 'Q', "gemNetherQuartz", 'E', Mods.AppliedEnergistics2.getItem("material", 1, 24), 'L', Mods.AppliedEnergistics2.getItem("material", 1, 22)); ModHandler.addShapedRecipe("formation_core_pure", @@ -568,7 +568,7 @@ public static void init() { // Annihilation Core ModHandler.removeRecipeByName(Mods.AppliedEnergistics2.getResource("materials/annihilationcore")); ModHandler.addShapedRecipe(true, "annihilation_core", - Mods.AppliedEnergistics2.getItem("material", 2, 44), + Mods.AppliedEnergistics2.getItem("material", 1, 44), "SES", "CQC", "SES", 'S', OreDictUnifier.get(stick, tierMaterials[GTEValues.ae2VoltageTier - 1]), 'Q', "gemCertusQuartz", diff --git a/src/main/java/gtexpert/loaders/recipe/GTERecipe.java b/src/main/java/gtexpert/loaders/recipe/GTERecipe.java index e09b5f49..7a1176dc 100644 --- a/src/main/java/gtexpert/loaders/recipe/GTERecipe.java +++ b/src/main/java/gtexpert/loaders/recipe/GTERecipe.java @@ -27,12 +27,10 @@ import gregtech.api.unification.material.Materials; import gregtech.api.unification.material.info.MaterialFlags; import gregtech.api.unification.material.properties.PropertyKey; -import gregtech.api.unification.ore.OrePrefix; import gregtech.api.unification.stack.UnificationEntry; import gregtech.common.ConfigHolder; import gregtech.common.blocks.BlockGlassCasing; import gregtech.common.blocks.BlockMachineCasing; -import gregtech.common.blocks.BlockSteamCasing; import gregtech.common.blocks.MetaBlocks; import gregtech.common.items.MetaItems; import gregtech.common.metatileentities.MetaTileEntities; @@ -764,68 +762,6 @@ private static void items() { } private static void blocks() { - if (GTEConfigHolder.gteFlag.steamNewMachine) { - switch (GTEConfigHolder.gteFlag.steamRecipeType) { - case "none": - return; - case "easy": - case "normal": - // Steam Mixer - ModHandler.addShapedRecipe(true, "steam_mixer_bronze", - GTEMetaTileEntities.STEAM_MIXER_BRONZE.getStackForm(), "GRG", "GEG", "CMC", - 'M', MetaBlocks.STEAM_CASING.getItemVariant(BlockSteamCasing.SteamCasingType.BRONZE_HULL), - 'E', GTEMetaItems.GTE_ELECTRIC_MOTOR, - 'R', new UnificationEntry(rotor, Materials.Bronze), - 'C', new UnificationEntry(circuit, MarkerMaterials.Tier.ULV), - 'G', Blocks.GLASS); - - // Steam Assembler - ModHandler.addShapedRecipe(true, "steam_assembler_bronze", - GTEMetaTileEntities.STEAM_ASSEMBLER_BRONZE.getStackForm(), "ACA", "VMV", "WCW", - 'M', MetaBlocks.STEAM_CASING.getItemVariant(BlockSteamCasing.SteamCasingType.BRONZE_HULL), - 'V', GTEMetaItems.GTE_CONVEYOR_MODULE, - 'A', GTEMetaItems.GTE_ROBOT_ARM, - 'C', new UnificationEntry(circuit, MarkerMaterials.Tier.ULV), - 'W', new UnificationEntry(cableGtSingle, Materials.Lead)); - - // Steam Circuit Assembler - ModHandler.addShapedRecipe(true, "steam_circuit_assembler_bronze", - GTEMetaTileEntities.STEAM_CIRCUIT_ASSEMBLER_BRONZE.getStackForm(), "RIE", "CHC", "WIW", - 'R', GTEMetaItems.GTE_ROBOT_ARM, - 'I', GTEUtility.oreDictionaryCircuit(GTValues.LV), - 'E', GTEMetaItems.GTE_EMITTER, - 'C', GTEMetaItems.GTE_CONVEYOR_MODULE, - 'H', MetaBlocks.STEAM_CASING.getItemVariant(BlockSteamCasing.SteamCasingType.BRONZE_HULL), - 'W', new UnificationEntry(cableGtSingle, Materials.Lead)); - - // High Pressure Steam Mixer - ModHandler.addShapedRecipe(true, "steam_compressor_steel", - GTEMetaTileEntities.STEAM_MIXER_STEEL.getStackForm(), "PSP", "WMW", "PPP", - 'M', GTEMetaTileEntities.STEAM_MIXER_BRONZE.getStackForm(), - 'S', new UnificationEntry(OrePrefix.plate, Materials.Steel), - 'W', new UnificationEntry(OrePrefix.plate, Materials.WroughtIron), - 'P', new UnificationEntry(OrePrefix.pipeSmallFluid, Materials.TinAlloy)); - - // High Pressure Steam Assembler - ModHandler.addShapedRecipe(true, "steam_assembler_steel", - GTEMetaTileEntities.STEAM_ASSEMBLER_STEEL.getStackForm(), "PSP", "WMW", "PPP", - 'M', GTEMetaTileEntities.STEAM_ASSEMBLER_BRONZE.getStackForm(), - 'S', new UnificationEntry(OrePrefix.plate, Materials.Steel), - 'W', new UnificationEntry(OrePrefix.plate, Materials.WroughtIron), - 'P', new UnificationEntry(OrePrefix.pipeSmallFluid, Materials.TinAlloy)); - - // High Pressure Steam Circuit Assembler - ModHandler.addShapedRecipe(true, "steam_circuit_assembler_steel", - GTEMetaTileEntities.STEAM_CIRCUIT_ASSEMBLER_STEEL.getStackForm(), "PSP", "WMW", "PPP", - 'M', GTEMetaTileEntities.STEAM_CIRCUIT_ASSEMBLER_BRONZE.getStackForm(), - 'S', new UnificationEntry(OrePrefix.plate, Materials.Steel), - 'W', new UnificationEntry(OrePrefix.plate, Materials.WroughtIron), - 'P', new UnificationEntry(OrePrefix.pipeSmallFluid, Materials.TinAlloy)); - default: - GTELog.logger.error("Invalid steamRecipeType setting: " + GTEConfigHolder.gteFlag.steamRecipeType); - } - } - // Large Oil Cracking Unit ModHandler.addShapedRecipe(true, "gtexpert.machine.large_oil_cracking_unit", GTEMetaTileEntities.LARGE_CRACKER.getStackForm(), "PCP", "FSF", "PCP", diff --git a/src/main/resources/assets/gtexpert/lang/en_us.lang b/src/main/resources/assets/gtexpert/lang/en_us.lang index 5c16a046..5104e185 100644 --- a/src/main/resources/assets/gtexpert/lang/en_us.lang +++ b/src/main/resources/assets/gtexpert/lang/en_us.lang @@ -37,20 +37,6 @@ gtexpert.machine.auto_chisel.mv.tooltip=Your ideal, we will sculpt it/nMaterial gtexpert.machine.auto_chisel.hv.name=Advanced Auto Chisel II gtexpert.machine.auto_chisel.hv.tooltip=Your ideal, we will sculpt it/nMaterial in the left, chiseling to the right. See JEI's Chiseling page for details./n§dAuthor:§f @tier940 -# Steam Machines -gtexpert.machine.steam_mixer_bronze.name=Steam Mixer -gtexpert.machine.steam_mixer_steel.name=High Pressure Steam Mixer -gtexpert.machine.steam_mixer.tooltip=§dAuthor:§f @tier940 -gtexpert.machine.steam_mixer.tooltip.1=Better than mixing by hand -gtexpert.machine.steam_assembler_bronze.name=Steam Assembling Machine -gtexpert.machine.steam_assembler_steel.name=High Pressure Steam Assembling Machine -gtexpert.machine.steam_assembler.tooltip=§dAuthor:§f @tier940 -gtexpert.machine.steam_assembler.tooltip.1=Better than assembling by hand -gtexpert.machine.steam_circuit_assembler_bronze.name=Steam Circuit Assembler -gtexpert.machine.steam_circuit_assembler_steel.name=High Pressure Steam Circuit Assembler -gtexpert.machine.steam_circuit_assembler.tooltip=§dAuthor:§f @tier940 -gtexpert.machine.steam_circuit_assembler.tooltip.1=Better than making circuits by hand - # Vial Extractor gtexpert.machine.vial_extractor.lv.name=Basic Vial Extractor gtexpert.machine.vial_extractor.lv.tooltip=Soul of a Lost Undead?/n§dAuthor:§f @tier940 diff --git a/src/main/resources/assets/gtexpert/lang/ja_jp.lang b/src/main/resources/assets/gtexpert/lang/ja_jp.lang index f0086ebf..cba15383 100644 --- a/src/main/resources/assets/gtexpert/lang/ja_jp.lang +++ b/src/main/resources/assets/gtexpert/lang/ja_jp.lang @@ -37,20 +37,6 @@ gtexpert.machine.auto_chisel.mv.tooltip=あなたの理想、彫刻します/n gtexpert.machine.auto_chisel.hv.name=発展型自動彫刻機 II gtexpert.machine.auto_chisel.hv.tooltip=あなたの理想、彫刻します/n左が素材、右が彫刻型。詳しくはJEIのChiselingページをご覧ください。/n§d作者:§f @tier940 -# Steam Machines -gtexpert.machine.steam_mixer_bronze.name=蒸気式ミキサー -gtexpert.machine.steam_mixer_steel.name=高圧蒸気式ミキサー -gtexpert.machine.steam_mixer.tooltip=§d作者:§f @tier940 -gtexpert.machine.steam_mixer.tooltip.1=手で混ぜるよりはマシ -gtexpert.machine.steam_assembler_bronze.name=蒸気式組立機 -gtexpert.machine.steam_assembler_steel.name=高圧蒸気式組立機 -gtexpert.machine.steam_assembler.tooltip=§d作者:§f @tier940 -gtexpert.machine.steam_assembler.tooltip.1=手で組み立てるよりはマシ -gtexpert.machine.steam_circuit_assembler_bronze.name=蒸気式回路作成機 -gtexpert.machine.steam_circuit_assembler_steel.name=高圧蒸気式回路作成機 -gtexpert.machine.steam_circuit_assembler.tooltip=§d作者:§f @tier940 -gtexpert.machine.steam_circuit_assembler.tooltip.1=手で回路を作るよりはマシ - # Vial Extractor gtexpert.machine.vial_extractor.lv.name=基本型魂抽出器 gtexpert.machine.vial_extractor.lv.tooltip=故も知らぬ不死のソウル?/n§d作者:§f @tier940