Changed storage field block recipes to desync circuit and pump tier and prevent overlap with fluid regulator recipe.

4 files changed, 54 insertions, 38 deletions

diff --git a/src/main/java/items/MetaItem_ReactorComponent.java b/src/main/java/items/MetaItem_ReactorComponent.java
index 35ecaf0572..13a19dbc7c 100644
--- a/src/main/java/items/MetaItem_ReactorComponent.java
+++ b/src/main/java/items/MetaItem_ReactorComponent.java
@@ -90,7 +90,7 @@ public class MetaItem_ReactorComponent extends Item {
 			list.add("Property = 1");

 		} else {

 			list.add("Part for the Modular Nuclear Reactor");

-			list.add("Hold " + EnumChatFormatting.BOLD + "[LSHIFT]" + EnumChatFormatting.RESET + EnumChatFormatting.GRAY + "to display properties");

+			list.add("Hold " + EnumChatFormatting.BOLD + "[LSHIFT]" + EnumChatFormatting.RESET + EnumChatFormatting.GRAY + " to display properties");

 		}

 	}

 	

diff --git a/src/main/java/kekztech/KekzCore.java b/src/main/java/kekztech/KekzCore.java
index 5fed66940a..8a6291d8ec 100644
--- a/src/main/java/kekztech/KekzCore.java
+++ b/src/main/java/kekztech/KekzCore.java
@@ -47,7 +47,7 @@ public class KekzCore {
 	

 	public static final String NAME = "KekzTech";

 	public static final String MODID = "kekztech";

-	public static final String VERSION = "0.2";

+	public static final String VERSION = "0.2.1";

 	

 	@Mod.Instance("kekztech")

 	public static KekzCore instance;

@@ -167,7 +167,7 @@ public class KekzCore {
 			GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Advanced, 1),

 			GT_OreDictUnificator.get(OrePrefixes.plate, Materials.PulsatingIron, 1),

 			GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.Steel, 1),

-			ItemList.Electric_Pump_MV.get(1L, (Object[]) null)

+			ItemList.Electric_Pump_LV.get(1L, (Object[]) null)

 		};

 		GT_Values.RA.addAssemblerRecipe(

 				tfftstoragefield1, 

@@ -179,7 +179,7 @@ public class KekzCore {
 				GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Advanced, 2),

 				GT_OreDictUnificator.get(OrePrefixes.plate, Materials.PulsatingIron, 4),

 				GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.StainlessSteel, 1),

-				ItemList.Electric_Pump_HV.get(1L, (Object[]) null)

