Added Item Server recipes. Removed unused reactor part recipes.

7 files changed, 61 insertions, 48 deletions

diff --git a/config/IC2.ini b/config/IC2.ini
index 8ce9dd4967..9f9d94a922 100644
--- a/config/IC2.ini
+++ b/config/IC2.ini
@@ -1,5 +1,5 @@
 ; ic2 general config
-; created Nov 20, 2019 8:45:36 PM
+; created Nov 21, 2019 2:09:47 PM
 ;---
 
 [worldgen]
diff --git a/config/splash.properties b/config/splash.properties
index c68378b3de..04f6ef7a2a 100644
--- a/config/splash.properties
+++ b/config/splash.properties
@@ -1,5 +1,5 @@
 #Splash screen properties
-#Wed Nov 20 20:45:26 CET 2019
+#Thu Nov 21 14:09:39 CET 2019
 logoTexture=textures/gui/title/mojang.png
 background=0xFFFFFF
 font=0x0
diff --git a/src/main/java/items/MetaItem_CraftingComponent.java b/src/main/java/items/MetaItem_CraftingComponent.java
index 0d6a1897f0..ae5bedad91 100644
--- a/src/main/java/items/MetaItem_CraftingComponent.java
+++ b/src/main/java/items/MetaItem_CraftingComponent.java
@@ -14,7 +14,7 @@ import net.minecraft.util.IIcon;
 public class MetaItem_CraftingComponent extends Item {

 	

 	private static MetaItem_CraftingComponent instance = new MetaItem_CraftingComponent();

-	private final IIcon[] icons = new IIcon[16];

+	private final IIcon[] icons = new IIcon[17];

 	

 	private MetaItem_CraftingComponent() {

 		// I am a singleton

@@ -56,6 +56,7 @@ public class MetaItem_CraftingComponent extends Item {
 		icons[counter++] = reg.registerIcon(KekzCore.MODID + ":" + "CeriaDust");

 		icons[counter++] = reg.registerIcon(KekzCore.MODID + ":" + "YSZCeramicPlate");

 		icons[counter++] = reg.registerIcon(KekzCore.MODID + ":" + "GDCCeramicPlate");

+		icons[counter++] = reg.registerIcon(KekzCore.MODID + ":" + "ItemServerBlade");

 	}

 	

 	@Override

diff --git a/src/main/java/kekztech/Items.java b/src/main/java/kekztech/Items.java
index 9a7a351ec7..a2870d6e2c 100644
--- a/src/main/java/kekztech/Items.java
+++ b/src/main/java/kekztech/Items.java
@@ -1,6 +1,5 @@
 package kekztech;

 

-import cpw.mods.fml.common.Loader;

 import items.MetaItem_CraftingComponent;

 import items.MetaItem_ReactorComponent;

 import net.minecraft.item.ItemStack;

@@ -41,6 +40,7 @@ public enum Items {
 	YSZCeramicDust(9,1), GDCCeramicDust(10,1),

 	YttriaDust(11,1), ZirconiaDust(12,1), CeriaDust(13,1),

 	YSZCeramicPlate(14,1), GDCCeramicPlate(15,1),

+	ItemServerBlade(16,1),

 	// Error Item

 	Error(0,1);

 	

diff --git a/src/main/java/kekztech/KekzCore.java b/src/main/java/kekztech/KekzCore.java
index 239d8cc49f..41f02ae036 100644
--- a/src/main/java/kekztech/KekzCore.java
+++ b/src/main/java/kekztech/KekzCore.java
@@ -151,6 +151,17 @@ public class KekzCore {
 				'C', OrePrefixes.circuit.get(Materials.Data)

 		};

 		GT_ModHandler.addCraftingRecipe(fms.getStackForm(1), tfft_recipe);

+		final Object[] is_recipe = {

+				"FRF", "CGC", "PZP",

+				'F', GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.TungstenSteel, 1),

+				'R', GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.TungstenSteel, 1),

+				'C', ItemList.Conveyor_Module_LuV.get(1L),

+				'G', ItemList.Field_Generator_EV.get(1L),

+				'P', GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.VanadiumGallium, 1),

+				'Z', GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Master, 1)

+		};

+		GT_ModHandler.addCraftingRecipe(is.getStackForm(1), is_recipe);

+		

 		

 		// Ceramic Electrolyte Units

 		final ItemStack[] yszUnit = {

@@ -178,6 +189,50 @@ public class KekzCore {
 				new ItemStack(Block_GDCUnit.getInstance(), 1), 

 				2400, 1920);

 		

+		// Item Server Structure blocks

+		final Object[] is_rack_recipe = {

+				"BRB", "CFC", "BRB",

+				'B', GT_OreDictUnificator.get(OrePrefixes.plate, Materials.BlueSteel, 1),

+				'R', GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.Aluminium, 1),

+				'C', GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Platinum, 1),

+				'F', GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.TungstenSteel, 1),

+		};

+		GT_ModHandler.addCraftingRecipe(new ItemStack(Block_ItemServerRackCasing.getInstance()), is_rack_recipe);

+		final ItemStack[] is_ioport = {

+				GT_Utility.getIntegratedCircuit(6),

+				new ItemStack(Block_ItemServerRackCasing.getInstance()),

+				GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.Platinum, 16),

+				GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Platinum, 2),

+				ItemList.Field_Generator_HV.get(1L),

+				ItemList.Robot_Arm_EV.get(4L)

+			};

+			GT_Values.RA.addAssemblerRecipe(

+					is_ioport, 

+					FluidRegistry.getFluidStack("molten.polytetrafluoroethylene", 144),

+					new ItemStack(Block_ItemServerIOPort.getInstance(), 1), 

+					200, 7680);

