aboutsummaryrefslogtreecommitdiff
path: root/src/main
diff options
context:
space:
mode:
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/gtPlusPlus/core/recipe/RecipesMachines.java32
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/MTEHatchSolidifier.java6
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialMultiMachine.java2
3 files changed, 10 insertions, 30 deletions
diff --git a/src/main/java/gtPlusPlus/core/recipe/RecipesMachines.java b/src/main/java/gtPlusPlus/core/recipe/RecipesMachines.java
index fecf4fcde6..ae3817f141 100644
--- a/src/main/java/gtPlusPlus/core/recipe/RecipesMachines.java
+++ b/src/main/java/gtPlusPlus/core/recipe/RecipesMachines.java
@@ -2874,29 +2874,21 @@ public class RecipesMachines {
CI.getTieredCircuit(5),
"plateStaballoy",
GregtechItemList.Industrial_Mixer.get(1));
- }
-
- if (GTPPCore.ConfigSwitches.enableMultiblock_IndustrialMultiMachine) {
- ItemStack plate = MaterialsAlloy.STABALLOY.getPlate(1);
- ItemStack o_Compressor = ItemList.Machine_IV_Compressor.get(1);
- ItemStack o_Lathe = ItemList.Machine_IV_Lathe.get(1);
- ItemStack o_Electromagnet = ItemList.Machine_IV_Polarizer.get(1);
- ItemStack o_Fermenter = ItemList.Machine_IV_Fermenter.get(1);
- ItemStack o_Distillery = ItemList.Machine_IV_FluidExtractor.get(1);
- ItemStack o_Extractor = ItemList.Machine_IV_Extractor.get(1);
+ final ItemStack staballoyPlate = MaterialsAlloy.STABALLOY.getPlate(1);
RecipeUtils.addShapedRecipe(
- plate,
+ staballoyPlate,
CI.craftingToolHammer_Hard,
- plate,
+ staballoyPlate,
"plateStainlessSteel",
"frameGtZirconiumCarbide",
"plateStainlessSteel",
- plate,
+ staballoyPlate,
CI.craftingToolWrench,
- plate,
+ staballoyPlate,
GregtechItemList.Casing_Multi_Use.get(1));
+
GTValues.RA.stdBuilder()
.itemInputs(
MaterialsAlloy.STABALLOY.getPlate(4),
@@ -2907,18 +2899,6 @@ public class RecipesMachines {
.duration(2 * SECONDS + 10 * TICKS)
.eut(16)
.addTo(assemblerRecipes);
-
- RecipeUtils.addShapedRecipe(
- o_Compressor,
- o_Lathe,
- o_Electromagnet,
- plate,
- ItemUtils.getSimpleStack(ModBlocks.blockProjectTable),
- plate,
- o_Fermenter,
- o_Distillery,
- o_Extractor,
- GregtechItemList.Industrial_MultiMachine.get(1));
}
// Drilling Platform Casings
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/MTEHatchSolidifier.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/MTEHatchSolidifier.java
index ce3337c34b..c714f8a5ac 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/MTEHatchSolidifier.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/MTEHatchSolidifier.java
@@ -39,10 +39,8 @@ public class MTEHatchSolidifier extends MTEHatchInput {
@Override
public String[] getDescription() {
return new String[] {
- "Fluid Input with Mold for " + EnumChatFormatting.YELLOW
- + "Large Processing Factory"
- + EnumChatFormatting.RESET,
- "#22 Circuit is imprinted in Hatch", "Capacity: " + GTUtility.formatNumbers(getCapacity()) + "L",
+ "Fluid Input with Mold for " + EnumChatFormatting.YELLOW + "Fluid Shaper" + EnumChatFormatting.RESET,
+ "Capacity: " + GTUtility.formatNumbers(getCapacity()) + "L",
"Added by: " + EnumChatFormatting.AQUA
+ "Quetz4l"
+ " - "
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialMultiMachine.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialMultiMachine.java
index 472b1f66fd..974d72657d 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialMultiMachine.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialMultiMachine.java
@@ -127,6 +127,8 @@ public class MTEIndustrialMultiMachine extends GTPPMultiBlockBase<MTEIndustrialM
MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder();
tt.addMachineType(getMachineType())
.addInfo("Controller Block for the Industrial Multi-Machine")
+ .addInfo(EnumChatFormatting.RED + "DEPRECATED! This machine will be removed in the next major update.")
+ .addInfo(EnumChatFormatting.RED + "A variety of multiblocks have been added to replace these machines!")
.addInfo("250% faster than using single block machines of the same voltage")
.addInfo("Only uses 80% of the EU/t normally required")
.addInfo("Processes two items per voltage tier")