diff options
Diffstat (limited to 'src/main/java')
18 files changed, 6100 insertions, 7365 deletions
diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/werkstoff_loaders/recipe/CrushedLoader.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/werkstoff_loaders/recipe/CrushedLoader.java index 9afe680154..44ba058954 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/werkstoff_loaders/recipe/CrushedLoader.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/werkstoff_loaders/recipe/CrushedLoader.java @@ -40,7 +40,6 @@ import static gregtech.api.util.GT_RecipeBuilder.TICKS; import com.github.bartimaeusnek.bartworks.system.material.Werkstoff; import com.github.bartimaeusnek.bartworks.system.material.werkstoff_loaders.IWerkstoffRunnable; -import gregtech.GT_Mod; import gregtech.api.enums.GT_Values; import gregtech.api.enums.Materials; import gregtech.api.enums.SubTag; @@ -253,8 +252,7 @@ public class CrushedLoader implements IWerkstoffRunnable { werkstoff.getOreByProduct(1, dust), GT_OreDictUnificator.get(dust, Materials.Stone, 1L)) .outputChances(10000, 7000, 4000) - .fluidInputs( - Materials.SodiumPersulfate.getFluid(GT_Mod.gregtechproxy.mDisableOldChemicalRecipes ? 1000L : 100L)) + .fluidInputs(Materials.SodiumPersulfate.getFluid(100L)) .duration(40 * SECONDS) .eut(8) .addTo(chemicalBathRecipes); diff --git a/src/main/java/gregtech/api/util/GT_RecipeRegistrator.java b/src/main/java/gregtech/api/util/GT_RecipeRegistrator.java index f4490b59b0..ff897438cf 100644 --- a/src/main/java/gregtech/api/util/GT_RecipeRegistrator.java +++ b/src/main/java/gregtech/api/util/GT_RecipeRegistrator.java @@ -52,7 +52,6 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.SetMultimap; import cpw.mods.fml.relauncher.ReflectionHelper; -import gregtech.GT_Mod; import gregtech.api.GregTech_API; import gregtech.api.enums.GT_Values; import gregtech.api.enums.Materials; @@ -305,11 +304,8 @@ public class GT_RecipeRegistrator { continue; } if (tMaterial.mMaterial.contains(SubTag.METAL)) { - if (GT_Mod.gregtechproxy.mArcSmeltIntoAnnealed) { - tMaterial.mMaterial = tMaterial.mMaterial.mSmeltInto.mArcSmeltInto; - } else { - tMaterial.mMaterial = tMaterial.mMaterial.mSmeltInto.mSmeltInto; - } + + tMaterial.mMaterial = tMaterial.mMaterial.mSmeltInto.mArcSmeltInto; continue; } tMaterial.mAmount = 0; 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, Materia |