+		final Object[] is_blade = {

+				"CRC", "CMC", "HPH",

+				'C', GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Elite, 1),

+				'R', GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.Aluminium, 1),

+				'P', GT_OreDictUnificator.get(OrePrefixes.cableGt08, Materials.Platinum, 1),

+				'M', ItemList.Electric_Motor_EV.get(1L),

+				'H', craftingItem.getStackFromDamage(Items.BoronArsenideHeatPipe.getMetaID()),

+		};

+		GT_ModHandler.addCraftingRecipe(craftingItem.getStackOfAmountFromDamage(Items.ItemServerBlade.getMetaID(), 8), is_blade);

+		final ItemStack[] is_drive = {

+				GT_Utility.getIntegratedCircuit(6),

+				craftingItem.getStackOfAmountFromDamage(Items.ItemServerBlade.getMetaID(), 8),

+				GT_OreDictUnificator.get(OrePrefixes.plate, Materials.BlueSteel, 4),

+				GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Aluminium, 1),

+				GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Aluminium, 16)

+			};

+			GT_Values.RA.addAssemblerRecipe(

+					is_drive, 

+					FluidRegistry.getFluidStack("molten.polyethylene", 1152),

+					new ItemStack(Block_ItemServerDrive.getInstance(), 1), 

+					200, 7680);

+		

 		// T.F.F.T Structure blocks

 		final ItemStack[] tfftcasing = {

 			GT_Utility.getIntegratedCircuit(6),

@@ -360,50 +415,6 @@ public class KekzCore {
 				craftingItem.getStackFromDamage(Items.DiamondHeatPipe.getMetaID()),

 				null, 1200, 7680);

 		

-		// Heat Vents

-		final ItemStack[] t1HeatVent = {

-				craftingItem.getStackOfAmountFromDamage(Items.CopperHeatPipe.getMetaID(), 2),

-				ItemList.Electric_Motor_MV.get(1L),

-				GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.Steel, new ItemStack(ErrorItem.getInstance(), 1), 1),

-				GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Steel, new ItemStack(ErrorItem.getInstance(), 1), 2),

-				GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Steel, new ItemStack(ErrorItem.getInstance(), 1), 8),

-				GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Good, 1),

-				GT_Utility.getIntegratedCircuit(6)

-		};

-		GT_Values.RA.addAssemblerRecipe(

-				t1HeatVent, 

-				FluidRegistry.getFluidStack("molten.copper", 144),

-				reactorItem.getStackFromDamage(Items.T1HeatVent.getMetaID()),

-				200, 120);

-		final ItemStack[] t2HeatVent = {

-				craftingItem.getStackOfAmountFromDamage(Items.SilverHeatPipe.getMetaID(), 2),

-				ItemList.Electric_Motor_HV.get(1L),

-				GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.Aluminium, new ItemStack(ErrorItem.getInstance(), 1), 1),

-				GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Aluminium, new ItemStack(ErrorItem.getInstance(), 1), 2),

-				GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Aluminium, new ItemStack(ErrorItem.getInstance(), 1), 8),

-				GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Advanced, 1),

-				GT_Utility.getIntegratedCircuit(6)

-		};

-		GT_Values.RA.addAssemblerRecipe(

-				t2HeatVent, 

-				FluidRegistry.getFluidStack("molten.silver", 144),

-				reactorItem.getStackFromDamage(Items.T2HeatVent.getMetaID()),

-				400, 480);

-		final ItemStack[] t3HeatVent = {

-				craftingItem.getStackOfAmountFromDamage(Items.BoronArsenideHeatPipe.getMetaID(), 2),

-				ItemList.Electric_Motor_IV.get(1L),

-				GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.TungstenSteel, new ItemStack(ErrorItem.getInstance(), 1), 1),

-				GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.TungstenSteel, new ItemStack(ErrorItem.getInstance(), 1), 2),

-				GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Tungsten, new ItemStack(ErrorItem.getInstance(), 1), 8),

-				GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Data, 1),

-				GT_Utility.getIntegratedCircuit(6)

-		};

-		GT_Values.RA.addAssemblerRecipe(

-				t3HeatVent, 

-				FluidRegistry.getFluidStack("molten.gallium", 576),

-				reactorItem.getStackFromDamage(Items.T3HeatVent.getMetaID()),

-				800, 7680);

-		

 		System.out.println("...done");

 	}

 	

diff --git a/src/main/resources/assets/kekztech/lang/en_US.lang b/src/main/resources/assets/kekztech/lang/en_US.lang
index f83d06f111..2197856513 100644
--- a/src/main/resources/assets/kekztech/lang/en_US.lang
+++ b/src/main/resources/assets/kekztech/lang/en_US.lang
@@ -72,6 +72,7 @@ item.kekztech_crafting_item.12.name=Zirconia Dust
 item.kekztech_crafting_item.13.name=Ceria Dust

 item.kekztech_crafting_item.14.name=YSZ Ceramic Plate

 item.kekztech_crafting_item.15.name=GDC Ceramic Plate

+item.kekztech_crafting_item.16.name=Item Server Blade

 

 tile.kekztech_gdcceramicelectrolyteunit_block.name=GDC Ceramic Electrolyte Unit

 tile.kekztech_yszceramicelectrolyteunit_block.name=YSZ Ceramic Electrolyte Unit

diff --git a/src/main/resources/assets/kekztech/textures/blocks/ItemServerIOPort.png b/src/main/resources/assets/kekztech/textures/blocks/ItemServerIOPort.png
index f91bd07ece..5e387411f2 100644
--- a/src/main/resources/assets/kekztech/textures/blocks/ItemServerIOPort.png
+++ b/src/main/resources/assets/kekztech/textures/blocks/ItemServerIOPort.png