aboutsummaryrefslogtreecommitdiff
path: root/src/Java/gtPlusPlus
diff options
context:
space:
mode:
Diffstat (limited to 'src/Java/gtPlusPlus')
-rw-r--r--src/Java/gtPlusPlus/core/block/machine/Machine_WorkbenchAdvanced.java12
-rw-r--r--src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java39
-rw-r--r--src/Java/gtPlusPlus/core/recipe/common/CI.java36
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java10
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSimpleWasher.java13
5 files changed, 58 insertions, 52 deletions
diff --git a/src/Java/gtPlusPlus/core/block/machine/Machine_WorkbenchAdvanced.java b/src/Java/gtPlusPlus/core/block/machine/Machine_WorkbenchAdvanced.java
index 436fc5bf39..2e647a1a26 100644
--- a/src/Java/gtPlusPlus/core/block/machine/Machine_WorkbenchAdvanced.java
+++ b/src/Java/gtPlusPlus/core/block/machine/Machine_WorkbenchAdvanced.java
@@ -68,7 +68,7 @@ public class Machine_WorkbenchAdvanced extends BlockContainer
public boolean onBlockActivated(final World world, final int x, final int y, final int z, final EntityPlayer player, final int side, final float lx, final float ly, final float lz)
{
- final ItemStack heldItem = PlayerUtils.getItemStackInPlayersHand(player);
+ /*final ItemStack heldItem = PlayerUtils.getItemStackInPlayersHand(player);
if (world.isRemote) {
return true;
}
@@ -81,15 +81,15 @@ public class Machine_WorkbenchAdvanced extends BlockContainer
else if (heldItem.getItem() instanceof IToolWrench){
holdingWrench = true;
}
- /*else if (heldItem.getItem() instanceof ITool){
+ else if (heldItem.getItem() instanceof ITool){
holdingWrench = true;
- }*/
- /*else if (heldItem.getItem() instanceof GT_MetaGenerated_Tool){
+ }
+ else if (heldItem.getItem() instanceof GT_MetaGenerated_Tool){
GT_MetaGenerated_Tool testTool = (GT_MetaGenerated_Tool) heldItem.getItem();
if (testTool.canWrench(player, x, y, z)){
holdingWrench = true;
}
- }*/
+ }
else {
holdingWrench = false;
}
@@ -104,7 +104,7 @@ public class Machine_WorkbenchAdvanced extends BlockContainer
return true;
}
Utils.LOG_INFO("Holding a Wrench, doing wrench things instead.");
- }
+ }*/
return false;
}
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
index 75e49d06fd..3e70adc477 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
@@ -190,13 +190,13 @@ public class RECIPES_Machines {
boiler_Coal = ItemList.Machine_Bronze_Boiler.get(1);
//IV MACHINES
- IV_MACHINE_Electrolyzer = ItemList.Machine_IV_Electrolyzer.get(1);
- IV_MACHINE_BendingMachine= ItemList.Machine_IV_Bender.get(1);
- IV_MACHINE_Wiremill= ItemList.Machine_IV_Wiremill.get(1);
- EV_MACHINE_Macerator= ItemList.Machine_EV_Macerator.get(1);
- IV_MACHINE_Macerator= ItemList.Machine_IV_Macerator.get(1);
- IV_MACHINE_MassFabricator= ItemList.Machine_IV_Massfab.get(1);
- IV_MACHINE_Centrifuge= ItemList.Machine_IV_Centrifuge.get(1);
+ IV_MACHINE_Electrolyzer = ItemList.Machine_EV_Electrolyzer.get(1);
+ IV_MACHINE_BendingMachine= ItemList.Machine_EV_Bender.get(1);
+ IV_MACHINE_Wiremill= ItemList.Machine_EV_Wiremill.get(1);
+ EV_MACHINE_Macerator= ItemList.Machine_HV_Macerator.get(1);
+ IV_MACHINE_Macerator= ItemList.Machine_EV_Macerator.get(1);
+ IV_MACHINE_MassFabricator= ItemList.Machine_EV_Massfab.get(1);
+ IV_MACHINE_Centrifuge= ItemList.Machine_EV_Centrifuge.get(1);
}
@@ -572,19 +572,19 @@ public class RECIPES_Machines {
}
else {
- CI.component_Plate[1] = (ItemStack) OrePrefixes.plate.get(Materials.Tin);
+ CI.component_Plate[1] = "plateTin";
pipeTier1 = "pipeLargeClay";
CI.circuitTier1 = ItemList.Circuit_Primitive.get(1);
- CI.component_Plate[2] = (ItemStack) OrePrefixes.plate.get(Materials.Copper);
+ CI.component_Plate[2] = "plateCopper";
pipeTier2 = "pipeHugeClay";
- CI.component_Plate[3] = (ItemStack) OrePrefixes.plate.get(Materials.Bronze);
+ CI.component_Plate[3] = "plateBronze";
pipeTier3 = "pipeMediumBronze";
- CI.component_Plate[4] = (ItemStack) OrePrefixes.plate.get(Materials.Iron);
+ CI.component_Plate[4] = "plateIron";
pipeTier4 = "pipeMediumSteel";
- CI.component_Plate[5] = (ItemStack) OrePrefixes.plate.get(Materials.Steel);
- CI.component_Plate[6] = (ItemStack) OrePrefixes.plate.get(Materials.Redstone);
- CI.component_Plate[7] = (ItemStack) OrePrefixes.plate.get(Materials.RedstoneAlloy);
- CI.component_Plate[8] = (ItemStack) OrePrefixes.plate.get(Materials.DarkSteel);
+ CI.component_Plate[5] = "plateSteel";
+ CI.component_Plate[6] = "plateRedstone";
+ CI.component_Plate[7] = "plateRedstoneAlloy";
+ CI.component_Plate[8] = "plateDarkSteel";
ItemStack waterBucket = ItemUtils.getSimpleStack(Items.water_bucket);
RecipeUtils.addShapedGregtechRecipe(
@@ -724,6 +724,15 @@ public class RECIPES_Machines {
"plankWood", "plankWood", "plankWood",
RECIPE_TreeFarmFrame);
}
+
+
+ ItemStack plateWrought = ItemUtils.getItemStackOfAmountFromOreDict("plateWroughtIron", 1);
+ //Add Recipe
+ RecipeUtils.addShapedGregtechRecipe(
+ plateWrought, CI.electricPump_LV, plateWrought,
+ plateWrought, ItemUtils.getItemStackOfAmountFromOreDict("pipeLargeClay", 1), plateWrought,
+ plateWrought, CI.machineCasing_ULV, plateWrought,
+ GregtechItemList.SimpleDustWasher.get(1));
}
diff --git a/src/Java/gtPlusPlus/core/recipe/common/CI.java b/src/Java/gtPlusPlus/core/recipe/common/CI.java
index bcd669682d..7dab00c847 100644
--- a/src/Java/gtPlusPlus/core/recipe/common/CI.java
+++ b/src/Java/gtPlusPlus/core/recipe/common/CI.java
@@ -142,14 +142,14 @@ public class CI {
public static ItemStack gearboxCasing_Tier_3;
public static ItemStack gearboxCasing_Tier_4;
- public static ItemStack[] component_Plate;
- public static ItemStack[] component_Rod;
- public static ItemStack[] component_Ingot;
+ public static String[] component_Plate;
+ public static String[] component_Rod;
+ public static String[] component_Ingot;
public static void Init(){
//Tiered Components
- component_Plate = new ItemStack[]{
+ component_Plate = new String[]{
getTieredComponent(OrePrefixes.plate, 0),
getTieredComponent(OrePrefixes.plate, 1),
getTieredComponent(OrePrefixes.plate, 2),
@@ -163,7 +163,7 @@ public class CI {
getTieredComponent(OrePrefixes.plate, 10),
getTieredComponent(OrePrefixes.plate, 11)
};
- component_Rod = new ItemStack[]{
+ component_Rod = new String[]{
getTieredComponent(OrePrefixes.stick, 0),
getTieredComponent(OrePrefixes.stick, 1),
getTieredComponent(OrePrefixes.stick, 2),
@@ -177,7 +177,7 @@ public class CI {
getTieredComponent(OrePrefixes.stick, 10),
getTieredComponent(OrePrefixes.stick, 11)
};
- component_Ingot = new ItemStack[]{
+ component_Ingot = new String[]{
getTieredComponent(OrePrefixes.ingot, 0),
getTieredComponent(OrePrefixes.ingot, 1),
getTieredComponent(OrePrefixes.ingot, 2),
@@ -350,16 +350,24 @@ public class CI {
return Materials._NULL;
}
- public static ItemStack getTieredComponent(OrePrefixes type, int tier){
+ public static String getTieredComponent(OrePrefixes type, int tier){
Object material = getMaterialFromTier(tier);
- if (material instanceof Materials){
- type.get(material);
- }
- else {
- String materialName = ((Material) material).getLocalizedName();
- ItemUtils.getItemStackOfAmountFromOreDict(type.mRegularLocalName+materialName, 1);
+ if (material != null){
+ if (material instanceof Materials){
+ //return (ItemStack) type.get(material);
+ String materialName = ((Materials) material).mDefaultLocalName;
+ Utils.LOG_INFO("Searching for a component named "+type.name()+materialName);
+ //return ItemUtils.getItemStackOfAmountFromOreDict(type.name()+materialName, 1);
+ return (type.name()+materialName);
+ }
+ else {
+ String materialName = (Utils.sanitizeString(((Material) material).getLocalizedName()));
+ Utils.LOG_INFO("Searching for a component named "+type.name()+materialName);
+ //return ItemUtils.getItemStackOfAmountFromOreDict(type.name()+materialName, 1);
+ return (type.name()+materialName);
+ }
}
- Utils.LOG_INFO("[Components] Failed getting a tiered component. "+type.mRegularLocalName+" "+tier);
+ Utils.LOG_INFO("[Components] Failed getting a tiered component. "+type.name()+" | "+tier);
return null;
}
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java
index 06df76ca45..74019f9a68 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java
@@ -262,11 +262,11 @@ public class GregtechConduits {
}
//Check all pipes are not null
- Utils.LOG_INFO("Generated pipeTiny from "+ materialName +"? "+ ((ItemUtils.getItemStackOfAmountFromOreDict("pipe"+"Tiny"+output, 1) != null) ? true : false));
- Utils.LOG_INFO("Generated pipeSmall from "+ materialName +"? "+ ((ItemUtils.getItemStackOfAmountFromOreDict("pipe"+"Small"+output, 1) != null) ? true : false));
- Utils.LOG_INFO("Generated pipeNormal from "+ materialName +"? "+ ((ItemUtils.getItemStackOfAmountFromOreDict("pipe"+"Medium"+output, 1) != null) ? true : false));
- Utils.LOG_INFO("Generated pipeLarge from "+ materialName +"? "+ ((ItemUtils.getItemStackOfAmountFromOreDict("pipe"+"Large"+output, 1) != null) ? true : false));
- Utils.LOG_INFO("Generated pipeHuge from "+ materialName +"? "+ ((ItemUtils.getItemStackOfAmountFromOreDict("pipe"+"Huge"+output, 1) != null) ? true : false));
+ Utils.LOG_WARNING("Generated pipeTiny from "+ materialName +"? "+ ((ItemUtils.getItemStackOfAmountFromOreDict("pipe"+"Tiny"+output, 1) != null) ? true : false));
+ Utils.LOG_WARNING("Generated pipeSmall from "+ materialName +"? "+ ((ItemUtils.getItemStackOfAmountFromOreDict("pipe"+"Small"+output, 1) != null) ? true : false));
+ Utils.LOG_WARNING("Generated pipeNormal from "+ materialName +"? "+ ((ItemUtils.getItemStackOfAmountFromOreDict("pipe"+"Medium"+output, 1) != null) ? true : false));
+ Utils.LOG_WARNING("Generated pipeLarge from "+ materialName +"? "+ ((ItemUtils.getItemStackOfAmountFromOreDict("pipe"+"Large"+output, 1) != null) ? true : false));
+ Utils.LOG_WARNING("Generated pipeHuge from "+ materialName +"? "+ ((ItemUtils.getItemStackOfAmountFromOreDict("pipe"+"Huge"+output, 1) != null) ? true : false));
int eut = 120;
int time = 0;
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSimpleWasher.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSimpleWasher.java
index 094c4464ca..34a54c16de 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSimpleWasher.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSimpleWasher.java
@@ -17,7 +17,6 @@ public class GregtechSimpleWasher {
public static void run(){
-
//Generate Recipe Map for the Dust Washer.
ItemStack dustClean;
ItemStack dustDirty;
@@ -38,18 +37,8 @@ public class GregtechSimpleWasher {
}
}
-
//Register the Simple Washer Entity.
- GregtechItemList.SimpleDustWasher.set(new GregtechMetaTileEntity_BasicWasher(767, "simplewasher.01.tier.00", "Simple Washer", 0).getStackForm(1L));
-
- ItemStack plateWrought = ItemUtils.getItemStackOfAmountFromOreDict("plateWroughtIron", 1);
-
- //Add Recipe
- RecipeUtils.addShapedGregtechRecipe(
- plateWrought, CI.electricPump_LV, plateWrought,
- plateWrought, ItemUtils.getItemStackOfAmountFromOreDict("pipeLargeClay", 1), plateWrought,
- plateWrought, CI.machineCasing_ULV, plateWrought,
- GregtechItemList.SimpleDustWasher.get(1));
+ GregtechItemList.SimpleDustWasher.set(new GregtechMetaTileEntity_BasicWasher(767, "simplewasher.01.tier.00", "Simple Washer", 0).getStackForm(1L));
}
}
generated by cgit (git 2.46.0) at 2025-03-12 20:02:26 +0000