Sangui/GT5-Unofficial
2
1
Fork 0
Code Issues 6 Pull requests Projects Releases Packages Wiki Activity Actions

comb processing fixes

Browse source
This commit is contained in:
Blood-Asp 2015-12-21 19:44:23 +01:00
parent 9781ccd9ee
commit a9aac6ff58
7 changed files with 25 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build.properties
View file

@ -1,7 +1,7 @@
minecraft.version=1.7.10 minecraft.version=1.7.10
forge.version=10.13.4.1517-1.7.10 forge.version=10.13.4.1517-1.7.10
gt.version=5.09.16 gt.version=5.09.17
ae2.version=rv2-beta-33 ae2.version=rv2-beta-33
applecore.version=1.7.10-1.2.1+107.59407 applecore.version=1.7.10-1.2.1+107.59407

2
src/main/java/gregtech/GT_Mod.java
View file

@ -230,7 +230,7 @@ public class GT_Mod
gregtechproxy.mDisableIC2Cables = tMainConfig.get("general", "DisableIC2Cables", true).getBoolean(true); gregtechproxy.mDisableIC2Cables = tMainConfig.get("general", "DisableIC2Cables", true).getBoolean(true);
gregtechproxy.mAchievements = tMainConfig.get("general", "EnableAchievements", true).getBoolean(true); gregtechproxy.mAchievements = tMainConfig.get("general", "EnableAchievements", true).getBoolean(true);
gregtechproxy.mAE2Integration = GregTech_API.sSpecialFile.get(ConfigCategories.general, "EnableAE2Integration", Loader.isModLoaded("appliedenergistics2")); gregtechproxy.mAE2Integration = GregTech_API.sSpecialFile.get(ConfigCategories.general, "EnableAE2Integration", Loader.isModLoaded("appliedenergistics2"));
gregtechproxy.mNervedCombs = tMainConfig.get("general", "NervCombs", true).getBoolean(true); gregtechproxy.mNerfedCombs = tMainConfig.get("general", "NerfCombs", true).getBoolean(true);
GregTech_API.mOutputRF = GregTech_API.sOPStuff.get(ConfigCategories.general, "OutputRF", true); GregTech_API.mOutputRF = GregTech_API.sOPStuff.get(ConfigCategories.general, "OutputRF", true);
GregTech_API.mInputRF = GregTech_API.sOPStuff.get(ConfigCategories.general, "InputRF", false); GregTech_API.mInputRF = GregTech_API.sOPStuff.get(ConfigCategories.general, "InputRF", false);

2
src/main/java/gregtech/api/enums/Materials.java
View file

