diff options
Diffstat (limited to 'src/Java/gtPlusPlus/core')
| -rw-r--r-- | src/Java/gtPlusPlus/core/common/CommonProxy.java | 2 | ||||
| -rw-r--r-- | src/Java/gtPlusPlus/core/item/chemistry/GenericChem.java | 18 | ||||
| -rw-r--r-- | src/Java/gtPlusPlus/core/material/MaterialGenerator.java | 7 |
3 files changed, 14 insertions, 13 deletions
diff --git a/src/Java/gtPlusPlus/core/common/CommonProxy.java b/src/Java/gtPlusPlus/core/common/CommonProxy.java index f77938f713..c038afce8f 100644 --- a/src/Java/gtPlusPlus/core/common/CommonProxy.java +++ b/src/Java/gtPlusPlus/core/common/CommonProxy.java @@ -219,7 +219,7 @@ public class CommonProxy { } public void registerCustomItemsForMaterials() { - Material.registerComponentForMaterial(GenericChem.CARBYNE, OrePrefixes.plate, GregtechItemList.Carbyne_Sheet_Finished.get(1)); + //Material.registerComponentForMaterial(GenericChem.CARBYNE, OrePrefixes.plate, GregtechItemList.Carbyne_Sheet_Finished.get(1)); } public void registerCustomMobDrops() { diff --git a/src/Java/gtPlusPlus/core/item/chemistry/GenericChem.java b/src/Java/gtPlusPlus/core/item/chemistry/GenericChem.java index ecdc97357f..a42d179f65 100644 --- a/src/Java/gtPlusPlus/core/item/chemistry/GenericChem.java +++ b/src/Java/gtPlusPlus/core/item/chemistry/GenericChem.java @@ -36,9 +36,9 @@ public class GenericChem extends ItemPackage { * Materials */ - public static final Material BAKELITE = new Material("Bakelite", MaterialState.SOLID, TextureSet.SET_DULL, new short[]{90, 140, 140}, 120, 240, 23, 24, true, null, 0);//Not a GT Inherited Material - public static final Material NYLON = new Material("Nylon", MaterialState.SOLID, TextureSet.SET_SHINY, new short[]{45, 45, 45}, 300, 600, 44, 48, true, null, 0);//Not a GT Inherited Material - public static final Material CARBYNE = new Material("Carbyne", MaterialState.SOLID, TextureSet.SET_DULL, new short[]{25, 25, 25}, 2500, 5000, 63, 52, true, null, 0);//Not a GT Inherited Material + //public static final Material BAKELITE = new Material("Bakelite", MaterialState.SOLID, TextureSet.SET_DULL, new short[]{90, 140, 140}, 120, 240, 23, 24, true, null, 0);//Not a GT Inherited Material + //public static final Material NYLON = new Material("Nylon", MaterialState.SOLID, TextureSet.SET_SHINY, new short[]{45, 45, 45}, 300, 600, 44, 48, true, null, 0);//Not a GT Inherited Material + //public static final Material CARBYNE = new Material("Carbyne", MaterialState.SOLID, TextureSet.SET_DULL, new short[]{25, 25, 25}, 2500, 5000, 63, 52, true, null, 0);//Not a GT Inherited Material //Refined PTFE @@ -57,13 +57,7 @@ public class GenericChem extends ItemPackage { new MaterialStack(NONMATERIAL.PLASTIC, 15), new MaterialStack(ELEMENT.getInstance().CARBON, 5), new MaterialStack(ELEMENT.getInstance().SODIUM, 5) - });// Not a GT - // Inherited - // Material - - //public static final Material HYPOGEN = new Material("Hypogen", MaterialState.SOLID, TextureSets.NUCLEAR.get(), new short[]{220, 120, 75}, 12255, 19377, 240, 251, true, "Hy⚶", 0);//Not a GT Inherited Material - //public static final Material HYPOGEN = new Material("Hypogen", MaterialState.SOLID, TextureSets.NUCLEAR.get(), new short[]{220, 120, 75}, 12255, 19377, 240, 251, true, "Hy⚶", 0);//Not a GT Inherited Material - //public static final Material Nylon = new Material(); + }); /** * Fluids @@ -123,8 +117,8 @@ public class GenericChem extends ItemPackage { @Override public void items() { PhenolicResins = ItemUtils.generateSpecialUseDusts("phenolicresins", "Phenolic Resin", "HOC6H4CH2OH", Utils.rgbtoHexValue(80, 40, 40))[0]; - MaterialGenerator.generate(BAKELITE, false); - MaterialGenerator.generate(NYLON, false); + //MaterialGenerator.generate(BAKELITE, false); + //MaterialGenerator.generate(NYLON, false); MaterialGenerator.generate(TEFLON, false); mGenericChemItem1 = new ItemGenericChemBase(); diff --git a/src/Java/gtPlusPlus/core/material/MaterialGenerator.java b/src/Java/gtPlusPlus/core/material/MaterialGenerator.java index d3d901ed6e..85562c78b1 100644 --- a/src/Java/gtPlusPlus/core/material/MaterialGenerator.java +++ b/src/Java/gtPlusPlus/core/material/MaterialGenerator.java @@ -2,6 +2,9 @@ package gtPlusPlus.core.material; import java.util.Set; +import gregtech.api.enums.GT_Values; +import gregtech.api.enums.OrePrefixes; +import gregtech.api.util.GT_Utility; import gtPlusPlus.api.interfaces.RunnableWithInfo; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.api.objects.data.AutoMap; @@ -45,6 +48,7 @@ import gtPlusPlus.xmod.gregtech.loaders.RecipeGen_FluidCanning; import gtPlusPlus.xmod.gregtech.loaders.RecipeGen_Fluids; import gtPlusPlus.xmod.gregtech.loaders.RecipeGen_MaterialProcessing; import gtPlusPlus.xmod.gregtech.loaders.RecipeGen_Ore; +import gtPlusPlus.xmod.gregtech.loaders.RecipeGen_Plasma; import gtPlusPlus.xmod.gregtech.loaders.RecipeGen_Plates; import gtPlusPlus.xmod.gregtech.loaders.RecipeGen_Recycling; import gtPlusPlus.xmod.gregtech.loaders.RecipeGen_ShapedCrafting; @@ -217,6 +221,8 @@ public class MaterialGenerator { new RecipeGen_DustGeneration(matInfo); new RecipeGen_Recycling(matInfo); + new RecipeGen_Plasma(matInfo); + return true; } catch (final Throwable t) @@ -323,6 +329,7 @@ public class MaterialGenerator { new RecipeGen_MaterialProcessing(matInfo); new RecipeGen_DustGeneration(matInfo, true); new RecipeGen_Recycling(matInfo); + new RecipeGen_Plasma(matInfo); } catch (final Throwable t){ Logger.MATERIALS(""+matInfo.getLocalizedName()+" failed to generate."); |