+				ItemList.Electric_Pump_MV.get(1L, (Object[]) null)

 			};

 		GT_Values.RA.addAssemblerRecipe(

 				tfftstoragefield2, 

@@ -192,7 +192,7 @@ public class KekzCore {
 				GT_OreDictUnificator.get(OrePrefixes.plate, Materials.VibrantAlloy, 2),

 				GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Titanium, 1),

 				ItemList.Field_Generator_MV.get(1L, (Object[]) null),

-				ItemList.Electric_Pump_EV.get(1L, (Object[]) null)

+				ItemList.Electric_Pump_HV.get(2L, (Object[]) null)

 			};

 		GT_Values.RA.addAssemblerRecipe(

 				tfftstoragefield3, 

@@ -205,7 +205,7 @@ public class KekzCore {
 				GT_OreDictUnificator.get(OrePrefixes.plateTriple, Materials.NiobiumTitanium, 1),

 				GT_OreDictUnificator.get(OrePrefixes.pipeHuge, Materials.TungstenSteel, 1),

 				ItemList.Field_Generator_HV.get(1L, (Object[]) null),

-				ItemList.Electric_Pump_IV.get(1L, (Object[]) null)

+				ItemList.Electric_Pump_EV.get(1L, (Object[]) null)

 			};

 		GT_Values.RA.addAssemblerRecipe(

 				tfftstoragefield4, 

diff --git a/src/main/java/tileentities/GTMTE_SOFuelCellMK1.java b/src/main/java/tileentities/GTMTE_SOFuelCellMK1.java
index 461046a2c3..549bc19f72 100644
--- a/src/main/java/tileentities/GTMTE_SOFuelCellMK1.java
+++ b/src/main/java/tileentities/GTMTE_SOFuelCellMK1.java
@@ -4,6 +4,8 @@ import java.util.ArrayList;
 import java.util.Collection;

 import java.util.Iterator;

 

+import org.lwjgl.input.Keyboard;

+

 import blocks.Block_YSZUnit;

 import gregtech.api.GregTech_API;

 import gregtech.api.enums.Materials;

@@ -17,6 +19,7 @@ import gregtech.api.objects.GT_RenderedTexture;
 import gregtech.api.util.GT_ModHandler;

 import gregtech.api.util.GT_Recipe;

 import gregtech.api.util.GT_Utility;

+import kekztech.MultiBlockTooltipBuilder;

 import gregtech.api.util.GT_Recipe.GT_Recipe_Map;

 import net.minecraft.block.Block;

 import net.minecraft.entity.player.InventoryPlayer;

@@ -53,22 +56,27 @@ public class GTMTE_SOFuelCellMK1  extends GT_MetaTileEntity_MultiBlockBase {
 

 	@Override

 	public String[] getDescription() {

-		return new String[] { 

-				"Oxidizes gas fuels to generate electricity without polluting the environment",

-				"Consumes 29,480EU worth of fuel with up to 97% efficiency each second",

-				"Steam production requires the SOFC to heat up completely first",

-				"Outputs " + EU_PER_TICK + "EU/t and " + STEAM_PER_TICK + "L/t Steam",

-				"Additionally requires " + OXYGEN_PER_TICK + "L/t Oxygen gas",

-				"------------------------------------------",

-				"Dimensions: 3x3x5 (WxHxL)",

-				"Structure:",

-				"   Controller: Front center",

-				"   Dynamo Hatch: Back center",

-				"   3x YSZ Ceramic Electrolyte Unit: Center 1x1x3",

-				"   12x Clean Stainless Steel Machine Casing (at least)",

-				"   6x Reinforced Glass: Touching the Electrolyte Units on the horizontal sides",

-				"   Maintenance Hatch, I/O Hatches: Instead of any casing"

-				};	

+		final MultiBlockTooltipBuilder b = new MultiBlockTooltipBuilder();

+		b.addInfo("Oxidizes gas fuels to generate electricity without polluting the environment")

+				.addInfo("Consumes 29,480EU worth of fuel with up to 97% efficiency each second")

+				.addInfo("Steam production requires the SOFC to heat up completely first")

+				.addInfo("Outputs " + EU_PER_TICK + "EU/t and " + STEAM_PER_TICK + "L/t Steam")

+				.addInfo("Additionally requires " + OXYGEN_PER_TICK + "L/t Oxygen gas")

+				.addSeparator()

+				.beginStructureBlock(3, 3, 5)

+				.addController("Front Center")

+				.addDynamoHatch("Back Center")

+				.addOtherStructurePart("YSZ Ceramic Electrolyte Unit", "3x, Center 1x1x3")

+				.addOtherStructurePart("Reinforced Glass", "6x, touching the electrolyte units on the horizontal sides")

+				.addCasingInfo("Clean Stainless Steel Casing", 12)

+				.addMaintenanceHatch("Instead of any casing")

+				.addIOHatches("Instead of any casing")

+				.signAndFinalize("Kekzdealer");

+		if(!Keyboard.isKeyDown(Keyboard.KEY_LSHIFT)) {

+			return b.getInformation();

+		} else {

+			return b.getStructureInformation();

+		}

 	}

 	

 	@Override

diff --git a/src/main/java/tileentities/GTMTE_SOFuelCellMK2.java b/src/main/java/tileentities/GTMTE_SOFuelCellMK2.java
index 3708ef8cc4..8d1f996cb8 100644
--- a/src/main/java/tileentities/GTMTE_SOFuelCellMK2.java
+++ b/src/main/java/tileentities/GTMTE_SOFuelCellMK2.java
@@ -4,6 +4,8 @@ import java.util.ArrayList;
 import java.util.Collection;

 import java.util.Iterator;

 

+import org.lwjgl.input.Keyboard;

+

 import blocks.Block_GDCUnit;

 import gregtech.api.GregTech_API;

 import gregtech.api.enums.Materials;

@@ -17,6 +19,7 @@ import gregtech.api.objects.GT_RenderedTexture;
 import gregtech.api.util.GT_Recipe;

 import gregtech.api.util.GT_Utility;

 import gregtech.api.util.GT_Recipe.GT_Recipe_Map;

+import kekztech.MultiBlockTooltipBuilder;

 import net.minecraft.block.Block;

 import net.minecraft.entity.player.InventoryPlayer;

 import net.minecraft.item.ItemStack;

@@ -53,22 +56,27 @@ public class GTMTE_SOFuelCellMK2  extends GT_MetaTileEntity_MultiBlockBase {
 

 	@Override

 	public String[] getDescription() {

-		return new String[] { 

-				"Oxidizes gas fuels to generate electricity without polluting the environment",

-				"Consumes 442,200EU worth of fuel with up to 160% efficiency each second",

-				"Steam production requires the SOFC to heat up completely first",

-				"Outputs " + EU_PER_TICK + "EU/t and " + STEAM_PER_TICK + "L/t Superheated Steam",

-				"Additionally requires " + OXYGEN_PER_TICK + "L/t Oxygen gas",

-				"------------------------------------------",

-				"Dimensions: 3x3x5 (WxHxL)",

-				"Structure:",

-				"   Controller front center",

-				"   Dynamo Hatch back center",

-				"   3x GDC Ceramic Electrolyte Unit (center 1x1x3)",

-				"   12x Robust Tungstensteel Machine Casing (at least)",

-				"   6x Reinforced Glass: Touching the Electrolyte Units on the horizontal sides",

-				"   Maintenance Hatch, I/O Hatches: Instead of any casing"

-				};	

+		final MultiBlockTooltipBuilder b = new MultiBlockTooltipBuilder();

+		b.addInfo("Oxidizes gas fuels to generate electricity without polluting the environment")

+				.addInfo("Consumes 442,200EU worth of fuel with up to 97% efficiency each second")

+				.addInfo("Steam production requires the SOFC to heat up completely first")

+				.addInfo("Outputs " + EU_PER_TICK + "EU/t and " + STEAM_PER_TICK + "L/t Steam")

+				.addInfo("Additionally requires " + OXYGEN_PER_TICK + "L/t Oxygen gas")

+				.addSeparator()

+				.beginStructureBlock(3, 3, 5)

+				.addController("Front Center")

+				.addDynamoHatch("Back Center")

+				.addOtherStructurePart("GDC Ceramic Electrolyte Unit", "3x, Center 1x1x3")

+				.addOtherStructurePart("Reinforced Glass", "6x, touching the electrolyte units on the horizontal sides")

+				.addCasingInfo("Robust Tungstensteel Machine Casing", 12)

+				.addMaintenanceHatch("Instead of any casing")

+				.addIOHatches("Instead of any casing")

+				.signAndFinalize("Kekzdealer");

+		if(!Keyboard.isKeyDown(Keyboard.KEY_LSHIFT)) {

+			return b.getInformation();

+		} else {

+			return b.getStructureInformation();

+		}

 	}

 	

 	@Override