aboutsummaryrefslogtreecommitdiff
path: root/src/Java/miscutil/core
diff options
context:
space:
mode:
Diffstat (limited to 'src/Java/miscutil/core')
-rw-r--r--src/Java/miscutil/core/block/ModBlocks.java6
-rw-r--r--src/Java/miscutil/core/common/CommonProxy.java6
-rw-r--r--src/Java/miscutil/core/handler/registration/RECIPES_Machines.java26
-rw-r--r--src/Java/miscutil/core/handler/registration/RECIPES_Tools.java (renamed from src/Java/miscutil/core/item/tool/Loader_TOOLS.java)10
-rw-r--r--src/Java/miscutil/core/handler/registration/RegistrationHandler.java25
-rw-r--r--src/Java/miscutil/core/util/ItemUtils.java83
6 files changed, 107 insertions, 49 deletions
diff --git a/src/Java/miscutil/core/block/ModBlocks.java b/src/Java/miscutil/core/block/ModBlocks.java
index 991b35ad14..b2abe86b7d 100644
--- a/src/Java/miscutil/core/block/ModBlocks.java
+++ b/src/Java/miscutil/core/block/ModBlocks.java
@@ -3,6 +3,7 @@ package miscutil.core.block;
import miscutil.core.block.antigrief.TowerDevice;
import miscutil.core.creativetabs.AddToCreativeTab;
import miscutil.core.util.Utils;
+import miscutil.gregtech.metatileentity.implementations.GregtechMetaCasingBlocks;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import cpw.mods.fml.common.registry.GameRegistry;
@@ -12,8 +13,10 @@ public final class ModBlocks {
//Blood Steel
public static Block blockBloodSteel;
public static Block blockStaballoy;
+ //public static Block blockIronPlatedBricks;
public static Block blockToolBuilder;
public static Block blockGriefSaver;
+ public static Block blockCasingsMisc;
//public static Block blockBloodSteelChest;
@@ -70,6 +73,9 @@ public final class ModBlocks {
//Staballoy Block
GameRegistry.registerBlock(blockStaballoy = new BasicBlock("blockStaballoy", Material.iron), "blockStaballoy");
+
+ //Casing Blocks
+ blockCasingsMisc = new GregtechMetaCasingBlocks();
//Blood Steel Block //Name, Material, Hardness, Resistance, Light level, Tool, tool level, sound
//GameRegistry.registerBlock(blockToolBuilder = new AdvancedBlock("blockToolBuilder", Material.circuits, TMCreativeTabs.tabMachines, 1F, 5F, 0F, "pickaxe", 1, Block.soundTypeWood), "blockToolBuilder");
diff --git a/src/Java/miscutil/core/common/CommonProxy.java b/src/Java/miscutil/core/common/CommonProxy.java
index 32dc0c8c11..a4a08c90c8 100644
--- a/src/Java/miscutil/core/common/CommonProxy.java
+++ b/src/Java/miscutil/core/common/CommonProxy.java
@@ -5,9 +5,8 @@ import static miscutil.core.lib.LoadedMods.Gregtech;
import gregtech.api.util.GT_OreDictUnificator;
import miscutil.core.block.ModBlocks;
import miscutil.core.gui.ModGUI;
-import miscutil.core.handler.registration.RECIPES_Machines;
+import miscutil.core.handler.registration.RegistrationHandler;
import miscutil.core.item.ModItems;
-import miscutil.core.item.tool.Loader_TOOLS;
import miscutil.core.lib.CORE;
import miscutil.core.lib.LoadedMods;
import miscutil.core.tileentities.ModTileEntities;
@@ -67,8 +66,7 @@ public class CommonProxy {
public void init(FMLInitializationEvent e) {
- Loader_TOOLS.run();
- RECIPES_Machines.RECIPES_LOAD();
+ RegistrationHandler.run();
}
diff --git a/src/Java/miscutil/core/handler/registration/RECIPES_Machines.java b/src/Java/miscutil/core/handler/registration/RECIPES_Machines.java
index 2c6f6505c9..d2108b7d7b 100644
--- a/src/Java/miscutil/core/handler/registration/RECIPES_Machines.java
+++ b/src/Java/miscutil/core/handler/registration/RECIPES_Machines.java
@@ -11,6 +11,8 @@ public class RECIPES_Machines {
//Outputs
//static ItemStack RECIPE_BufferCore_ULV = new ItemStack(GregtechEnergyBuffer.itemBufferCore);
static ItemStack RECIPE_SteamCondenser = GregtechItemList.Condensor_MAX.get(1);
+ static ItemStack RECIPE_IronBlastFurnace = GregtechItemList.Machine_Iron_BlastFurnace.get(1);
+ static ItemStack RECIPE_IronPlatedBricks = GregtechItemList.Casing_IronPlatedBricks.get(1);
static ItemStack RECIPE_Buffer_ULV = GregtechItemList.Energy_Buffer_1by1_ULV.get(1);
static ItemStack RECIPE_Buffer_LV = GregtechItemList.Energy_Buffer_1by1_LV.get(1);
static ItemStack RECIPE_Buffer_MV = GregtechItemList.Energy_Buffer_1by1_MV.get(1);
@@ -21,6 +23,7 @@ public class RECIPES_Machines {
static ItemStack RECIPE_Buffer_ZPM = GregtechItemList.Energy_Buffer_1by1_ZPM.get(1);
static ItemStack RECIPE_Buffer_UV = GregtechItemList.Energy_Buffer_1by1_UV.get(1);
static ItemStack RECIPE_Buffer_MAX = GregtechItemList.Energy_Buffer_1by1_MAX.get(1);
+
//Buffer Cores
static ItemStack RECIPE_BufferCore_ULV = Utils.getItemStack("miscutils:item.itemBufferCore1", 1);
@@ -102,6 +105,10 @@ public class RECIPES_Machines {
//gregtech:gt.metaitem.01:32611
static ItemStack pump_MV = ItemList.Electric_Pump_MV.get(1);
+ //Lava Boiler
+ static ItemStack boiler_Coal = ItemList.Machine_Bronze_Boiler.get(1);
+ static ItemStack blockBricks = Utils.getItemStack("minecraft:brick_block", 1);
+
//Batteries
static String batteryBasic = "batteryBasic";
static String batteryAdvanced = "batteryAdvanced";
@@ -152,7 +159,7 @@ public class RECIPES_Machines {
circuitData, batteryElite, circuitData,
plateTier5, cableTier5, plateTier5,
RECIPE_BufferCore_EV);
-
+
ItemUtils.recipeBuilder(
plateTier6, cableTier6, plateTier6,
circuitData, batteryElite, circuitElite,
@@ -253,13 +260,28 @@ public class RECIPES_Machines {
RECIPE_Buffer_MAX);
-
+ //Steam Condenser
ItemUtils.recipeBuilder(
pipeLargeCopper, pipeHugeSteel, pipeLargeCopper,
plateEnergeticAlloy, pump_MV, plateEnergeticAlloy,
plateEnergeticAlloy, pipeLargeCopper, plateEnergeticAlloy,
RECIPE_SteamCondenser);
+ //Iron BF
+ ItemUtils.recipeBuilder(
+ "plateDoubleAnyIron", "craftingFurnace", "plateDoubleAnyIron",
+ boiler_Coal, machineCasing_ULV, boiler_Coal,
+ "plateDoubleAnyIron", "bucketLava", "plateDoubleAnyIron",
+ RECIPE_IronBlastFurnace);
+
+ //Iron plated Bricks
+ ItemUtils.recipeBuilder(
+ "plateAnyIron", RECIPES_Tools.craftingToolHardHammer, "plateAnyIron",
+ "plateAnyIron", blockBricks, "plateAnyIron",
+ "plateAnyIron", RECIPES_Tools.craftingToolWrench, "plateAnyIron",
+ RECIPE_IronPlatedBricks);
+
+
Utils.LOG_INFO("Done loading recipes for the Various machine blocks.");
diff --git a/src/Java/miscutil/core/item/tool/Loader_TOOLS.java b/src/Java/miscutil/core/handler/registration/RECIPES_Tools.java
index bd917df75f..b40327fceb 100644
--- a/src/Java/miscutil/core/item/tool/Loader_TOOLS.java
+++ b/src/Java/miscutil/core/handler/registration/RECIPES_Tools.java
@@ -1,4 +1,4 @@
-package miscutil.core.item.tool;
+package miscutil.core.handler.registration;
import miscutil.core.item.ModItems;
import miscutil.core.util.ItemUtils;
@@ -10,7 +10,7 @@ import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraftforge.oredict.OreDictionary;
-public class Loader_TOOLS {
+public class RECIPES_Tools {
//Outputs
static ItemStack RECIPE_StaballoyPickaxe = new ItemStack(ModItems.itemStaballoyPickaxe);
@@ -118,17 +118,17 @@ public class Loader_TOOLS {
static ItemStack sandHammer = new ItemStack (ModItems.itemSandstoneHammer, 1, OreDictionary.WILDCARD_VALUE);
static String craftingToolSandHammer = "craftingToolSandHammer";
- public static final void run(){
+ public static final void RECIPES_LOAD(){
//plateStaballoy = new ItemStack(ModItems.itemPlateStaballoy);
//ingotStaballoy = new ItemStack(ModItems.itemIngotStaballoy);
//Pickaxes
- registerPickaxes();
+ run();
}
- private static void registerPickaxes(){
+ private static void run(){
//Staballoy Pickaxe
ItemUtils.recipeBuilder(
plateStaballoy, plateStaballoy, ingotStaballoy,
diff --git a/src/Java/miscutil/core/handler/registration/RegistrationHandler.java b/src/Java/miscutil/core/handler/registration/RegistrationHandler.java
new file mode 100644
index 0000000000..8c66bb1cc9
--- /dev/null
+++ b/src/Java/miscutil/core/handler/registration/RegistrationHandler.java
@@ -0,0 +1,25 @@
+package miscutil.core.handler.registration;
+
+import miscutil.core.util.Utils;
+
+public class RegistrationHandler {
+
+ public static int recipesSuccess = 0;
+ public static int recipesFailed = 0;
+
+ public static void run(){
+ init();
+ }
+
+ private final static void init(){
+ RECIPES_Tools.RECIPES_LOAD();
+ RECIPES_Machines.RECIPES_LOAD();
+ try {
+ Thread.sleep(10);
+ } catch (InterruptedException e) {
+ Utils.LOG_INFO(e.toString());
+ }
+ Utils.LOG_INFO("Loaded: "+recipesSuccess+" Failed: "+recipesFailed);
+ }
+
+}
diff --git a/src/Java/miscutil/core/util/ItemUtils.java b/src/Java/miscutil/core/util/ItemUtils.java
index e2c07aa104..f6403f8d2e 100644
--- a/src/Java/miscutil/core/util/ItemUtils.java
+++ b/src/Java/miscutil/core/util/ItemUtils.java
@@ -2,6 +2,7 @@ package miscutil.core.util;
import java.util.ArrayList;
+import miscutil.core.handler.registration.RegistrationHandler;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraftforge.oredict.ShapedOreRecipe;
@@ -12,35 +13,35 @@ public class ItemUtils {
public static ItemStack getItemStackOfItem(Boolean modToCheck, String mod_itemname_meta){
if (modToCheck){
try{
- Item em = null;
-
- Item em1 = Utils.getItem(mod_itemname_meta);
- Utils.LOG_WARNING("Found: "+em1.toString());
- if (!em1.equals(null)){
- em = em1;
- }
- else {
- em = null;
+ Item em = null;
+
+ Item em1 = Utils.getItem(mod_itemname_meta);
+ Utils.LOG_WARNING("Found: "+em1.toString());
+ if (!em1.equals(null)){
+ em = em1;
+ }
+ else {
+ em = null;
+ return null;
+ }
+ if (!em.equals(null)){
+ ItemStack returnStack = new ItemStack(em,1,16);
+ return returnStack;
+ }
+ Utils.LOG_WARNING(mod_itemname_meta+" not found.");
return null;
- }
- if (!em.equals(null)){
- ItemStack returnStack = new ItemStack(em,1,16);
- return returnStack;
- }
- Utils.LOG_WARNING(mod_itemname_meta+" not found.");
- return null;
} catch (NullPointerException e) {
Utils.LOG_ERROR(mod_itemname_meta+" not found. [NULL]");
return null;
- }
+ }
}
return null;
}
public static void recipeBuilder(Object slot_1, Object slot_2, Object slot_3, Object slot_4, Object slot_5, Object slot_6, Object slot_7, Object slot_8, Object slot_9, ItemStack resultItem){
-
+
ArrayList<Object> validSlots = new ArrayList<Object>();
-
+
//, String lineFirst, String lineSecond, String lineThird
Utils.LOG_INFO("Trying to add a recipe for "+resultItem.toString());
String a,b,c,d,e,f,g,h,i;
@@ -63,8 +64,8 @@ public class ItemUtils {
Utils.LOG_WARNING(h);
if (slot_9 == null){ i = " ";} else { i = "9";validSlots.add('9');validSlots.add(slot_9);}
Utils.LOG_WARNING(i);
-
-
+
+
Utils.LOG_ERROR("_______");
String lineOne = a+b+c;
Utils.LOG_ERROR("|"+a+"|"+b+"|"+c+"|");
@@ -75,7 +76,7 @@ public class ItemUtils {
String lineThree = g+h+i;
Utils.LOG_ERROR("|"+g+"|"+h+"|"+i+"|");
Utils.LOG_ERROR("_______");
-
+
validSlots.add(0, lineOne);
validSlots.add(1, lineTwo);
validSlots.add(2, lineThree);
@@ -111,46 +112,52 @@ public class ItemUtils {
}
}
}
-
+
try {
- Utils.LOG_WARNING("validSlots to array: "+validSlots.toArray());
+ /*Utils.LOG_WARNING("validSlots to array: "+validSlots.toArray());
Object[] validSlotsArray = (Object[]) validSlots.toArray();
-
+
for(int j = 0; j < validSlotsArray.length; j++)
{
Utils.LOG_ERROR(""+validSlotsArray[j]);
- }
+ }*/
+
+ GameRegistry.addRecipe(new ShapedOreRecipe(resultItem.copy(), (Object[]) validSlots.toArray()));
+ Utils.LOG_INFO("Success! Added a recipe for "+resultItem.toString());
+ RegistrationHandler.recipesSuccess++;
+ /*try {
try {
try {
- try {
- GameRegistry.addRecipe(new ShapedOreRecipe(resultItem.copy(), (Object[]) validSlots.toArray()));
- Utils.LOG_INFO("Success! Added a recipe for "+resultItem.toString());
- }
- catch (ClassCastException r){
+ //Code
+ }
+ catch (NullPointerException | ClassCastException r){
Utils.LOG_WARNING("@@@: Invalid Recipe detected for: "+resultItem.getUnlocalizedName());
+ RegistrationHandler.recipesFailed++;
r.printStackTrace();
- System.exit(1);
+ //System.exit(1);
}
}
catch (NullPointerException o){
-
+
Utils.LOG_WARNING("@@@: Invalid Recipe detected for: "+resultItem.getUnlocalizedName());
o.printStackTrace();
- System.exit(1);
+ RegistrationHandler.recipesFailed++;
+ //System.exit(1);
}
}
catch (ClassCastException r){
Utils.LOG_WARNING("@@@: Casting to ObjectArray Failed :(");
- }
+ }*/
}
- catch(NullPointerException k){
+ catch(NullPointerException | ClassCastException k){
k.getMessage();
k.getClass();
k.printStackTrace();
k.getLocalizedMessage();
Utils.LOG_WARNING("@@@: Invalid Recipe detected for: "+resultItem.getUnlocalizedName());
- System.exit(1);
+ RegistrationHandler.recipesFailed++;
+ //System.exit(1);
}
}
-
+
}
generated by cgit (git 2.46.0) at 2025-03-10 04:01:54 +0000