aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBlood-Asp <bloodasphendrik@gmail.com>2015-12-21 19:44:23 +0100
committerBlood-Asp <bloodasphendrik@gmail.com>2015-12-21 19:44:23 +0100
commita9aac6ff58cb7321528e67f6179667ae72a437c9 (patch)
tree0ba4a081eae2860427524553e0b66609366cb4c5
parent9781ccd9ee09f0f9039465096e09b0544b7eebdd (diff)
downloadGT5-Unofficial-a9aac6ff58cb7321528e67f6179667ae72a437c9.tar.gz
GT5-Unofficial-a9aac6ff58cb7321528e67f6179667ae72a437c9.tar.bz2
GT5-Unofficial-a9aac6ff58cb7321528e67f6179667ae72a437c9.zip
comb processing fixes
Diffstat
-rw-r--r--build.properties2
-rw-r--r--src/main/java/gregtech/GT_Mod.java2
-rw-r--r--src/main/java/gregtech/api/enums/Materials.java2
-rw-r--r--src/main/java/gregtech/common/GT_Proxy.java2
-rw-r--r--src/main/java/gregtech/common/items/CombType.java30
-rw-r--r--src/main/java/gregtech/common/items/ItemComb.java10
-rw-r--r--src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java2
7 files changed, 25 insertions, 25 deletions
diff --git a/build.properties b/build.properties
index ed1b411ab5..7fd913c803 100644
--- a/build.properties
+++ b/build.properties
@@ -1,7 +1,7 @@
minecraft.version=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
applecore.version=1.7.10-1.2.1+107.59407
diff --git a/src/main/java/gregtech/GT_Mod.java b/src/main/java/gregtech/GT_Mod.java
index 1ee700cd4a..ba23328505 100644
--- a/src/main/java/gregtech/GT_Mod.java
+++ b/src/main/java/gregtech/GT_Mod.java
@@ -230,7 +230,7 @@ public class GT_Mod
gregtechproxy.mDisableIC2Cables = tMainConfig.get("general", "DisableIC2Cables", 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.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.mInputRF = GregTech_API.sOPStuff.get(ConfigCategories.general, "InputRF", false);
diff --git a/src/main/java/gregtech/api/enums/Materials.java b/src/main/java/gregtech/api/enums/Materials.java
index f87e3425b7..ea708c8562 100644
--- a/src/main/java/gregtech/api/enums/Materials.java
+++ b/src/main/java/gregtech/api/enums/Materials.java
@@ -420,7 +420,7 @@ public enum Materials implements IColorModulationContainer, ISubTagContainer {
* 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))),
- 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))),
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))),
diff --git a/src/main/java/gregtech/common/GT_Proxy.java b/src/main/java/gregtech/common/GT_Proxy.java
index 9e600a9c09..ae095229a0 100644
--- a/src/main/java/gregtech/common/GT_Proxy.java
+++ b/src/main/java/gregtech/common/GT_Proxy.java
@@ -160,7 +160,7 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler {
public int mGraniteHavestLevel=3;
public int mMaxHarvestLevel=7;
public boolean mChangeHarvestLevels=false;
- public boolean mNervedCombs = true;
+ public boolean mNerfedCombs = true;
public int mWireHeatingTicks = 4;
public GT_Proxy() {
diff --git a/src/main/java/gregtech/common/items/CombType.java b/src/main/java/gregtech/common/items/CombType.java
index da63c0643e..ffde997fb9 100644
--- a/src/main/java/gregtech/common/items/CombType.java
+++ b/src/main/java/gregtech/common/items/CombType.java
@@ -22,30 +22,30 @@ public enum CombType {
// Metals Line
SLAG("slag", true, Materials._NULL, 50),
- COPPER("copperdust", true, Materials.Copper, 100),
- TIN("tindust", true, Materials.Tin, 100),
- LEAD("leaddust", true, Materials.Lead, 100),
- IRON("irondust", true, Materials.Iron, 100),
+ COPPER("coppon", true, Materials.Copper, 100),
+ TIN("tine", true, Materials.Tin, 100),
+ LEAD("plumbilia", true, Materials.Lead, 100),
+ IRON("ferru", true, Materials.Iron, 100),
STEEL("steeldust", true, Materials.Steel, 100),
NICKEL("nickeldust", true, Materials.Nickel, 100),
- ZINC("zincdust", true, Materials.Zinc, 100),
- SILVER("silverdust", true, Materials.Silver, 100),
- GOLD("golddust", true, Materials.Gold, 100),
+ ZINC("galvania", true, Materials.Zinc, 100),
+ SILVER("argentia", true, Materials.Silver, 100),
+ GOLD("aurelia", true, Materials.Gold, 100),
// Rare Metals Line
- ALUMINIUM("aluminium", true, Materials.Aluminium, 60),
- MANGANESE("manganese", true, Materials.Manganese, 30),
+ ALUMINIUM("bauxia", true, Materials.Aluminium, 60),
+ MANGANESE("pyrolusium", true, Materials.Manganese, 30),
TITANIUM("titanium", true, Materials.Ilmenite, 100),
- CHROME("chrome", true, Materials.Chrome, 50),
- TUNGSTEN("tungsten", true, Materials.Tungstate, 100),
- PLATINUM("platinum", true, Materials.Platinum, 40),
- IRIDIUM("iridium", true, Materials.Iridium, 20),
+ CHROME("chromium", true, Materials.Chrome, 50),
+ TUNGSTEN("scheelinium", true, Materials.Tungstate, 100),
+ PLATINUM("platina", true, Materials.Platinum, 40),
+ IRIDIUM("quantaria", true, Materials.Iridium, 20),
// Radioactive Line
- URANIUM("uranium", true, Materials.Uranium, 50),
+ URANIUM("urania", true, Materials.Uranium, 50),
PLUTONIUM("plutonium", true, Materials.Plutonium, 10),
- NAQUADAH("naquada", true, Materials.Naquadah, 10),;
+ NAQUADAH("stargatium", true, Materials.Naquadah, 10),;
private static int[][] colours = new int[][]{
{0x906237, 0x58300B},
diff --git a/src/main/java/gregtech/common/items/ItemComb.java b/src/main/java/gregtech/common/items/ItemComb.java
index dff47eeeda..417d95ce3d 100644
--- a/src/main/java/gregtech/common/items/ItemComb.java
+++ b/src/main/java/gregtech/common/items/ItemComb.java
@@ -109,7 +109,7 @@ public class ItemComb extends Item {
tComb = getStackForType(CombType.STICKY);
addSpecialCent(tComb, ItemList.IC2_Resin.get(1, new Object[0]), 70);
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);
//Gem Line
@@ -269,9 +269,9 @@ public class ItemComb extends Item {
}
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.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{
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));
@@ -279,9 +279,9 @@ public class ItemComb extends Item {
}
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.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{
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));
diff --git a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java
index 593cead834..827f4740e4 100644
--- a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java
+++ b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java
@@ -1623,7 +1623,7 @@ public class GT_MachineRecipeLoader
}
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.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{
generated by cgit (git 2.46.0) at 2025-03-06 09:16:13 +0000