aboutsummaryrefslogtreecommitdiff
path: root/src/Java/miscutil/core/xmod/gregtech
diff options
context:
space:
mode:
authorDraknyte1 <Draknyte1@hotmail.com>2016-07-25 16:14:54 +1000
committerDraknyte1 <Draknyte1@hotmail.com>2016-07-25 16:14:54 +1000
commit15c7bda5eaa25b451b44b7cb8cf2e0f602ad3e6d (patch)
tree6355f38f197dfbed0e46cec85cfa6db6a4183243 /src/Java/miscutil/core/xmod/gregtech
parent683c8e9c36330198922511750a1f25b6ce4d5f17 (diff)
downloadGT5-Unofficial-15c7bda5eaa25b451b44b7cb8cf2e0f602ad3e6d.tar.gz
GT5-Unofficial-15c7bda5eaa25b451b44b7cb8cf2e0f602ad3e6d.tar.bz2
GT5-Unofficial-15c7bda5eaa25b451b44b7cb8cf2e0f602ad3e6d.zip
+ Began work adding hot ingot system that uses GT to generate them.
+ Continued work on the GT-alike material class, from which to generate items. (Added Staballoy, Tantalloy 60 & 61, EnderIO Alloys, BR Materials) + Adding debug logging to the centrifuge. + Added Shading to Batteries, to differentiate them. + Added in blast furnace recipes for Staballoy. % Changed a few recipes and how they're handle.
Diffstat (limited to 'src/Java/miscutil/core/xmod/gregtech')
-rw-r--r--src/Java/miscutil/core/xmod/gregtech/HANDLER_GT.java5
-rw-r--r--src/Java/miscutil/core/xmod/gregtech/api/enums/GregtechOrePrefixes.java40
-rw-r--r--src/Java/miscutil/core/xmod/gregtech/api/items/Gregtech_Generic_Item.java10
-rw-r--r--src/Java/miscutil/core/xmod/gregtech/api/items/Gregtech_MetaItem_Base.java12
-rw-r--r--src/Java/miscutil/core/xmod/gregtech/api/items/Gregtech_MetaItem_X32.java12
-rw-r--r--src/Java/miscutil/core/xmod/gregtech/common/Meta_GT_Proxy.java36
-rw-r--r--src/Java/miscutil/core/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialCentrifuge.java4
-rw-r--r--src/Java/miscutil/core/xmod/gregtech/loaders/Processing_HotIngots.java23
8 files changed, 122 insertions, 20 deletions
diff --git a/src/Java/miscutil/core/xmod/gregtech/HANDLER_GT.java b/src/Java/miscutil/core/xmod/gregtech/HANDLER_GT.java
index 47bbc0aa81..211e120247 100644
--- a/src/Java/miscutil/core/xmod/gregtech/HANDLER_GT.java
+++ b/src/Java/miscutil/core/xmod/gregtech/HANDLER_GT.java
@@ -4,22 +4,23 @@ import gregtech.api.util.GT_Config;
import miscutil.core.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
import miscutil.core.xmod.gregtech.common.blocks.fluid.GregtechFluidHandler;
import miscutil.core.xmod.gregtech.common.items.MetaGeneratedGregtechItems;
+import miscutil.core.xmod.gregtech.loaders.Processing_HotIngots;
public class HANDLER_GT {
public static GT_Config mMaterialProperties = null;
public static void preInit(){
+ new MetaGeneratedGregtechItems();
if (mMaterialProperties != null){
GT_Materials.init(mMaterialProperties);
GregtechFluidHandler.run();
- new MetaGeneratedGregtechItems();
//new MetaGeneratedGregtechTools();
//new Processing_Ingot1();
//new Processing_Plate1();
//new Processing_Block();
}
-
+ new Processing_HotIngots();
}
public static void init(){
diff --git a/src/Java/miscutil/core/xmod/gregtech/api/enums/GregtechOrePrefixes.java b/src/Java/miscutil/core/xmod/gregtech/api/enums/GregtechOrePrefixes.java
index 67a3ff4332..75f4ecdcbc 100644
--- a/src/Java/miscutil/core/xmod/gregtech/api/enums/GregtechOrePrefixes.java
+++ b/src/Java/miscutil/core/xmod/gregtech/api/enums/GregtechOrePrefixes.java
@@ -49,7 +49,7 @@ public enum GregtechOrePrefixes {
* Ultimate (Tier 8) : Data Orb and Lapotronic Energy Orb
* Infinite (Cheaty)
*/
-
+ ingotHot("Hot Ingots", "Hot ", " Ingot", true, true, false, false, false, false, false, true, false, false, B[1], M * 1, 16, 12), // A hot Ingot, which has to be cooled down by a Vacuum Freezer.
ingot("Ingots", "", " Ingot", true, true, false, false, false, false, false, true, false, false, B[1], M * 1, 64, 11), // A regular Ingot. Introduced by Eloraam
dustTiny("Tiny Dusts", "Tiny Pile of ", " Dust", true, true, false, false, false, false, false, true, false, false, B[0] | B[1] | B[2] | B[3], M / 9, 64, 0), // 1/9th of a Dust.
dustSmall("Small Dusts", "Small Pile of ", " Dust", true, true, false, false, false, false, false, true, false, false, B[0] | B[1] | B[2] | B[3], M / 4, 64, 1), // 1/4th of a Dust.
@@ -78,7 +78,13 @@ public enum GregtechOrePrefixes {
chipset("Chipsets", "", "", true, true, false, false, false, false, false, false, false, false, 0, -1, 64, -1), // Introduced by Buildcraft
computer("Computers", "", "", true, true, false, false, true, false, false, false, false, false, 0, -1, 64, -1); // A whole Computer. "computerMaster" = ComputerCube
- //public static volatile int VERSION = 508;
+ public static volatile int VERSION = 508;
+
+ static {
+
+ ingotHot.mHeatDamage = 3.0F;
+
+ }
public final ArrayList<ItemStack> mPrefixedItems = new ArrayList<ItemStack>();
public final short mTextureIndex;
@@ -300,16 +306,26 @@ public enum GregtechOrePrefixes {
*/
Symbiotic(-1, TextureSet.SET_NONE, 1.0F, 0, 0, 0, 255, 255, 255, 0, "IV Tier", 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeLightGray, Arrays.asList(new TC_AspectStack(TC_Aspects.ELECTRUM, 4), new TC_AspectStack(TC_Aspects.MACHINA, 4))),
Neutronic(-1, TextureSet.SET_NONE, 1.0F, 0, 0, 0, 255, 255, 255, 0, "LuV Tier", 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeLightGray, Arrays.asList(new TC_AspectStack(TC_Aspects.ELECTRUM, 6), new TC_AspectStack(TC_Aspects.MACHINA, 6))),
- Quantum(-1, TextureSet.SET_NONE, 1.0F, 0, 0, 0, 255, 255, 255, 0, "ZPM Tier", 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeLightGray, Arrays.asList(new TC_AspectStack(TC_Aspects.ELECTRUM, 8), new TC_AspectStack(TC_Aspects.MACHINA, 8)));
-
- /*Advanced(-1, TextureSet.SET_NONE, 1.0F, 0, 0, 0, 255, 255, 255, 0, "Advanced", 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeLightGray, Arrays.asList(new TC_AspectStack(TC_Aspects.MACHINA, 4))),
- Data(-1, TextureSet.SET_NONE, 1.0F, 0, 0, 0, 255, 255, 255, 0, "Data", 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeLightGray, Arrays.asList(new TC_AspectStack(TC_Aspects.MACHINA, 5))),
- Elite(-1, TextureSet.SET_NONE, 1.0F, 0, 0, 0, 255, 255, 255, 0, "Elite", 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeLightGray, Arrays.asList(new TC_AspectStack(TC_Aspects.MACHINA, 6))),
- Master(-1, TextureSet.SET_NONE, 1.0F, 0, 0, 0, 255, 255, 255, 0, "Master", 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeLightGray, Arrays.asList(new TC_AspectStack(TC_Aspects.MACHINA, 7))),
- Ultimate(-1, TextureSet.SET_NONE, 1.0F, 0, 0, 0, 255, 255, 255, 0, "Ultimate", 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeLightGray, Arrays.asList(new TC_AspectStack(TC_Aspects.MACHINA, 8))),
- Superconductor(-1, TextureSet.SET_NONE, 1.0F, 0, 0, 0, 255, 255, 255, 0, "Superconductor", 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeLightGray, Arrays.asList(new TC_AspectStack(TC_Aspects.ELECTRUM, 8))),
- Infinite(-1, TextureSet.SET_NONE, 1.0F, 0, 0, 0, 255, 255, 255, 0, "Infinite", 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeLightGray);*/
-
+ Quantum(-1, TextureSet.SET_NONE, 1.0F, 0, 0, 0, 255, 255, 255, 0, "ZPM Tier", 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeLightGray, Arrays.asList(new TC_AspectStack(TC_Aspects.ELECTRUM, 8), new TC_AspectStack(TC_Aspects.MACHINA, 8))),
+
+
+ Staballoy(30, TextureSet.SET_ROUGH, 10.0F, 5120, 4, 1 | 2 | 16 | 32 | 64 | 128, 248, 255, 46, 0, "Staballoy", 0, 0, 1500, 2800, true, false, 1, 3, 1, Dyes.dyeGreen, 2, Arrays.asList(new MaterialStack(Materials.Titanium, 1), new MaterialStack(Materials.Uranium, 9)), Arrays.asList(new TC_AspectStack(TC_Aspects.METALLUM, 8), new TC_AspectStack(TC_Aspects.STRONTIO, 3))),
+ Bedrockium(31, TextureSet.SET_FINE, 8.0F, 8196, 3, 1 | 2 | 16 | 32 | 64 | 128, 39, 39, 39, 0, "Bedrockium", 0, 0, -1, 0, false, false, 1, 5, 1, Dyes.dyeLightGray, 2, Arrays.asList(new MaterialStack(Materials.Carbon, 63), new MaterialStack(Materials.Carbon, 56)), Arrays.asList(new TC_AspectStack(TC_Aspects.VACUOS, 8), new TC_AspectStack(TC_Aspects.TUTAMEN, 3))),
+ BloodSteel(32, TextureSet.SET_METALLIC, 11.0F, 768, 4, 1 | 2 | 16 | 32 | 64 | 128, 142, 28, 0, 0, "Blood Steel", 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeRed, 2, Arrays.asList(new MaterialStack(Materials.Steel, 3)), Arrays.asList(new TC_AspectStack(TC_Aspects.VICTUS, 8), new TC_AspectStack(TC_Aspects.IGNIS, 3))),
+ VoidMetal(33, TextureSet.SET_METALLIC, 6.0F, 1280, 3, 1 | 2 | 16 | 32 | 64 | 128, 82, 17, 82, 0, "Void Metal", 0, 0, -1, 0, false, false, 3, 1, 1, Dyes.dyeBlack, Arrays.asList(new TC_AspectStack(TC_Aspects.PRAECANTATIO, 5), new TC_AspectStack(TC_Aspects.VACUOS, 7))),
+ ConductiveIron(34, TextureSet.SET_METALLIC, 5.0F, 256, 2, 1 | 2, 164, 109, 100, 0, "Conductive Iron", 0, 0, -1, 0, false, false, 3, 1, 1, Dyes.dyeRed, 2, Arrays.asList(new MaterialStack(Materials.Iron, 6), new MaterialStack(Materials.Redstone, 2)), Arrays.asList(new TC_AspectStack(TC_Aspects.POTENTIA, 2), new TC_AspectStack(TC_Aspects.METALLUM, 2))),
+ ElectricalSteel(35, TextureSet.SET_METALLIC, 7.0F, 768, 3, 1 | 2 | 64 | 128, 194, 194, 194, 0, "Electrical Steel", 0, 0, 1811, 1000, true, false, 3, 1, 1, Dyes.dyeLightGray, 2, Arrays.asList(new MaterialStack(Materials.Iron, 3), new MaterialStack(Materials.Coal, 2), new MaterialStack(Materials.Silicon, 2)), Arrays.asList(new TC_AspectStack(TC_Aspects.MAGNETO, 2), new TC_AspectStack(TC_Aspects.ELECTRUM, 5))),
+ EnergeticAlloy(36, TextureSet.SET_SHINY, 5.0F, 512, 3, 1 | 2 | 64 | 128, 252, 152, 45, 0, "Energetic Alloy", 0, 0, -1, 0, false, false, 3, 1, 1, Dyes.dyeOrange, 2, Arrays.asList(new MaterialStack(Materials.Gold, 3), new MaterialStack(Materials.Glowstone, 2), new MaterialStack(Materials.Redstone, 2)), Arrays.asList(new TC_AspectStack(TC_Aspects.POTENTIA, 4), new TC_AspectStack(TC_Aspects.LUX, 3))),
+ VibrantAlloy(37, TextureSet.SET_SHINY, 7.0F, 1280, 4, 1 | 2 | 64 | 128, 204, 242, 142, 0, "Vibrant Alloy", 0, 0, -1, 0, false, false, 3, 1, 1, Dyes.dyeLime, 2, Arrays.asList(new MaterialStack(Materials.EnergeticAlloy, 1), new MaterialStack(Materials.EnderPearl, 3)), Arrays.asList(new TC_AspectStack(TC_Aspects.MACHINA, 5), new TC_AspectStack(TC_Aspects.TELUM, 4))),
+ PulsatingIron(38, TextureSet.SET_SHINY, 5.0F, 256, 2, 1 | 2 | 64 | 128, 50, 91, 21, 0, "Pulsating Iron", 0, 0, -1, 0, false, false, 3, 1, 1, Dyes.dyeGreen, 2, Arrays.asList(new MaterialStack(Materials.Iron, 2), new MaterialStack(Materials.EnderPearl, 2)), Arrays.asList(new TC_AspectStack(TC_Aspects.ALIENIS, 3), new TC_AspectStack(TC_Aspects.METALLUM, 3))),
+ /* TODO*/ RedstoneAlloy(39, TextureSet.SET_METALLIC, 1.0F, 256, 2, 1|2|16|32|64, 178,34,34, 0, "Redstone Alloy", 0, 0, -1, 0, false, false, 3, 1, 1, Dyes.dyeRed, 2, Arrays.asList(new MaterialStack(Materials.Iron, 2), new MaterialStack(Materials.Redstone, 4))),
+
+ //Needs more Use, I think.
+ Tantaloy60(40, TextureSet.SET_DULL, 8.0F, 5120, 3, 1 | 2 | 16 | 32 | 64 | 128, 213, 231, 237, 0, "Tantaloy 60", 0, 0, 3035, 2200, true, false, 1, 2, 1, Dyes.dyeLightGray, 2, Arrays.asList(new MaterialStack(Materials.Tungsten, 1), new MaterialStack(Materials.Tantalum, 9)), Arrays.asList(new TC_AspectStack(TC_Aspects.METALLUM, 8), new TC_AspectStack(TC_Aspects.STRONTIO, 3))),
+ Tantaloy61(41, TextureSet.SET_DULL, 7.0F, 5120, 2, 1 | 2 | 16 | 32 | 64 | 128, 193, 211, 217, 0, "Tantaloy 61", 0, 0, 3015, 2150, true, false, 1, 2, 1, Dyes.dyeLightGray, 2, Arrays.asList(new MaterialStack(Materials.Tungsten, 1), new MaterialStack(Materials.Tantalum, 9), new MaterialStack(Materials.Titanium, 1)), Arrays.asList(new TC_AspectStack(TC_Aspects.METALLUM, 8), new TC_AspectStack(TC_Aspects.STRONTIO, 3)));
+
+
+
/**
* List of all Materials.
*/
diff --git a/src/Java/miscutil/core/xmod/gregtech/api/items/Gregtech_Generic_Item.java b/src/Java/miscutil/core/xmod/gregtech/api/items/Gregtech_Generic_Item.java
index 7eaeacf23d..eed3a228cd 100644
--- a/src/Java/miscutil/core/xmod/gregtech/api/items/Gregtech_Generic_Item.java
+++ b/src/Java/miscutil/core/xmod/gregtech/api/items/Gregtech_Generic_Item.java
@@ -10,6 +10,7 @@ import java.util.List;
import miscutil.core.creative.AddToCreativeTab;
import miscutil.core.lib.CORE;
+import miscutil.core.util.Utils;
import net.minecraft.block.BlockDispenser;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.dispenser.BehaviorDefaultDispenseItem;
@@ -168,6 +169,15 @@ public class Gregtech_Generic_Item extends Item implements IProjectileItem {
else if (stack.getDisplayName().contains("MAX")){
HEX_OxFFFFFF = 0xff0000;
}
+ else if (stack.getDisplayName().contains("Sodium")){
+ HEX_OxFFFFFF = Utils.rgbtoHexValue(0, 0, 150);
+ }
+ else if (stack.getDisplayName().contains("Cadmium")){
+ HEX_OxFFFFFF = Utils.rgbtoHexValue(50, 50, 60);
+ }
+ else if (stack.getDisplayName().contains("Lithium")){
+ HEX_OxFFFFFF = Utils.rgbtoHexValue(225, 220, 255);
+ }
else {
HEX_OxFFFFFF = 0xffffff;
}
diff --git a/src/Java/miscutil/core/xmod/gregtech/api/items/Gregtech_MetaItem_Base.java b/src/Java/miscutil/core/xmod/gregtech/api/items/Gregtech_MetaItem_Base.java
index f58120e06a..5a05800863 100644
--- a/src/Java/miscutil/core/xmod/gregtech/api/items/Gregtech_MetaItem_Base.java
+++ b/src/Java/miscutil/core/xmod/gregtech/api/items/Gregtech_MetaItem_Base.java
@@ -16,6 +16,7 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
+import miscutil.core.util.Utils;
import miscutil.core.xmod.gregtech.api.interfaces.internal.Interface_ItemBehaviour;
import net.minecraft.dispenser.IBlockSource;
import net.minecraft.entity.Entity;
@@ -528,7 +529,7 @@ public abstract class Gregtech_MetaItem_Base extends Gregtech_Generic_Item imple
}
@Override
- public int getColorFromItemStack(ItemStack stack, int HEX_OxFFFFFF) {
+ public int getColorFromItemStack(ItemStack stack, int HEX_OxFFFFFF) {
if (stack.getDisplayName().contains("LuV")){
HEX_OxFFFFFF = 0xffffcc;
}
@@ -541,6 +542,15 @@ public abstract class Gregtech_MetaItem_Base extends Gregtech_Generic_Item imple
else if (stack.getDisplayName().contains("MAX")){
HEX_OxFFFFFF = 0xff0000;
}
+ else if (stack.getDisplayName().contains("Sodium")){
+ HEX_OxFFFFFF = Utils.rgbtoHexValue(0, 0, 150);
+ }
+ else if (stack.getDisplayName().contains("Cadmium")){
+ HEX_OxFFFFFF = Utils.rgbtoHexValue(50, 50, 60);
+ }
+ else if (stack.getDisplayName().contains("Lithium")){
+ HEX_OxFFFFFF = Utils.rgbtoHexValue(225, 220, 255);
+ }
else {
HEX_OxFFFFFF = 0xffffff;
}
diff --git a/src/Java/miscutil/core/xmod/gregtech/api/items/Gregtech_MetaItem_X32.java b/src/Java/miscutil/core/xmod/gregtech/api/items/Gregtech_MetaItem_X32.java
index b66c84bef8..c8eca07595 100644
--- a/src/Java/miscutil/core/xmod/gregtech/api/items/Gregtech_MetaItem_X32.java
+++ b/src/Java/miscutil/core/xmod/gregtech/api/items/Gregtech_MetaItem_X32.java
@@ -12,6 +12,7 @@ import gregtech.api.util.GT_Utility;
import java.util.Arrays;
import java.util.List;
+import miscutil.core.util.Utils;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
@@ -173,7 +174,7 @@ public abstract class Gregtech_MetaItem_X32 extends Gregtech_MetaItem {
}
@Override
- public int getColorFromItemStack(ItemStack stack, int HEX_OxFFFFFF) {
+ public int getColorFromItemStack(ItemStack stack, int HEX_OxFFFFFF) {
if (stack.getDisplayName().contains("LuV")){
HEX_OxFFFFFF = 0xffffcc;
}
@@ -186,6 +187,15 @@ public abstract class Gregtech_MetaItem_X32 extends Gregtech_MetaItem {
else if (stack.getDisplayName().contains("MAX")){
HEX_OxFFFFFF = 0xff6500;
}
+ else if (stack.getDisplayName().contains("Sodium")){
+ HEX_OxFFFFFF = Utils.rgbtoHexValue(90, 90, 255);
+ }
+ else if (stack.getDisplayName().contains("Cadmium")){
+ HEX_OxFFFFFF = Utils.rgbtoHexValue(150, 150, 80);
+ }
+ else if (stack.getDisplayName().contains("Lithium")){
+ HEX_OxFFFFFF = Utils.rgbtoHexValue(225, 220, 255);
+ }
else {
HEX_OxFFFFFF = 0xffffff;
}
diff --git a/src/Java/miscutil/core/xmod/gregtech/common/Meta_GT_Proxy.java b/src/Java/miscutil/core/xmod/gregtech/common/Meta_GT_Proxy.java
index 45930a3977..0da4b19ee7 100644
--- a/src/Java/miscutil/core/xmod/gregtech/common/Meta_GT_Proxy.java
+++ b/src/Java/miscutil/core/xmod/gregtech/common/Meta_GT_Proxy.java
@@ -4,10 +4,12 @@ import gregtech.api.GregTech_API;
import gregtech.api.enums.ConfigCategories;
import gregtech.api.enums.Dyes;
import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.Materials;
import gregtech.api.util.GT_LanguageManager;
import gregtech.api.util.GT_Log;
import gregtech.api.util.GT_Recipe;
import gregtech.api.util.GT_Utility;
+import gregtech.common.GT_Proxy.OreDictEventContainer;
import java.util.Arrays;
import java.util.Collection;
@@ -15,6 +17,7 @@ import java.util.HashSet;
import java.util.Iterator;
import miscutil.core.lib.CORE;
+import miscutil.core.util.Utils;
import miscutil.core.xmod.gregtech.api.enums.GregtechOrePrefixes;
import miscutil.core.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
import miscutil.core.xmod.gregtech.api.objects.GregtechFluid;
@@ -83,6 +86,16 @@ public class Meta_GT_Proxy {
public final static HashSet<ItemStack> mRegisteredOres = new HashSet(10000);
public final static Collection<GregtechOreDictEventContainer> mEvents = new HashSet();
+ public Meta_GT_Proxy() {
+ Utils.LOG_INFO("GT_PROXY - initialized.");
+ for (String tOreName : OreDictionary.getOreNames()) {
+ ItemStack tOreStack;
+ for (Iterator i$ = OreDictionary.getOres(tOreName).iterator(); i$.hasNext(); registerOre(new OreDictionary.OreRegisterEvent(tOreName, tOreStack))) {
+ tOreStack = (ItemStack) i$.next();
+ }
+ }
+ }
+
public static Fluid addFluid(String aName, String aLocalized, GT_Materials aMaterial, int aState, int aTemperatureK) {
return addFluid(aName, aLocalized, aMaterial, aState, aTemperatureK, null, null, 0);
}
@@ -326,7 +339,24 @@ public class Meta_GT_Proxy {
// System.out.println("Thingy Name: "+ aOre.mEvent.Name+ " !!!Unknown 'Thingy' detected!!! This Object seems to probably not follow a valid OreDictionary Convention, or I missed a Convention. Please report to GregTech Intergalactical for additional compatiblity. This is not an Error, an Issue nor a Lag Source, it is just an Information, which you should pass to me.");
}
}
-
+
+ private static final void registerRecipes(OreDictEventContainer aOre) {
+ if ((aOre.mEvent.Ore == null) || (aOre.mEvent.Ore.getItem() == null)) {
+ return;
+ }
+ if (aOre.mEvent.Ore.stackSize != 1) {
+ aOre.mEvent.Ore.stackSize = 1;
+ }
+ if (aOre.mPrefix != null) {
+ if (!aOre.mPrefix.isIgnored(aOre.mMaterial)) {
+ aOre.mPrefix.processOre(aOre.mMaterial == null ? Materials._NULL : aOre.mMaterial, aOre.mEvent.Name, aOre.mModID,
+ GT_Utility.copyAmount(1L, new Object[]{aOre.mEvent.Ore}));
+ }
+ } else {
+ // System.out.println("Thingy Name: "+ aOre.mEvent.Name+ " !!!Unknown 'Thingy' detected!!! This Object seems to probably not follow a valid OreDictionary Convention, or I missed a Convention. Please report to GregTech Intergalactical for additional compatiblity. This is not an Error, an Issue nor a Lag Source, it is just an Information, which you should pass to me.");
+ }
+ }
+
public static void registerUnificationEntries() {
GregTech_API.sUnification.mConfig.save();
GregTech_API.sUnification.mConfig.load();
@@ -334,7 +364,7 @@ public class Meta_GT_Proxy {
for (GregtechOreDictEventContainer tOre : mEvents) {
if ((!(tOre.mEvent.Ore.getItem() instanceof MetaGeneratedGregtechItems)) && (tOre.mPrefix != null) && (tOre.mPrefix.mIsUnificatable)
&& (tOre.mMaterial != null)) {
- if (GregtechOreDictUnificator.isBlacklisted(tOre.mEvent.Ore)) {
+ if (GregtechOreDictUnificator.isBlacklisted(tOre.mEvent.Ore)) {
GregtechOreDictUnificator.addAssociation(tOre.mPrefix, tOre.mMaterial, tOre.mEvent.Ore, true);
} else {
GregtechOreDictUnificator.addAssociation(tOre.mPrefix, tOre.mMaterial, tOre.mEvent.Ore, false);
@@ -382,7 +412,7 @@ public class Meta_GT_Proxy {
this.mModID = ((aModID == null) || (aModID.equals("UNKNOWN")) ? null : aModID);
}
}
-
+
public static boolean areWeUsingGregtech5uExperimental(){
int version = GregTech_API.VERSION;
if (version == 508){
diff --git a/src/Java/miscutil/core/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialCentrifuge.java b/src/Java/miscutil/core/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialCentrifuge.java
index f3194c3742..e0c1376d45 100644
--- a/src/Java/miscutil/core/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialCentrifuge.java
+++ b/src/Java/miscutil/core/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialCentrifuge.java
@@ -73,7 +73,6 @@ extends GregtechMeta_MultiBlockBase {
"1x Input Bus",
"1x Output Bus",
"1x [EV] Energy Hatch (Can be higher Tier) [Blue]",
- "Needs a Turbine Item (inside controller GUI)",
"Centrifuge Casings for the rest (16 at least)",};
}
@@ -152,6 +151,7 @@ extends GregtechMeta_MultiBlockBase {
for (; i < machines; i++) {
if (!tRecipe.isRecipeInputEqual(true, tFluids, tInputs)) {
if (i == 0) {
+ Utils.LOG_INFO("false 1");
return false;
}
break;
@@ -220,9 +220,11 @@ extends GregtechMeta_MultiBlockBase {
this.mOutputFluids = new FluidStack[]{tFOut};
updateSlots();
//recipesComplete++;
+ Utils.LOG_INFO("true 1");
return true;
}
}
+ Utils.LOG_INFO("false 2");
return false;
}
diff --git a/src/Java/miscutil/core/xmod/gregtech/loaders/Processing_HotIngots.java b/src/Java/miscutil/core/xmod/gregtech/loaders/Processing_HotIngots.java
new file mode 100644
index 0000000000..070ce08ce0
--- /dev/null
+++ b/src/Java/miscutil/core/xmod/gregtech/loaders/Processing_HotIngots.java
@@ -0,0 +1,23 @@
+package miscutil.core.xmod.gregtech.loaders;
+
+import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.OrePrefixes;
+import gregtech.api.util.GT_OreDictUnificator;
+import gregtech.api.util.GT_Utility;
+import miscutil.core.util.Utils;
+import miscutil.core.xmod.gregtech.api.enums.GregtechOrePrefixes;
+import miscutil.core.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
+import miscutil.core.xmod.gregtech.api.interfaces.internal.Interface_OreRecipeRegistrator;
+import net.minecraft.item.ItemStack;
+
+public class Processing_HotIngots implements Interface_OreRecipeRegistrator {
+ public Processing_HotIngots() {
+ Utils.LOG_INFO("Generating Hot Ingot.");
+ GregtechOrePrefixes.ingotHot.add(this);
+ }
+
+ @Override
+ public void registerOre(GregtechOrePrefixes aPrefix, GT_Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) {
+ GT_Values.RA.addVacuumFreezerRecipe(GT_Utility.copyAmount(1L, new Object[]{aStack}), GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 1L), (int) Math.max(aMaterial.getMass() * 3L, 1L));
+ }
+}