@ -420,7 +420,7 @@ public enum Materials implements IColorModulationContainer, ISubTagContainer {
* First Degree Compounds * First Degree Compounds
*/ */
Methane ( 715, TextureSet.SET_FLUID , 1.0F, 0, 1, 16 , 255, 255, 255, 0, "Methane" , 1, 45, -1, 0, false, false, 3, 1, 1, Dyes.dyeMagenta , 1, Arrays.asList(new MaterialStack(Carbon, 1), new MaterialStack(Hydrogen, 4))), Methane ( 715, TextureSet.SET_FLUID , 1.0F, 0, 1, 16 , 255, 255, 255, 0, "Methane" , 1, 45, -1, 0, false, false, 3, 1, 1, Dyes.dyeMagenta , 1, Arrays.asList(new MaterialStack(Carbon, 1), new MaterialStack(Hydrogen, 4))),
CarbonDioxide ( 497, TextureSet.SET_FLUID , 1.0F, 0, 2, 16|32 , 169, 208, 245, 240, "Carbon Dioxide" , 0, 0, 25, 1, false, true, 1, 1, 1, Dyes.dyeLightBlue , 0, Arrays.asList(new MaterialStack(Carbon, 1), new MaterialStack(Oxygen, 2))), CarbonDioxide ( 497, TextureSet.SET_FLUID , 1.0F, 0, 2, 16|32 , 169, 208, 245, 240, "Carbon Dioxide" , 0, 0, 25, 1, false, true, 1, 1, 1, Dyes.dyeLightBlue , 1, Arrays.asList(new MaterialStack(Carbon, 1), new MaterialStack(Oxygen, 2))),
NobleGases ( 496, TextureSet.SET_FLUID , 1.0F, 0, 2, 16|32 , 169, 208, 245, 240, "Noble Gases" , 0, 0, 4, 0, false, true, 1, 1, 1, Dyes.dyeLightBlue , 2, Arrays.asList(new MaterialStack(CarbonDioxide,21),new MaterialStack(Helium, 9), new MaterialStack(Methane, 3), new MaterialStack(Deuterium, 1))), NobleGases ( 496, TextureSet.SET_FLUID , 1.0F, 0, 2, 16|32 , 169, 208, 245, 240, "Noble Gases" , 0, 0, 4, 0, false, true, 1, 1, 1, Dyes.dyeLightBlue , 2, Arrays.asList(new MaterialStack(CarbonDioxide,21),new MaterialStack(Helium, 9), new MaterialStack(Methane, 3), new MaterialStack(Deuterium, 1))),
Air ( -1, TextureSet.SET_FLUID , 1.0F, 0, 2, 16|32 , 169, 208, 245, 240, "Air" , 0, 0, -1, 0, false, true, 1, 1, 1, Dyes.dyeLightBlue , 0, Arrays.asList(new MaterialStack(Nitrogen, 40), new MaterialStack(Oxygen, 11), new MaterialStack(Argon, 1),new MaterialStack(NobleGases,1))), Air ( -1, TextureSet.SET_FLUID , 1.0F, 0, 2, 16|32 , 169, 208, 245, 240, "Air" , 0, 0, -1, 0, false, true, 1, 1, 1, Dyes.dyeLightBlue , 0, Arrays.asList(new MaterialStack(Nitrogen, 40), new MaterialStack(Oxygen, 11), new MaterialStack(Argon, 1),new MaterialStack(NobleGases,1))),
LiquidAir ( 495, TextureSet.SET_FLUID , 1.0F, 0, 2, 16|32 , 169, 208, 245, 240, "Liquid Air" , 0, 0, 4, 0, false, true, 1, 1, 1, Dyes.dyeLightBlue , 2, Arrays.asList(new MaterialStack(Nitrogen, 40), new MaterialStack(Oxygen, 11), new MaterialStack(Argon, 1),new MaterialStack(NobleGases,1))), LiquidAir ( 495, TextureSet.SET_FLUID , 1.0F, 0, 2, 16|32 , 169, 208, 245, 240, "Liquid Air" , 0, 0, 4, 0, false, true, 1, 1, 1, Dyes.dyeLightBlue , 2, Arrays.asList(new MaterialStack(Nitrogen, 40), new MaterialStack(Oxygen, 11), new MaterialStack(Argon, 1),new MaterialStack(NobleGases,1))),

2
src/main/java/gregtech/common/GT_Proxy.java
View file

@ -160,7 +160,7 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler {
public int mGraniteHavestLevel=3; public int mGraniteHavestLevel=3;
public int mMaxHarvestLevel=7; public int mMaxHarvestLevel=7;
public boolean mChangeHarvestLevels=false; public boolean mChangeHarvestLevels=false;
public boolean mNervedCombs = true; public boolean mNerfedCombs = true;
public int mWireHeatingTicks = 4; public int mWireHeatingTicks = 4;
public GT_Proxy() { public GT_Proxy() {

30
src/main/java/gregtech/common/items/CombType.java
View file

@ -22,30 +22,30 @@ public enum CombType {
// Metals Line // Metals Line
SLAG("slag", true, Materials._NULL, 50), SLAG("slag", true, Materials._NULL, 50),
COPPER("copperdust", true, Materials.Copper, 100), COPPER("coppon", true, Materials.Copper, 100),
TIN("tindust", true, Materials.Tin, 100), TIN("tine", true, Materials.Tin, 100),
LEAD("leaddust", true, Materials.Lead, 100), LEAD("plumbilia", true, Materials.Lead, 100),
IRON("irondust", true, Materials.Iron, 100), IRON("ferru", true, Materials.Iron, 100),
STEEL("steeldust", true, Materials.Steel, 100), STEEL("steeldust", true, Materials.Steel, 100),
NICKEL("nickeldust", true, Materials.Nickel, 100), NICKEL("nickeldust", true, Materials.Nickel, 100),
ZINC("zincdust", true, Materials.Zinc, 100), ZINC("galvania", true, Materials.Zinc, 100),
SILVER("silverdust", true, Materials.Silver, 100), SILVER("argentia", true, Materials.Silver, 100),
GOLD("golddust", true, Materials.Gold, 100), GOLD("aurelia", true, Materials.Gold, 100),
// Rare Metals Line // Rare Metals Line
ALUMINIUM("aluminium", true, Materials.Aluminium, 60), ALUMINIUM("bauxia", true, Materials.Aluminium, 60),
MANGANESE("manganese", true, Materials.Manganese, 30), MANGANESE("pyrolusium", true, Materials.Manganese, 30),
TITANIUM("titanium", true, Materials.Ilmenite, 100), TITANIUM("titanium", true, Materials.Ilmenite, 100),
CHROME("chrome", true, Materials.Chrome, 50), CHROME("chromium", true, Materials.Chrome, 50),
TUNGSTEN("tungsten", true, Materials.Tungstate, 100), TUNGSTEN("scheelinium", true, Materials.Tungstate, 100),
PLATINUM("platinum", true, Materials.Platinum, 40), PLATINUM("platina", true, Materials.Platinum, 40),
IRIDIUM("iridium", true, Materials.Iridium, 20), IRIDIUM("quantaria", true, Materials.Iridium, 20),
// Radioactive Line // Radioactive Line
URANIUM("uranium", true, Materials.Uranium, 50), URANIUM("urania", true, Materials.Uranium, 50),
PLUTONIUM("plutonium", true, Materials.Plutonium, 10), PLUTONIUM("plutonium", true, Materials.Plutonium, 10),
NAQUADAH("naquada", true, Materials.Naquadah, 10),; NAQUADAH("stargatium", true, Materials.Naquadah, 10),;
private static int[][] colours = new int[][]{ private static int[][] colours = new int[][]{
{0x906237, 0x58300B}, {0x906237, 0x58300B},

10
src/main/java/gregtech/common/items/ItemComb.java
View file

@ -109,7 +109,7 @@ public class ItemComb extends Item {
tComb = getStackForType(CombType.STICKY); tComb = getStackForType(CombType.STICKY);
addSpecialCent(tComb, ItemList.IC2_Resin.get(1, new Object[0]), 70); addSpecialCent(tComb, ItemList.IC2_Resin.get(1, new Object[0]), 70);
tComb = getStackForType(CombType.OIL); tComb = getStackForType(CombType.OIL);
addSpecialCent(tComb, ItemList.Crop_Drop_OilBerry.get(1, new Object[0]), 70); addSpecialCent(tComb, ItemList.Crop_Drop_OilBerry.get(2, new Object[0]), 70);
addProcess(tComb, Materials.Oilsands, 100); addProcess(tComb, Materials.Oilsands, 100);
//Gem Line //Gem Line
@ -269,9 +269,9 @@ public class ItemComb extends Item {
} }
public void addProcess(ItemStack tComb, Materials aMaterial, int chance){ public void addProcess(ItemStack tComb, Materials aMaterial, int chance){
if(GT_Mod.gregtechproxy.mNervedCombs){ if(GT_Mod.gregtechproxy.mNerfedCombs){
GT_Values.RA.addChemicalRecipe(GT_Utility.copyAmount(9, tComb), GT_OreDictUnificator.get(OrePrefixes.crushed, aMaterial, 1), Materials.Water.getFluid(1000), aMaterial.mOreByProducts.isEmpty() ? null : aMaterial.mOreByProducts.get(0).getMolten(144), GT_OreDictUnificator.get(OrePrefixes.crushedPurified, aMaterial, 4), 96, 300); GT_Values.RA.addChemicalRecipe(GT_Utility.copyAmount(9, tComb), GT_OreDictUnificator.get(OrePrefixes.crushed, aMaterial, 1), Materials.Water.getFluid(1000), aMaterial.mOreByProducts.isEmpty() ? null : aMaterial.mOreByProducts.get(0).getMolten(144), GT_OreDictUnificator.get(OrePrefixes.crushedPurified, aMaterial, 4), 96, 300);
GT_Values.RA.addAutoclaveRecipe(GT_Utility.copyAmount(16, tComb), Materials.UUMatter.getFluid(Math.max(1, ((aMaterial.getMass()+9)/10))), GT_OreDictUnificator.get(OrePrefixes.crushedPurified, aMaterial, 1), 1000, 1000, 24); GT_Values.RA.addAutoclaveRecipe(GT_Utility.copyAmount(16, tComb), Materials.UUMatter.getFluid(Math.max(1, ((aMaterial.getMass()+9)/10))), GT_OreDictUnificator.get(OrePrefixes.crushedPurified, aMaterial, 1), 10000, (int) (aMaterial.getMass() * 128), 384);
}else{ }else{
GT_Values.RA.addCentrifugeRecipe(tComb, GT_Values.NI, GT_Values.NF, GT_Values.NF, GT_OreDictUnificator.get(OrePrefixes.dustTiny, aMaterial, 1), ItemList.FR_Wax.get(1, new Object[0]), GT_Values.NI, GT_Values.NI, GT_Values.NI, GT_Values.NI, new int[] { chance * 100, 3000 }, 128, 5); GT_Values.RA.addCentrifugeRecipe(tComb, GT_Values.NI, GT_Values.NF, GT_Values.NF, GT_OreDictUnificator.get(OrePrefixes.dustTiny, aMaterial, 1), ItemList.FR_Wax.get(1, new Object[0]), GT_Values.NI, GT_Values.NI, GT_Values.NI, GT_Values.NI, new int[] { chance * 100, 3000 }, 128, 5);
RecipeManagers.centrifugeManager.addRecipe(40, tComb, ImmutableMap.of(GT_OreDictUnificator.get(OrePrefixes.dustTiny, aMaterial, 1), chance * 0.01f, ItemList.FR_Wax.get(1, new Object[0]), 0.3f)); RecipeManagers.centrifugeManager.addRecipe(40, tComb, ImmutableMap.of(GT_OreDictUnificator.get(OrePrefixes.dustTiny, aMaterial, 1), chance * 0.01f, ItemList.FR_Wax.get(1, new Object[0]), 0.3f));
@ -279,9 +279,9 @@ public class ItemComb extends Item {
} }
public void addProcess(ItemStack tComb, Materials aInMaterial, Materials aOutMaterial, int chance){ public void addProcess(ItemStack tComb, Materials aInMaterial, Materials aOutMaterial, int chance){
if(GT_Mod.gregtechproxy.mNervedCombs){ if(GT_Mod.gregtechproxy.mNerfedCombs){
GT_Values.RA.addChemicalRecipe(GT_Utility.copyAmount(9, tComb), GT_OreDictUnificator.get(OrePrefixes.crushed, aInMaterial, 1), Materials.Water.getFluid(1000), aInMaterial.mOreByProducts.isEmpty() ? null : aInMaterial.mOreByProducts.get(0).getMolten(144), GT_OreDictUnificator.get(OrePrefixes.crushedPurified, aOutMaterial, 4), 96, 300); GT_Values.RA.addChemicalRecipe(GT_Utility.copyAmount(9, tComb), GT_OreDictUnificator.get(OrePrefixes.crushed, aInMaterial, 1), Materials.Water.getFluid(1000), aInMaterial.mOreByProducts.isEmpty() ? null : aInMaterial.mOreByProducts.get(0).getMolten(144), GT_OreDictUnificator.get(OrePrefixes.crushedPurified, aOutMaterial, 4), 96, 300);
GT_Values.RA.addAutoclaveRecipe(GT_Utility.copyAmount(16, tComb), Materials.UUMatter.getFluid(Math.max(1, ((aOutMaterial.getMass()+9)/10))), GT_OreDictUnificator.get(OrePrefixes.crushedPurified, aOutMaterial, 1), 1000, 1000, 24); GT_Values.RA.addAutoclaveRecipe(GT_Utility.copyAmount(16, tComb), Materials.UUMatter.getFluid(Math.max(1, ((aOutMaterial.getMass()+9)/10))), GT_OreDictUnificator.get(OrePrefixes.crushedPurified, aOutMaterial, 1), 10000, (int) (aOutMaterial.getMass() * 128), 384);
}else{ }else{
GT_Values.RA.addCentrifugeRecipe(tComb, GT_Values.NI, GT_Values.NF, GT_Values.NF, GT_OreDictUnificator.get(OrePrefixes.dustTiny, aOutMaterial, 1), ItemList.FR_Wax.get(1, new Object[0]), GT_Values.NI, GT_Values.NI, GT_Values.NI, GT_Values.NI, new int[] { chance * 100, 3000 }, 128, 5); GT_Values.RA.addCentrifugeRecipe(tComb, GT_Values.NI, GT_Values.NF, GT_Values.NF, GT_OreDictUnificator.get(OrePrefixes.dustTiny, aOutMaterial, 1), ItemList.FR_Wax.get(1, new Object[0]), GT_Values.NI, GT_Values.NI, GT_Values.NI, GT_Values.NI, new int[] { chance * 100, 3000 }, 128, 5);
RecipeManagers.centrifugeManager.addRecipe(40, tComb, ImmutableMap.of(GT_OreDictUnificator.get(OrePrefixes.dustTiny, aOutMaterial, 1), chance * 0.01f, ItemList.FR_Wax.get(1, new Object[0]), 0.3f)); RecipeManagers.centrifugeManager.addRecipe(40, tComb, ImmutableMap.of(GT_OreDictUnificator.get(OrePrefixes.dustTiny, aOutMaterial, 1), chance * 0.01f, ItemList.FR_Wax.get(1, new Object[0]), 0.3f));

2
src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java
View file

@ -1623,7 +1623,7 @@ public class GT_MachineRecipeLoader
} }
public void addProcess(ItemStack tCrop, Materials aMaterial, int chance){ public void addProcess(ItemStack tCrop, Materials aMaterial, int chance){
if(GT_Mod.gregtechproxy.mNervedCombs){ if(GT_Mod.gregtechproxy.mNerfedCombs){
GT_Values.RA.addChemicalRecipe(GT_Utility.copyAmount(9, tCrop), GT_OreDictUnificator.get(OrePrefixes.crushed, aMaterial, 1), Materials.Water.getFluid(1000), aMaterial.mOreByProducts.isEmpty() ? null : aMaterial.mOreByProducts.get(0).getMolten(144), GT_OreDictUnificator.get(OrePrefixes.crushedPurified, aMaterial, 4), 96, 300); GT_Values.RA.addChemicalRecipe(GT_Utility.copyAmount(9, tCrop), GT_OreDictUnificator.get(OrePrefixes.crushed, aMaterial, 1), Materials.Water.getFluid(1000), aMaterial.mOreByProducts.isEmpty() ? null : aMaterial.mOreByProducts.get(0).getMolten(144), GT_OreDictUnificator.get(OrePrefixes.crushedPurified, aMaterial, 4), 96, 300);
GT_Values.RA.addAutoclaveRecipe(GT_Utility.copyAmount(16, tCrop), Materials.UUMatter.getFluid(Math.max(1, ((aMaterial.getMass()+9)/10))), GT_OreDictUnificator.get(OrePrefixes.crushedPurified, aMaterial, 1), 1000, 1000, 24); GT_Values.RA.addAutoclaveRecipe(GT_Utility.copyAmount(16, tCrop), Materials.UUMatter.getFluid(Math.max(1, ((aMaterial.getMass()+9)/10))), GT_OreDictUnificator.get(OrePrefixes.crushedPurified, aMaterial, 1), 1000, 1000, 24);
}else{ }else{