diff options
Diffstat (limited to 'src/main/java/gregtech/common')
7 files changed, 281 insertions, 968 deletions
diff --git a/src/main/java/gregtech/common/GT_Proxy.java b/src/main/java/gregtech/common/GT_Proxy.java index f67addacd5..891c46fd92 100644 --- a/src/main/java/gregtech/common/GT_Proxy.java +++ b/src/main/java/gregtech/common/GT_Proxy.java @@ -33,7 +33,6 @@ import static gregtech.api.enums.Mods.TwilightForest; import static gregtech.api.enums.Mods.WitchingGadgets; import static gregtech.api.recipe.RecipeMaps.crackingRecipes; import static gregtech.api.recipe.RecipeMaps.cutterRecipes; -import static gregtech.api.recipe.RecipeMaps.wiremillRecipes; import static gregtech.api.util.GT_RecipeBuilder.SECONDS; import static gregtech.api.util.GT_Util.LAST_BROKEN_TILEENTITY; import static net.minecraftforge.fluids.FluidRegistry.getFluidStack; @@ -542,11 +541,8 @@ public abstract class GT_Proxy implements IGT_Mod, IFuelHandler { private final DateFormat mDateFormat = DateFormat.getInstance(); public final BlockingQueue<String> mBufferedPlayerActivity = new LinkedBlockingQueue<>(); public final GT_BlockMap<Boolean> mCTMBlockCache = new GT_BlockMap<>(); - public boolean mHardcoreCables = false; public boolean mDisableVanillaOres = true; - public boolean mHardMachineCasings = true; public boolean mAllowSmallBoilerAutomation = false; - public boolean mNerfDustCrafting = true; public boolean mSortToTheEnd = true; public boolean mCraftingUnification = true; public boolean mInventoryUnification = true; @@ -557,19 +553,12 @@ public abstract class GT_Proxy implements IGT_Mod, IFuelHandler { public boolean mNerfedVanillaTools = true; public boolean mHardRock = false; public boolean mHungerEffect = true; - public boolean mOnline = true; public boolean mIgnoreTcon = true; - public boolean mDisableIC2Cables = false; public boolean mAchievements = true; - public boolean mArcSmeltIntoAnnealed = true; - public boolean mMagneticraftRecipes = false; - public boolean mImmersiveEngineeringRecipes = false; private boolean isFirstServerWorldTick = true; private boolean isFirstWorldTick = true; private boolean mOreDictActivated = false; public boolean mChangeHarvestLevels = false; - public boolean mNerfedCombs = true; - public boolean mNerfedCrops = true; public boolean mGTBees = true; public boolean mHideUnusedOres = true; public boolean mPollution = true; @@ -615,21 +604,15 @@ public abstract class GT_Proxy implements IGT_Mod, IFuelHandler { public boolean enableUndergroundGravelGen = true; public boolean enableUndergroundDirtGen = true; public int mTicksUntilNextCraftSound = 0; - public double mMagneticraftBonusOutputPercent = 0d; private World mUniverse = null; - public boolean mTEMachineRecipes = false; public boolean mEnableAllMaterials = false; public boolean mEnableCleanroom = true; public boolean mLowGravProcessing = false; public boolean mAprilFool = false; public boolean mCropNeedBlock = true; - @Deprecated - public boolean mDisableOldChemicalRecipes = false; public boolean mAMHInteraction = true; public boolean mForceFreeFace = true; public boolean mBrickedBlastFurnace = true; - @Deprecated - public boolean mEasierIVPlusCables = false; public boolean mMixedOreOnlyYieldsTwoThirdsOfPureOre = false; public boolean mRichOreYieldMultiplier = true; public boolean mNetherOreYieldMultiplier = true; @@ -2064,20 +2047,6 @@ public abstract class GT_Proxy implements IGT_Mod, IFuelHandler { OrePrefixes.ingot, Materials.Brass, new ItemStack(aEvent.Ore.getItem(), 1, 2)); - if (!mDisableIC2Cables) { - GT_Values.RA.stdBuilder() - .itemInputs(GT_ModHandler.getIC2Item("copperCableItem", 3L)) - .itemOutputs(new ItemStack(aEvent.Ore.getItem(), 1, 8)) - .duration(20 * SECONDS) - .eut(1) - .addTo(wiremillRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(GT_ModHandler.getIC2Item("ironCableItem", 6L)) - .itemOutputs(new ItemStack(aEvent.Ore.getItem(), 1, 9)) - .duration(20 * SECONDS) - .eut(2) - .addTo(wiremillRecipes); - } GT_Values.RA.stdBuilder() .itemInputs(new ItemStack(aEvent.Ore.getItem(), 1, 3)) @@ -2391,59 +2360,65 @@ public abstract class GT_Proxy implements IGT_Mod, IFuelHandler { } } final boolean tHungerEffect = (this.mHungerEffect) && (aEvent.player.ticksExisted % 2400 == 1200); - if (aEvent.player.ticksExisted % 120 == 0) { - int tCount = 64; - for (int i = 0; i < 36; i++) { - final ItemStack tStack; - if ((tStack = aEvent.player.inventory.getStackInSlot(i)) != null) { - if (!aEvent.player.capabilities.isCreativeMode) { - GT_Utility.applyRadioactivity( - aEvent.player, - GT_Utility.getRadioactivityLevel(tStack), - tStack.stackSize); - final float tHeat = GT_Utility.getHeatDamageFromItem(tStack); - if (tHeat != 0.0F) { - if (tHeat > 0.0F) { - GT_Utility.applyHeatDamageFromItem(aEvent.player, tHeat, tStack); - } else { - GT_Utility.applyFrostDamage(aEvent.player, -tHeat); - } - } - } - if (tHungerEffect) { - tCount += tStack.stackSize * 64 / Math.max(1, tStack.getMaxStackSize()); - } - if (this.mInventoryUnification) { - GT_OreDictUnificator.setStack(true, tStack); + + if (aEvent.player.ticksExisted % 120 != 0) { + return; + } + + int tCount = 64; + for (int i = 0; i < 36; i++) { + final ItemStack tStack = aEvent.player.inventory.getStackInSlot(i); + if (tStack == null) { + continue; + } + + if (!aEvent.player.capabilities.isCreativeMode) { + GT_Utility + .applyRadioactivity(aEvent.player, GT_Utility.getRadioactivityLevel(tStack), tStack.stackSize); + final float tHeat = GT_Utility.getHeatDamageFromItem(tStack); + if (tHeat != 0.0F) { + if (tHeat > 0.0F) { + GT_Utility.applyHeatDamageFromItem(aEvent.player, tHeat, tStack); + } else { + GT_Utility.applyFrostDamage(aEvent.player, -tHeat); } } } - for (int i = 0; i < 4; i++) { - final ItemStack tStack; - if ((tStack = aEvent.player.inventory.armorInventory[i]) != null) { - if (!aEvent.player.capabilities.isCreativeMode) { - GT_Utility.applyRadioactivity( - aEvent.player, - GT_Utility.getRadioactivityLevel(tStack), - tStack.stackSize); - final float tHeat = GT_Utility.getHeatDamageFromItem(tStack); - if (tHeat != 0.0F) { - if (tHeat > 0.0F) { - GT_Utility.applyHeatDamageFromItem(aEvent.player, tHeat, tStack); - } else { - GT_Utility.applyFrostDamage(aEvent.player, -tHeat); - } - } - } - if (tHungerEffect) { - tCount += 256; + if (tHungerEffect) { + tCount += tStack.stackSize * 64 / Math.max(1, tStack.getMaxStackSize()); + } + if (this.mInventoryUnification) { + GT_OreDictUnificator.setStack(true, tStack); + } + + } + for (int i = 0; i < 4; i++) { + final ItemStack tStack = aEvent.player.inventory.armorInventory[i]; + if (tStack == null) { + continue; + } + + if (!aEvent.player.capabilities.isCreativeMode) { + GT_Utility + .applyRadioactivity(aEvent.player, GT_Utility.getRadioactivityLevel(tStack), tStack.stackSize); + final float tHeat = GT_Utility.getHeatDamageFromItem(tStack); + if (tHeat != 0.0F) { + if (tHeat > 0.0F) { + GT_Utility.applyHeatDamageFromItem(aEvent.player, tHeat, tStack); + } else { + GT_Utility.applyFrostDamage(aEvent.player, -tHeat); } } } if (tHungerEffect) { - aEvent.player.addExhaustion(Math.max(1.0F, tCount / 666.6F)); + tCount += 256; } + + } + if (tHungerEffect) { + aEvent.player.addExhaustion(Math.max(1.0F, tCount / 666.6F)); } + } } diff --git a/src/main/java/gregtech/common/items/ItemComb.java b/src/main/java/gregtech/common/items/ItemComb.java index 8fd37fd0d9..2e5cdc10bb 100644 --- a/src/main/java/gregtech/common/items/ItemComb.java +++ b/src/main/java/gregtech/common/items/ItemComb.java @@ -41,7 +41,6 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import forestry.api.core.Tabs; import forestry.api.recipes.RecipeManagers; -import gregtech.GT_Mod; import gregtech.api.enums.GT_Values; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; @@ -187,53 +186,24 @@ public class ItemComb extends Item implements IGT_ItemWithMaterialRenderer { new ItemStack[] { Materials.Mica.getDust(2), ItemList.FR_Wax.get(1) }, new int[] { 100 * 100, 75 * 100 }, Voltage.HV); - if (GT_Mod.gregtechproxy.mNerfedCombs) { - addCentrifugeToItemStack( - CombType.LIGNIE, - new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Lignite, 1), - ItemList.FR_Wax.get(1) }, - new int[] { 90 * 100, 50 * 100 }, - Voltage.ULV); - addCentrifugeToItemStack( - CombType.COAL, - new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Coal, 1), - ItemList.FR_Wax.get(1) }, - new int[] { 5 * 100, 50 * 100 }, - Voltage.ULV); - addCentrifugeToItemStack( - CombType.OIL, - new ItemStack[] { ItemList.Crop_Drop_OilBerry.get(6), GT_Bees.drop.getStackForType(DropType.OIL), - ItemList.FR_Wax.get(1) }, - new int[] { 100 * 100, 100 * 100, 50 * 100 }, - Voltage.ULV); - } else { - addCentrifugeToItemStack( - CombType.LIGNIE, - new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Lignite, 1), - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Lignite, 1), ItemList.FR_Wax.get(1) }, - new int[] { 90 * 100, 100 * 100, 50 * 100 }, - Voltage.ULV); - addCentrifugeToItemStack( - CombType.COAL, - new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Coal, 1), - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Coal, 1), ItemList.FR_Wax.get(1) }, - new int[] { 5 * 100, 100 * 100, 50 * 100 }, - Voltage.ULV); - addCentrifugeToItemStack( - CombType.OIL, - new ItemStack[] { ItemList.Crop_Drop_OilBerry.get(6), GT_Bees.drop.getStackForType(DropType.OIL), - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Oilsands, 1), ItemList.FR_Wax.get(1) }, - new int[] { 100 * 100, 100 * 100, 100 * 100, 50 * 100 }, - Voltage.ULV); - addCentrifugeToMaterial( - CombType.APATITE, - new Materials[] { Materials.Apatite, Materials.Phosphate }, - new int[] { 100 * 100, 80 * 100 }, - new int[] {}, - Voltage.ULV, - NI, - 30 * 100); - } + + addCentrifugeToItemStack( + CombType.LIGNIE, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Lignite, 1), ItemList.FR_Wax.get(1) }, + new int[] { 90 * 100, 50 * 100 }, + Voltage.ULV); + addCentrifugeToItemStack( + CombType.COAL, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Coal, 1), ItemList.FR_Wax.get(1) }, + new int[] { 5 * 100, 50 * 100 }, + Voltage.ULV); + addCentrifugeToItemStack( + CombType.OIL, + new ItemStack[] { ItemList.Crop_Drop_OilBerry.get(6), GT_Bees.drop.getStackForType(DropType.OIL), + ItemList.FR_Wax.get(1) }, + new int[] { 100 * 100, 100 * 100, 50 * 100 }, + Voltage.ULV); + // ic2 addCentrifugeToItemStack( CombType.COOLANT, @@ -292,171 +262,88 @@ public class ItemComb extends Item implements IGT_ItemWithMaterialRenderer { GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Enderium, 1) }, new int[] { 50 * 100, 30 * 100, 50 * 100 }, Voltage.HV); - if (GT_Mod.gregtechproxy.mNerfedCombs) { - addCentrifugeToMaterial( - CombType.REDALLOY, - new Materials[] { Materials.RedAlloy }, - new int[] { 100 * 100 }, - new int[] {}, - Voltage.ULV, - ItemList.FR_RefractoryWax.get(1), - 50 * 100); - addCentrifugeToMaterial( - CombType.REDSTONEALLOY, - new Materials[] { Materials.RedstoneAlloy }, - new int[] { 100 * 100 }, - new int[] {}, - Voltage.ULV, - ItemList.FR_RefractoryWax.get(1), - 50 * 100); - addCentrifugeToMaterial( - CombType.CONDUCTIVEIRON, - new Materials[] { Materials.ConductiveIron }, - new int[] { 90 * 100 }, - new int[] {}, - Voltage.MV, - ItemList.FR_RefractoryWax.get(1), - 50 * 100); - addCentrifugeToMaterial( - CombType.VIBRANTALLOY, - new Materials[] { Materials.VibrantAlloy }, - new int[] { 70 * 100 }, - new int[] {}, - Voltage.HV, - ItemList.FR_RefractoryWax.get(1), - 50 * 100); - addCentrifugeToMaterial( - CombType.ENERGETICALLOY, - new Materials[] { Materials.EnergeticAlloy }, - new int[] { 80 * 100 }, - new int[] {}, - Voltage.HV, - ItemList.FR_RefractoryWax.get(1), - 50 * 100); - addCentrifugeToMaterial( - CombType.ELECTRICALSTEEL, - new Materials[] { Materials.ElectricalSteel }, - new int[] { 100 * 100 }, - new int[] {}, - Voltage.ULV, - ItemList.FR_RefractoryWax.get(1), - 50 * 100); - addCentrifugeToMaterial( - CombType.DARKSTEEL, - new Materials[] { Materials.DarkSteel }, - new int[] { 100 * 100 }, - new int[] {}, - Voltage.MV, - ItemList.FR_RefractoryWax.get(1), - 50 * 100); - addCentrifugeToMaterial( - CombType.PULSATINGIRON, - new Materials[] { Materials.PulsatingIron }, - new int[] { 80 * 100 }, - new int[] {}, - Voltage.HV, - ItemList.FR_RefractoryWax.get(1), - 50 * 100); - addCentrifugeToMaterial( - CombType.STAINLESSSTEEL, - new Materials[] { Materials.StainlessSteel }, - new int[] { 50 * 100 }, - new int[] {}, - Voltage.HV, - ItemList.FR_RefractoryWax.get(1), - 50 * 100); - addCentrifugeToMaterial( - CombType.BEDROCKIUM, - new Materials[] { Materials.Bedrockium }, - new int[] { 50 * 100 }, - new int[] {}, - Voltage.EV, - ItemList.FR_RefractoryWax.get(1), - 50 * 100); - } else { - addCentrifugeToMaterial( - CombType.REDALLOY, - new Materials[] { Materials.RedAlloy, Materials.Redstone, Materials.Copper }, - new int[] { 100 * 100, 75 * 100, 90 * 100 }, - new int[] {}, - Voltage.ULV, - ItemList.FR_RefractoryWax.get(1), - 50 * 100); - addCentrifugeToMaterial( - CombType.REDSTONEALLOY, - new Materials[] { Materials.RedstoneAlloy, Materials.Redstone, Materials.Silicon, Materials.Coal }, - new int[] { 100 * 100, 90 * 100, 75 * 100, 75 * 100 }, - new int[] {}, - Voltage.ULV, - ItemList.FR_RefractoryWax.get(1), - 50 * 100); - addCentrifugeToMaterial( - CombType.CONDUCTIVEIRON, - new Materials[] { Materials.ConductiveIron, Materials.Silver, Materials.Iron }, - new int[] { 90 * 100, 55 * 100, 65 * 100 }, - new int[] {}, - Voltage.MV, - ItemList.FR_RefractoryWax.get(1), - 50 * 100); - addCentrifugeToMaterial( - CombType.VIBRANTALLOY, - new Materials[] { Materials.VibrantAlloy, Materials.Chrome }, - new int[] { 70 * 100, 50 * 100 }, - new int[] {}, - Voltage.HV, - ItemList.FR_RefractoryWax.get(1), - 50 * 100); - addCentrifugeToMaterial( - CombType.ENERGETICALLOY, - new Materials[] { Materials.EnergeticAlloy, Materials.Gold }, - new int[] { 80 * 100, 60 * 100 }, - new int[] {}, - Voltage.HV, - ItemList.FR_RefractoryWax.get(1), - 50 * 100); - addCentrifugeToMaterial( - CombType.ELECTRICALSTEEL, - new Materials[] { Materials.ElectricalSteel, Materials.Silicon, Materials.Coal }, - new int[] { 100 * 100, 75 * 100, 75 * 100 }, - new int[] {}, - Voltage.ULV, - ItemList.FR_RefractoryWax.get(1), - 50 * 100); - addCentrifugeToMaterial( - CombType.DARKSTEEL, - new Materials[] { Materials.DarkSteel, Materials.Coal }, - new int[] { 100 * 100, 75 * 100 }, - new int[] {}, - Voltage.MV, - ItemList.FR_RefractoryWax.get(1), - 50 * 100); - addCentrifugeToMaterial( - CombType.PULSATINGIRON, - new Materials[] { Materials.PulsatingIron, Materials.Iron }, - new int[] { 80 * 100, 75 * 100 }, - new int[] {}, - Voltage.HV, - ItemList.FR_RefractoryWax.get(1), - 50 * 100); - addCentrifugeToMaterial( - CombType.STAINLESSSTEEL, - new Materials[] { Materials.StainlessSteel, Materials.Iron, Materials.Chrome, Materials.Manganese, - Materials.Nickel }, - new int[] { 50 * 100, 75 * 100, 55 * 100, 75 * 100, 75 * 100 }, - new int[] {}, - Voltage.HV, - ItemList.FR_RefractoryWax.get(1), - 50 * 100); - addCentrifugeToMaterial( - CombType.BEDROCKIUM, - new Materials[] { Materials.Bedrockium }, - new int[] { 50 * 100 }, - new int[] {}, - Voltage.EV, - ItemList.FR_RefractoryWax.get(1), - 50 * 100); - } + addCentrifugeToMaterial( + CombType.REDALLOY, + new Materials[] { Materials.RedAlloy }, + new int[] { 100 * 100 }, + new int[] {}, + Voltage.ULV, + ItemList.FR_RefractoryWax.get(1), + 50 * 100); + addCentrifugeToMaterial( + CombType.REDSTONEALLOY, + new Materials[] { Materials.RedstoneAlloy }, + new int[] { 100 * 100 }, + new int[] {}, + Voltage.ULV, + ItemList.FR_RefractoryWax.get(1), + 50 * 100); + addCentrifugeToMaterial( + CombType.CONDUCTIVEIRON, + new Materials[] { Materials.ConductiveIron }, + new int[] { 90 * 100 }, + new int[] {}, + Voltage.MV, + ItemList.FR_RefractoryWax.get(1), + 50 * 100); + addCentrifugeToMaterial( + CombType.VIBRANTALLOY, + new Materials[] { Materials.VibrantAlloy }, + new int[] { 70 * 100 }, + new int[] {}, + Voltage.HV, + ItemList.FR_RefractoryWax.get(1), + 50 * 100); + addCentrifugeToMaterial( + CombType.ENERGETICALLOY, + new Materials[] { Materials.EnergeticAlloy }, + new int[] { 80 * 100 }, + new int[] {}, + Voltage.HV, + ItemList.FR_RefractoryWax.get(1), + 50 * 100); + addCentrifugeToMaterial( + CombType.ELECTRICALSTEEL, + new Materials[] { Materials.ElectricalSteel }, + new int[] { 100 * 100 }, + new int[] {}, + Voltage.ULV, + ItemList.FR_RefractoryWax.get(1), + 50 * 100); + addCentrifugeToMaterial( + CombType.DARKSTEEL, + new Materials[] { Materials.DarkSteel }, + new int[] { 100 * 100 }, + new int[] {}, + Voltage.MV, + ItemList.FR_RefractoryWax.get(1), + 50 * 100); + addCentrifugeToMaterial( + CombType.PULSATINGIRON, + new Materials[] { Materials.PulsatingIron }, + new int[] { 80 * 100 }, + new int[] {}, + Voltage.HV, + ItemList.FR_RefractoryWax.get(1), + 50 * 100); + addCentrifugeToMaterial( + CombType.STAINLESSSTEEL, + new Materials[] { Materials.StainlessSteel }, + new int[] { 50 * 100 }, + new int[] {}, + Voltage.HV, + ItemList.FR_RefractoryWax.get(1), + 50 * 100); + addCentrifugeToMaterial( + CombType.BEDROCKIUM, + new Materials[] { Materials.Bedrockium }, + new int[] { 50 * 100 }, + new int[] {}, + Voltage.EV, + ItemList.FR_RefractoryWax.get(1), + 50 * 100); + // Thaumic addProcessGT(CombType.THAUMIUMDUST, new Materials[] { Materials.Thaumium }, Voltage.MV); addCentrifugeToItemStack( @@ -493,7 +380,7 @@ public class ItemComb extends Item implements IGT_ItemWithMaterialRenderer { addCentrifugeToMaterial( CombType.ASTRALSILVER, new Materials[] { Materials.AstralSilver, Materials.Silver }, - new int[] { 20 * 100, (GT_Mod.gregtechproxy.mNerfedCombs ? 10 : 75) * 100 }, + new int[] { 20 * 100, 10 * 100 }, new int[] {}, Voltage.HV, GT_ModHandler.getModItem(MagicBees.ID, "wax", 1, 0), @@ -509,7 +396,7 @@ public class ItemComb extends Item implements IGT_ItemWithMaterialRenderer { addCentrifugeToMaterial( CombType.SHADOWMETAL, new Materials[] { Materials.Shadow, Materials.ShadowSteel }, - new int[] { (GT_Mod.gregtechproxy.mNerfedCombs ? 20 : 75) * 100, 10 * 100 }, + new int[] { 20 * 100, 10 * 100 }, new int[] {}, Voltage.HV, GT_ModHandler.getModItem(MagicBees.ID, "wax", 1, 0), @@ -521,8 +408,7 @@ public class ItemComb extends Item implements IGT_ItemWithMaterialRenderer { GT_ModHandler.getModItem(ExtraUtilities.ID, "unstableingot", 1, 1), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Iron, 1), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Diamond, 1) }, - new int[] { 50 * 100, 20 * 100, (GT_Mod.gregtechproxy.mNerfedCombs ? 10 : 75) * 100, - (GT_Mod.gregtechproxy.mNerfedCombs ? 5 : 55) * 100 }, + new int[] { 50 * 100, 20 * 100, 10 * 100, 5 * 100 }, Voltage.HV); addProcessGT(CombType.SPARKELING, new Materials[] { Materials.NetherStar }, Voltage.EV); addCentrifugeToItemStack( @@ -530,56 +416,23 @@ public class ItemComb extends Item implements IGT_ItemWithMaterialRenderer { new ItemStack[] { GT_ModHandler.getModItem(MagicBees.ID, "wax", 1, 0), GT_ModHandler.getModItem(MagicBees.ID, "miscResources", 2, 5), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.NetherStar, 1) }, - new int[] { 50 * 100, 10 * 100, (GT_Mod.gregtechproxy.mNerfedCombs ? 10 : 50) * 100 }, + new int[] { 50 * 100, 10 * 100, 10 * 100 }, Voltage.EV); - if (GT_Mod.gregtechproxy.mNerfedCombs) { - addCentrifugeToMaterial( - CombType.THAUMIUMDUST, - new Materials[] { Materials.Thaumium }, - new int[] { 100 * 100 }, - new int[] {}, - Voltage.MV, - GT_ModHandler.getModItem(MagicBees.ID, "wax", 1, 0), - 50 * 100); - addCentrifugeToItemStack( - CombType.QUICKSILVER, - new ItemStack[] { GT_ModHandler.getModItem(MagicBees.ID, "wax", 1, 0), - GT_ModHandler.getModItem(Thaumcraft.ID, "ItemNugget", 1, 5) }, - new int[] { 50 * 100, 100 * 100 }, - Voltage.ULV); - } else { - addCentrifugeToMaterial( - CombType.THAUMIUMDUST, - new Materials[] { Materials.Thaumium, Materials.Iron }, - new int[] { 100 * 100, 75 * 100 }, - new int[] {}, - Voltage.MV, - GT_ModHandler.getModItem(MagicBees.ID, "wax", 1, 0), - 50 * 100); - addCentrifugeToMaterial( - CombType.AMBER, - new Materials[] { Materials.Amber }, - new int[] { 100 * 100 }, - new int[] {}, - Voltage.ULV, - GT_ModHandler.getModItem(MagicBees.ID, "wax", 1, 0), - 50 * 100); - addCentrifugeToItemStack( - CombType.QUICKSILVER, - new ItemStack[] { GT_ModHandler.getModItem(MagicBees.ID, "wax", 1, 0), - GT_ModHandler.getModItem(Thaumcraft.ID, "ItemNugget", 1, 5), - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Cinnabar, 1) }, - new int[] { 50 * 100, 100 * 100, 85 * 100 }, - Voltage.ULV); - addCentrifugeToMaterial( - CombType.MITHRIL, - new Materials[] { Materials.Mithril, Materials.Platinum }, - new int[] { 75 * 100, 55 * 100 }, - new int[] {}, - Voltage.HV, - GT_ModHandler.getModItem(MagicBees.ID, "wax", 1, 0), - 50 * 100); - } + + addCentrifugeToMaterial( + CombType.THAUMIUMDUST, + new Materials[] { Materials.Thaumium }, + new int[] { 100 * 100 }, + new int[] {}, + Voltage.MV, + GT_ModHandler.getModItem(MagicBees.ID, "wax", 1, 0), + 50 * 100); + addCentrifugeToItemStack( + CombType.QUICKSILVER, + new ItemStack[] { GT_ModHandler.getModItem(MagicBees.ID, "wax", 1, 0), + GT_ModHandler.getModItem(Thaumcraft.ID, "ItemNugget", 1, 5) }, + new int[] { 50 * 100, 100 * 100 }, + Voltage.ULV); // Gem Line addProcessGT(CombType.STONE, new Materials[] { Materials.Soapstone }, Voltage.LV); @@ -605,147 +458,24 @@ public class ItemComb extends Item implements IGT_ItemWithMaterialRenderer { addProcessGT(CombType.FIRESTONE, new Materials[] { Materials.Firestone }, Voltage.LV); addProcessGT(CombType.PYROPE, new Materials[] { Materials.Pyrope }, Voltage.LV); addProcessGT(CombType.GROSSULAR, new Materials[] { Materials.Grossular }, Voltage.LV); - if (GT_Mod.gregtechproxy.mNerfedCombs) { - addCentrifugeToMaterial( - CombType.STONE, - new Materials[] { Materials.Stone, Materials.GraniteBlack, Materials.GraniteRed, Materials.Basalt, - Materials.Marble, Materials.Redrock }, - new int[] { 70 * 100, 50 * 100, 50 * 100, 50 * 100, 50 * 100, 50 * 100 }, - new int[] { 9, 9, 9, 9, 9, 9 }, - Voltage.ULV, - NI, - 50 * 100); - addCentrifugeToMaterial( - CombType.FLUIX, - new Materials[] { Materials.Fluix }, - new int[] { 25 * 100 }, - new int[] { 9 }, - Voltage.ULV, - NI, - 30 * 100); - } else { - addCentrifugeToMaterial( - CombType.STONE, - new Materials[] { Materials.Soapstone, Materials.Talc, Materials.Apatite, Materials.Phosphate, - Materials.TricalciumPhosphate }, - new int[] { 95 * 100, 90 * 100, 80 * 100, 75 * 100, 75 * 100 }, - new int[] {}, - Voltage.ULV, - NI, - 50 * 100); - addCentrifugeToMaterial( - CombType.CERTUS, - new Materials[] { Materials.CertusQuartz, Materials.Quartzite, Materials.Barite }, - new int[] { 100 * 100, 80 * 100, 75 * 100 }, - new int[] {}, - Voltage.ULV, - NI, - 50 * 100); - addCentrifugeToMaterial( - CombType.FLUIX, - new Materials[] { Materials.Fluix, Materials.Redstone, Materials.CertusQuartz, Materials.NetherQuartz }, - new int[] { 25 * 100, 90 * 100, 90 * 100, 90 * 100 }, - new int[] { 9, 1, 1, 1 }, - Voltage.ULV, - NI, - 30 * 100); - addCentrifugeToMaterial( - CombType.REDSTONE, - new Materials[] { Materials.Redstone, Materials.Cinnabar }, - new int[] { 100 * 100, 80 * 100 }, - new int[] {}, - Voltage.ULV, - NI, - 30 * 100); - addCentrifugeToMaterial( - CombType.LAPIS, - new Materials[] { Materials.Lapis, Materials.Sodalite, Materials.Lazurite, Materials.Calcite }, - new int[] { 100 * 100, 90 * 100, 90 * 100, 85 * 100 }, - new int[] {}, - Voltage.ULV, - NI, - 30 * 100); - addCentrifugeToMaterial( - CombType.RUBY, - new Materials[] { Materials.Ruby, Materials.Redstone }, - new int[] { 100 * 100, 90 * 100 }, - new int[] {}, - Voltage.ULV, - NI, - 30 * 100); - addCentrifugeToMaterial( - CombType.REDGARNET, - new Materials[] { Materials.GarnetRed, Materials.GarnetYellow }, - new int[] { 100 * 100, 75 * 100 }, - new int[] {}, - Voltage.ULV, - NI, - 30 * 100); - addCentrifugeToMaterial( - CombType.YELLOWGARNET, - new Materials[] { Materials.GarnetYellow, Materials.GarnetRed }, - new int[] { 100 * 100, 75 * 100 }, - new int[] {}, - Voltage.ULV, - NI, - 30 * 100); - addCentrifugeToMaterial( - CombType.SAPPHIRE, - new Materials[] { Materials.Sapphire, Materials.GreenSapphire, Materials.Almandine, Materials.Pyrope }, - new int[] { 100 * 100, 90 * 100, 90 * 100, 75 * 100 }, - new int[] {}, - Voltage.ULV, - NI, - 30 * 100); - addCentrifugeToMaterial( - CombType.DIAMOND, - new Materials[] { Materials.Diamond, Materials.Graphite }, - new int[] { 100 * 100, 75 * 100 }, - new int[] {}, - Voltage.ULV, - NI, - 30 * 100); - addCentrifugeToMaterial( - CombType.OLIVINE, - new Materials[] { Materials.Olivine, Materials.Bentonite, Materials.Magnesite, Materials.Glauconite }, - new int[] { 100 * 100, 90 * 100, 80 * 100, 75 * 100 }, - new int[] {}, - Voltage.ULV, - NI, - 30 * 100); - addCentrifugeToMaterial( - CombType.EMERALD, - new Materials[] { Materials.Emerald, Materials.Beryllium, Materials.Thorium }, - new int[] { 100 * 100, 85 * 100, 75 * 100 }, - new int[] {}, - Voltage.ULV, - NI, - 30 * 100); - addCentrifugeToMaterial( - CombType.FIRESTONE, - new Materials[] { Materials.Firestone }, - new int[] { 100 * 100 }, - new int[] {}, - Voltage.ULV, - ItemList.FR_RefractoryWax.get(1), - 30 * 100); - addCentrifugeToMaterial( - CombType.PYROPE, - new Materials[] { Materials.Pyrope, Materials.Aluminium, Materials.Magnesium, Materials.Silicon }, - new int[] { 100 * 100, 75 * 100, 80 * 100, 75 * 100 }, - new int[] {}, - Voltage.ULV, - NI, - 30 * 100); - addCentrifugeToMaterial( - CombType.GROSSULAR, - new Materials[] { Materials.Grossular, Materials.Aluminium, Materials.Silicon }, - new int[] { 100 * 100, 75 * 100, 75 * 100 }, - new int[] {}, - Voltage.ULV, - NI, - 30 * 100); - } + + addCentrifugeToMaterial( + CombType.STONE, + new Materials[] { Materials.Stone, Materials.GraniteBlack, Materials.GraniteRed, Materials.Basalt, + Materials.Marble, Materials.Redrock }, + new int[] { 70 * 100, 50 * 100, 50 * 100, 50 * 100, 50 * 100, 50 * 100 }, + new int[] { 9, 9, 9, 9, 9, 9 }, + Voltage.ULV, + NI, + 50 * 100); + addCentrifugeToMaterial( + CombType.FLUIX, + new Materials[] { Materials.Fluix }, + new int[] { 25 * 100 }, + new int[] { 9 }, + Voltage.ULV, + NI, + 30 * 100); // Metals Line addProcessGT(CombType.SLAG, new Materials[] { Materials.Limestone }, Voltage.LV); @@ -763,200 +493,79 @@ public class ItemComb extends Item implements IGT_ItemWithMaterialRenderer { addProcessGT(CombType.ARSENIC, new Materials[] { Materials.Arsenic }, Voltage.LV); addProcessGT(CombType.IRON, new Materials[] { Materials.Iron }, Voltage.LV); addProcessGT(CombType.STEEL, new Materials[] { Materials.Steel }, Voltage.LV); - if (GT_Mod.gregtechproxy.mNerfedCombs) { - addCentrifugeToMaterial( - CombType.SLAG, - new Materials[] { Materials.Stone, Materials.GraniteBlack, Materials.GraniteRed }, - new int[] { 50 * 100, 20 * 100, 20 * 100 }, - new int[] { 9, 9, 9 }, - Voltage.ULV, - NI, - 30 * 100); - addCentrifugeToMaterial( - CombType.COPPER, - new Materials[] { Materials.Copper }, - new int[] { 70 * 100 }, - new int[] {}, - Voltage.ULV, - NI, - 30 * 100); - addCentrifugeToMaterial( - CombType.TIN, - new Materials[] { Materials.Tin }, - new int[] { 60 * 100 }, - new int[] {}, - Voltage.ULV, - NI, - 30 * 100); - addCentrifugeToMaterial( - CombType.LEAD, - new Materials[] { Materials.Lead }, - new int[] { 45 * 100 }, - new int[] {}, - Voltage.ULV, - NI, - 30 * 100); - addCentrifugeToMaterial( - CombType.IRON, - new Materials[] { Materials.Iron }, - new int[] { 30 * 100 }, - new int[] {}, - Voltage.ULV, - NI, - 30 * 100); - addCentrifugeToMaterial( - CombType.STEEL, - new Materials[] { Materials.Steel }, - new int[] { 40 * 100 }, - new int[] {}, - Voltage.ULV, - NI, - 30 * 100); - addCentrifugeToMaterial( - CombType.SILVER, - new Materials[] { Materials.Silver }, - new int[] { 80 * 100 }, - new int[] {}, - Voltage.ULV, - NI, - 30 * 100); - addCentrifugeToMaterial( - CombType.CRYOLITE, - new Materials[] { Materials.Cryolite }, - new int[] { 80 * 100 }, - new int[] {}, - Voltage.ULV, - NI, - 30 * 100); - addCentrifugeToMaterial( - CombType.SULFUR, - new Materials[] { Materials.Sulfur }, - new int[] { 100 * 100 }, - new int[] {}, - Voltage.ULV, - NI, - 30 * 100); - } else { - addCentrifugeToMaterial( - CombType.SLAG, - new Materials[] { Materials.Salt, Materials.RockSalt, Materials.Lepidolite, Materials.Spodumene, - Materials.Monazite }, - new int[] { 100 * 100, 100 * 100, 100 * 100 }, - new int[] {}, - Voltage.ULV, - NI, - 30 * 100); - addCentrifugeToMaterial( - CombType.COPPER, - new Materials[] { Materials.Copper, Materials.Tetrahedrite, Materials.Chalcopyrite, Materials.Malachite, - Materials.Pyrite, Materials.Stibnite }, - new int[] { 100 * 100, 85 * 100, 95 * 100, 80 * 100, 75 * 100, 65 * 100 }, - new int[] {}, - Voltage.ULV, - NI, - 30 * 100); - addCentrifugeToMaterial( - CombType.TIN, - new Materials[] { Materials.Tin, Materials.Cassiterite, Materials.CassiteriteSand }, - new int[] { 100 * 100, 85 * 100, 65 * 100 }, - new int[] {}, - Voltage.ULV, - NI, - 30 * 100); - addCentrifugeToMaterial( - CombType.LEAD, - new Materials[] { Materials.Lead, Materials.Galena }, - new int[] { 100 * 100, 75 * 100 }, - new int[] {}, - Voltage.ULV, - NI, - 30 * 100); - - addCentrifugeToMaterial( - CombType.IRON, - new Materials[] { Materials.Iron, Materials.Magnetite, Materials.BrownLimonite, - Materials.YellowLimonite, Materials.VanadiumMagnetite, Materials.MeteoricIron }, - new int[] { 100 * 100, 90 * 100, 85 * 100, 85 * 100, 80 * 100, 75 * 100 }, - new int[] {}, - Voltage.ULV, - NI, - 30 * 100); - addCentrifugeToMaterial( - CombType.LEAD, - new Materials[] { Materials.Steel, Materials.Magnetite, Materials.VanadiumMagnetite, - Materials.Molybdenite, Materials.Molybdenum, Materials.MeteoricIron }, - new int[] { 100 * 100, 90 * 100, 80 * 100, 65 * 100, 65 * 100, 75 * 100 }, - new int[] {}, - Voltage.ULV, - NI, - 30 * 100); - - addCentrifugeToMaterial( - CombType.NICKEL, - new Materials[] { Materials.Nickel, Materials.Garnierite, Materials.Pentlandite, Materials.Cobaltite, - Materials.Wulfenite, Materials.Powellite }, - new int[] { 100 * 100, 85 * 100, 85 * 100, 80 * 100, 75 * 100, 75 * 100 }, - new int[] {}, - Voltage.ULV, - NI, - 30 * 100); - addCentrifugeToMaterial( - CombType.ZINC, - new Materials[] { Materials.Zinc, Materials.Sphalerite, Materials.Sulfur }, - new int[] { 100 * 100, 80 * 100, 75 * 100 }, - new int[] {}, - Voltage.ULV, - NI, - 30 * 100); - addCentrifugeToMaterial( - CombType.SILVER, - new Materials[] { Materials.Silver, Materials.Galena }, - new int[] { 100 * 100, 80 * 100 }, - new int[] {}, - Voltage.ULV, - NI, - 30 * 100); - addCentrifugeToMaterial( - CombType.CRYOLITE, - new Materials[] { Materials.Cryolite, Materials.Silver }, - new int[] { 100 * 100, 80 * 100 }, - new int[] {}, - Voltage.ULV, - NI, - 30 * 100); - addCentrifugeToMaterial( - CombType.GOLD, - new Materials[] { Materials.Gold }, - new int[] { 100 * 100 }, - new int[] {}, - Voltage.ULV, - NI, - 30 * 100); - addCentrifugeToMaterial( - CombType.SULFUR, - new Materials[] { Materials.Sulfur, Materials.Pyrite, Materials.Sphalerite }, - new int[] { 100 * 100, 90 * 100, 80 * 100 }, - new int[] {}, - Voltage.ULV, - NI, - 30 * 100); - addCentrifugeToMaterial( - CombType.GALLIUM, - new Materials[] { Materials.Gallium, Materials.Niobium }, - new int[] { 80 * 100, 75 * 100 }, - new int[] {}, - Voltage.ULV, - NI, - 30 * 100); - addCentrifugeToMaterial( - CombType.ARSENIC, - new Materials[] { Materials.Arsenic, Materials.Bismuth, Materials.Antimony }, - new int[] { 80 * 100, 70 * 100, 70 * 100 }, - new int[] {}, - Voltage.ULV, - NI, - 30 * 100); - } + + addCentrifugeToMaterial( + CombType.SLAG, + new Materials[] { Materials.Stone, Materials.GraniteBlack, Materials.GraniteRed }, + new int[] { 50 * 100, 20 * 100, 20 * 100 }, + new int[] { 9, 9, 9 }, + Voltage.ULV, + NI, + 30 * 100); + addCentrifugeToMaterial( + CombType.COPPER, + new Materials[] { Materials.Copper }, + new int[] { 70 * 100 }, + new int[] {}, + Voltage.ULV, + NI, + 30 * 100); + addCentrifugeToMaterial( + CombType.TIN, + new Materials[] { Materials.Tin }, + new int[] { 60 * 100 }, + new int[] {}, + Voltage.ULV, + NI, + 30 * 100); + addCentrifugeToMaterial( + CombType.LEAD, + new Materials[] { Materials.Lead }, + new int[] { 45 * 100 }, + new int[] {}, + Voltage.ULV, + NI, + 30 * 100); + addCentrifugeToMaterial( + CombType.IRON, + new Materials[] { Materials.Iron }, + new int[] { 30 * 100 }, + new int[] {}, + Voltage.ULV, + NI, + 30 * 100); + addCentrifugeToMaterial( + CombType.STEEL, + new Materials[] { Materials.Steel }, + new int[] { 40 * 100 }, + new int[] {}, + Voltage.ULV, + NI, + 30 * 100); + addCentrifugeToMaterial( + CombType.SILVER, + new Materials[] { Materials.Silver }, + new int[] { 80 * 100 }, + new int[] {}, + Voltage.ULV, + NI, + 30 * 100); + addCentrifugeToMaterial( + CombType.CRYOLITE, + new Materials[] { Materials.Cryolite }, + new int[] { 80 * 100 }, + new int[] {}, + Voltage.ULV, + NI, + 30 * 100); + addCentrifugeToMaterial( + CombType.SULFUR, + new Materials[] { Materials.Sulfur }, + new int[] { 100 * 100 }, + new int[] {}, + Voltage.ULV, + NI, + 30 * 100); // Rare Metals Line addProcessGT(CombType.BAUXITE, new Materials[] { Materials.Bauxite }, Voltage.LV); @@ -975,124 +584,15 @@ public class ItemComb extends Item implements IGT_ItemWithMaterialRenderer { addProcessGT(CombType.ELECTROTINE, new Materials[] { Materials.Electrotine }, Voltage.MV); addProcessGT(CombType.DRACONIC, new Materials[] { Materials.Draconium }, Voltage.IV); addProcessGT(CombType.AWAKENEDDRACONIUM, new Materials[] { Materials.DraconiumAwakened }, Voltage.ZPM); - if (GT_Mod.gregtechproxy.mNerfedCombs) { - addCentrifugeToItemStack( - CombType.SALT, - new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Salt, 6), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.RockSalt, 6), ItemList.FR_Wax.get(1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Saltpeter, 6) }, - new int[] { 100 * 100, 100 * 100, 50 * 100, 25 * 100 }, - Voltage.MV, - 160); - } else { - addCentrifugeToMaterial( - CombType.BAUXITE, - new Materials[] { Materials.Bauxite, Materials.Aluminium }, - new int[] { 75 * 100, 55 * 100 }, - new int[] {}, - Voltage.ULV, - NI, - 30 * 100); - addCentrifugeToMaterial( - CombType.ALUMINIUM, - new Materials[] { Materials.Aluminium, Materials.Bauxite }, - new int[] { 60 * 100, 80 * 100 }, - new int[] {}, - Voltage.ULV, - NI, - 30 * 100); - addCentrifugeToMaterial( - CombType.MANGANESE, - new Materials[] { Materials.Manganese, Materials.Grossular, Materials.Spessartine, Materials.Pyrolusite, - Materials.Tantalite }, - new int[] { 30 * 100, 100 * 100, 100 * 100, 100 * 100, 100 * 100 }, - new int[] {}, - Voltage.ULV, - NI, - 30 * 100); - addCentrifugeToMaterial( - CombType.TITANIUM, - new Materials[] { Materials.Titanium, Materials.Ilmenite, Materials.Bauxite, Materials.Rutile }, - new int[] { 90 * 100, 80 * 100, 75 * 100, 75 * 100 }, - new int[] {}, - Voltage.EV, - NI, - 30 * 100); - addCentrifugeToMaterial( - CombType.MAGNESIUM, - new Materials[] { Materials.Magnesium, Materials.Magnesite }, - new int[] { 100 * 100, 80 * 100 }, - new int[] {}, - Voltage.ULV, - NI, - 30 * 100); - addCentrifugeToMaterial( - CombType.CHROME, - new Materials[] { Materials.Chrome, Materials.Ruby, Materials.Chromite, Materials.Redstone, - Materials.Neodymium, Materials.Bastnasite }, - new int[] { 50 * 100, 100 * 100, 50 * 100, 100 * 100, 80 * 100, 80 * 100 }, - new int[] {}, - Voltage.HV, - NI, - 30 * 100); - addCentrifugeToMaterial( - CombType.TUNGSTEN, - new Materials[] { Materials.Tungsten, Materials.Tungstate, Materials.Scheelite, Materials.Lithium }, - new int[] { 50 * 100, 80 * 100, 75 * 100, 75 * 100 }, - new int[] {}, - Voltage.IV, - NI, - 30 * 100); - addCentrifugeToMaterial( - CombType.PLATINUM, - new Materials[] { Materials.Platinum, Materials.Cooperite, Materials.Palladium }, - new int[] { 40 * 100, 40 * 100, 40 * 100 }, - new int[] {}, - Voltage.HV, - NI, - 30 * 100); - addCentrifugeToMaterial( - CombType.MOLYBDENUM, - new Materials[] { Materials.Molybdenum, Materials.Molybdenite, Materials.Powellite, - Materials.Wulfenite }, - new int[] { 100 * 100, 80 * 100, 75 * 100 }, - new int[] {}, - Voltage.ULV, - NI, - 30 * 100); - addCentrifugeToMaterial( - CombType.IRIDIUM, - new Materials[] { Materials.Iridium, Materials.Osmium }, - new int[] { 20 * 100, 15 * 100 }, - new int[] {}, - Voltage.IV, - NI, - 30 * 100); - addCentrifugeToMaterial( - CombType.OSMIUM, - new Materials[] { Materials.Osmium, Materials.Iridium }, - new int[] { 25 * 100, 15 * 100 }, - new int[] {}, - Voltage.IV, - NI, - 30 * 100); - addCentrifugeToMaterial( - CombType.LITHIUM, - new Materials[] { Materials.Lithium, Materials.Aluminium }, - new int[] { 85 * 100, 75 * 100 }, - new int[] {}, - Voltage.MV, - NI, - 30 * 100); - addCentrifugeToItemStack( - CombType.SALT, - new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Salt, 6), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.RockSalt, 6), ItemList.FR_Wax.get(1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Saltpeter, 6) }, - new int[] { 100 * 100, 100 * 100, 50 * 100, 25 * 100 }, - Voltage.MV, - 160); - } + + addCentrifugeToItemStack( + CombType.SALT, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Salt, 6), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.RockSalt, 6), ItemList.FR_Wax.get(1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Saltpeter, 6) }, + new int[] { 100 * 100, 100 * 100, 50 * 100, 25 * 100 }, + Voltage.MV, + 160); // Radioactive Line addProcessGT(CombType.ALMANDINE, new Materials[] { Materials.Almandine }, Voltage.LV); @@ -1104,80 +604,6 @@ public class ItemComb extends Item implements IGT_ItemWithMaterialRenderer { addProcessGT(CombType.LUTETIUM, new Materials[] { Materials.Lutetium }, Voltage.IV); addProcessGT(CombType.AMERICIUM, new Materials[] { Materials.Americium }, Voltage.LuV); addProcessGT(CombType.NEUTRONIUM, new Materials[] { Materials.Neutronium }, Voltage.UHV); - if (!GT_Mod.gregtechproxy.mNerfedCombs) { - addCentrifugeToMaterial( - CombType.ALMANDINE, - new Materials[] { Materials.Almandine, Materials.Pyrope, Materials.Sapphire, Materials.GreenSapphire }, - new int[] { 90 * 100, 80 * 100, 75 * 100, 75 * 100 }, - new int[] {}, - Voltage.ULV, - NI, - 30 * 100); - addCentrifugeToMaterial( - CombType.URANIUM, - new Materials[] { Materials.Uranium, Materials.Pitchblende, Materials.Uraninite, Materials.Uranium235 }, - new int[] { 50 * 100, 65 * 100, 75 * 100, 50 * 100 }, - new int[] {}, - Voltage.EV, - NI, - 30 * 100); - addCentrifugeToMaterial( - CombType.PLUTONIUM, - new Materials[] { Materials.Plutonium, Materials.Uranium235 }, - new int[] { 10, 5 }, - new int[] {}, - Voltage.EV, - NI, - 30 * 100); - addCentrifugeToMaterial( - CombType.NAQUADAH, - new Materials[] { Materials.Naquadah, Materials.NaquadahEnriched, Materials.Naquadria }, - new int[] { 10 * 100, 5 * 100, 5 * 100 }, - new int[] {}, - Voltage.IV, - NI, - 30 * 100); - addCentrifugeToMaterial( - CombType.NAQUADRIA, - new Materials[] { Materials.Naquadria, Materials.NaquadahEnriched, Materials.Naquadah }, - new int[] { 10 * 100, 10 * 100, 15 * 100 }, - new int[] {}, - Voltage.LuV, - NI, - 30 * 100); - addCentrifugeToMaterial( - CombType.THORIUM, - new Materials[] { Materials.Thorium, Materials.Uranium, Materials.Coal }, - new int[] { 75 * 100, 75 * 100 * 100, 95 * 100 }, - new int[] {}, - Voltage.EV, - NI, - 30 * 100); - addCentrifugeToMaterial( - CombType.LUTETIUM, - new Materials[] { Materials.Lutetium, Materials.Thorium }, - new int[] { 35 * 100, 55 * 100 }, - new int[] {}, - Voltage.IV, - NI, - 30 * 100); - addCentrifugeToMaterial( - CombType.AMERICIUM, - new Materials[] { Materials.Americium, Materials.Lutetium }, - new int[] { 25 * 100, 45 * 100 }, - new int[] {}, - Voltage.LuV, - NI, - 30 * 100); - addCentrifugeToMaterial( - CombType.NEUTRONIUM, - new Materials[] { Materials.Neutronium, Materials.Americium }, - new int[] { 15 * 100, 35 * 100 }, - new int[] {}, - Voltage.UHV, - NI, - 30 * 100); - } // Twilight addCentrifugeToItemStack( @@ -1270,16 +696,7 @@ public class ItemComb extends Item implements IGT_ItemWithMaterialRenderer { new int[] { 25 * 100, 10 * 100, 20 * 100, 15 * 100 }, Voltage.EV); addProcessGT(CombType.ENDIUM, new Materials[] { Materials.HeeEndium }, Voltage.HV); - if (!GT_Mod.gregtechproxy.mNerfedCombs) { - addCentrifugeToMaterial( - CombType.ENDIUM, - new Materials[] { Materials.HeeEndium }, - new int[] { 50 * 100 }, - new int[] {}, - Voltage.HV, - GT_ModHandler.getModItem(MagicBees.ID, "wax", 1L, 0), - 20 * 100); - } + addCentrifugeToItemStack( CombType.RUNEI, new ItemStack[] { GT_ModHandler.getModItem(MagicBees.ID, "wax", 1L, 0), @@ -1330,8 +747,7 @@ public class ItemComb extends Item implements IGT_ItemWithMaterialRenderer { addCentrifugeToMaterial( CombType.INFUSEDGOLD, new Materials[] { Materials.InfusedGold, Materials.Gold }, - new int[] { (GT_Mod.gregtechproxy.mNerfedCombs ? 20 : 50) * 100, - (GT_Mod.gregtechproxy.mNerfedCombs ? 10 : 30) * 100 }, + new int[] { 20 * 100, 10 * 100 }, new int[] {}, Voltage.IV, 200, @@ -1341,8 +757,7 @@ public class ItemComb extends Item implements IGT_ItemWithMaterialRenderer { addCentrifugeToMaterial( CombType.MYSTERIOUSCRYSTAL, new Materials[] { Materials.MysteriousCrystal }, - new int[] { (GT_Mod.gregtechproxy.mNerfedCombs ? 10 : 40) * 100, - (GT_Mod.gregtechproxy.mNerfedCombs ? 15 : 50) * 100 }, + new int[] { 10 * 100, 15 * 100 }, new int[] {}, Voltage.LuV, 512, @@ -1350,80 +765,6 @@ public class ItemComb extends Item implements IGT_ItemWithMaterialRenderer { 50 * 100); addProcessGT(CombType.BLACKPLUTONIUM, new Materials[] { Materials.BlackPlutonium }, Voltage.LuV); addProcessGT(CombType.TRINIUM, new Materials[] { Materials.Trinium }, Voltage.ZPM); - if (!GT_Mod.gregtechproxy.mNerfedCombs) { - addCentrifugeToMaterial( - CombType.METEORICIRON, - new Materials[] { Materials.MeteoricIron, Materials.Iron }, - new int[] { 85 * 100, 100 * 100 }, - new int[] {}, - Voltage.HV, - NI, - 30 * 100); - addCentrifugeToMaterial( - CombType.DESH, - new Materials[] { Materials.Desh, Materials.Titanium }, - new int[] { 75 * 100, 50 * 100 }, - new int[] {}, - Voltage.EV, - NI, - 30 * 100); - addCentrifugeToMaterial( - CombType.LEDOX, - new Materials[] { Materials.Ledox, Materials.CallistoIce, Materials.Lead }, - new int[] { 65 * 100, 55 * 100, 85 * 100 }, - new int[] {}, - Voltage.EV, - NI, - 30 * 100); - addCentrifugeToMaterial( - CombType.CALLISTOICE, - new Materials[] { Materials.CallistoIce, Materials.Ledox, Materials.Lead }, - new int[] { 65 * 100, 75 * 100, 100 * 100 }, - new int[] {}, - Voltage.IV, - NI, - 30 * 100); - addCentrifugeToMaterial( - CombType.MYTRYL, - new Materials[] { Materials.Mytryl, Materials.Mithril }, - new int[] { 55 * 100, 50 * 100 }, - new int[] {}, - Voltage.IV, - NI, - 30 * 100); - addCentrifugeToMaterial( - CombType.QUANTIUM, - new Materials[] { Materials.Quantium, Materials.Osmium }, - new int[] { 50 * 100, 60 * 100 }, - new int[] {}, - Voltage.IV, - NI, - 30 * 100); - addCentrifugeToMaterial( - CombType.ORIHARUKON, - new Materials[] { Materials.Oriharukon, Materials.Lead }, - new int[] { 50 * 100, 75 * 100 }, - new int[] {}, - Voltage.IV, - NI, - 30 * 100); - addCentrifugeToMaterial( - CombType.BLACKPLUTONIUM, - new Materials[] { Materials.BlackPlutonium, Materials.Plutonium }, - new int[] { 25 * 100, 50 * 100 }, - new int[] {}, - Voltage.LuV, - NI, - 30 * 100); - addCentrifugeToMaterial( - CombType.TRINIUM, - new Materials[] { Materials.Trinium, Materials.Iridium }, - new int[] { 35 * 100, 45 * 100 }, - new int[] {}, - Voltage.ZPM, - NI, - 30 * 100); - } // Planet Line addCentrifugeToItemStack( @@ -1772,7 +1113,7 @@ public class ItemComb extends Item implements IGT_ItemWithMaterialRenderer { Product.put(aItem[i], chance[i] / 10000.0f); } - if (volt.compareTo(Voltage.MV) < 0 || !GT_Mod.gregtechproxy.mNerfedCombs) { + if (volt.compareTo(Voltage.MV) < 0) { RecipeManagers.centrifugeManager.addRecipe(40, tComb, Product.build()); } @@ -1888,12 +1229,10 @@ public class ItemComb extends Item implements IGT_ItemWithMaterialRenderer { /** @return duration needed for Centrifuge process related to the Tier **/ public int getSimpleTime() { - if (!GT_Mod.gregtechproxy.mNerfedCombs) { - return 96 + this.ordinal() * 32; - } else { - // ULV, LV needs 128ticks, MV need 256 ticks, HV need 384 ticks, EV need 512 ticks, IV need 640 ticks - return 128 * (Math.max(1, this.ordinal())); - } + + // ULV, LV needs 128ticks, MV need 256 ticks, HV need 384 ticks, EV need 512 ticks, IV need 640 ticks + return 128 * (Math.max(1, this.ordinal())); + } /** @return aEU/t needed for Centrifuge process related to the Tier **/ diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Drill_HV.java b/src/main/java/gregtech/common/tools/GT_Tool_Drill_HV.java index 3731f578db..597e8b0725 100644 --- a/src/main/java/gregtech/common/tools/GT_Tool_Drill_HV.java +++ b/src/main/java/gregtech/common/tools/GT_Tool_Drill_HV.java @@ -11,7 +11,7 @@ public class GT_Tool_Drill_HV extends GT_Tool_Drill_LV { @Override public int getToolDamagePerBlockBreak() { - return GT_Mod.gregtechproxy.mHardRock ? 400 : 800; + return 800; } @Override diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Drill_LV.java b/src/main/java/gregtech/common/tools/GT_Tool_Drill_LV.java index 911374dc15..f06c2c812d 100644 --- a/src/main/java/gregtech/common/tools/GT_Tool_Drill_LV.java +++ b/src/main/java/gregtech/common/tools/GT_Tool_Drill_LV.java @@ -21,7 +21,7 @@ public class GT_Tool_Drill_LV extends GT_Tool { @Override public int getToolDamagePerBlockBreak() { - return GT_Mod.gregtechproxy.mHardRock ? 25 : 50; + return 50; } @Override diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Drill_MV.java b/src/main/java/gregtech/common/tools/GT_Tool_Drill_MV.java index 02e7a08dfc..7b6b54d4b5 100644 --- a/src/main/java/gregtech/common/tools/GT_Tool_Drill_MV.java +++ b/src/main/java/gregtech/common/tools/GT_Tool_Drill_MV.java @@ -2,7 +2,6 @@ package gregtech.common.tools; import net.minecraft.item.ItemStack; -import gregtech.GT_Mod; import gregtech.api.enums.Textures; import gregtech.api.interfaces.IIconContainer; @@ -10,7 +9,7 @@ public class GT_Tool_Drill_MV extends GT_Tool_Drill_LV { @Override public int getToolDamagePerBlockBreak() { - return GT_Mod.gregtechproxy.mHardRock ? 100 : 200; + return 200; } @Override diff --git a/src/main/java/gregtech/common/tools/GT_Tool_JackHammer.java b/src/main/java/gregtech/common/tools/GT_Tool_JackHammer.java index 2621ff8ef7..7c8b17f711 100644 --- a/src/main/java/gregtech/common/tools/GT_Tool_JackHammer.java +++ b/src/main/java/gregtech/common/tools/GT_Tool_JackHammer.java @@ -24,7 +24,7 @@ public class GT_Tool_JackHammer extends GT_Tool_Drill_LV { @Override public int getToolDamagePerBlockBreak() { - return GT_Mod.gregtechproxy.mHardRock ? 200 : 400; + return 400; } @Override diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Pickaxe.java b/src/main/java/gregtech/common/tools/GT_Tool_Pickaxe.java index e2857e4af1..b755869112 100644 --- a/src/main/java/gregtech/common/tools/GT_Tool_Pickaxe.java +++ b/src/main/java/gregtech/common/tools/GT_Tool_Pickaxe.java @@ -19,7 +19,7 @@ public class GT_Tool_Pickaxe extends GT_Tool { @Override public int getToolDamagePerBlockBreak() { - return GT_Mod.gregtechproxy.mHardRock ? 25 : 50; + return 50; } @Override |