aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/loaders/oreprocessing
diff options
context:
space:
mode:
authorboubou19 <miisterunknown@gmail.com>2023-04-01 18:11:43 +0200
committerGitHub <noreply@github.com>2023-04-01 18:11:43 +0200
commit5f50e4a36ec000657b0a1664784acf00275293c6 (patch)
tree5ef81441032735438c9fd9c620224ca58e46e537 /src/main/java/gregtech/loaders/oreprocessing
parent6b77557e0e87cf5afd9ebd3985323ff1249e615c (diff)
downloadGT5-Unofficial-5f50e4a36ec000657b0a1664784acf00275293c6.tar.gz
GT5-Unofficial-5f50e4a36ec000657b0a1664784acf00275293c6.tar.bz2
GT5-Unofficial-5f50e4a36ec000657b0a1664784acf00275293c6.zip
update spotless formatting (#1827)
Diffstat (limited to 'src/main/java/gregtech/loaders/oreprocessing')
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingAll.java8
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingArrows.java6
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingBlock.java30
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingCell.java10
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingCrop.java12
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingDust.java26
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingDye.java15
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingFood.java7
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingGem.java14
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingIngot.java34
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingLens.java6
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingLog.java49
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingNugget.java10
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingOre.java80
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingOreSmelting.java12
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingPipe.java9
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingPlate.java19
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingRound.java5
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingShaping.java7
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingToolOther.java56
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingTransforming.java24
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingWire.java53
22 files changed, 313 insertions, 179 deletions
diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingAll.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingAll.java
index bdd1109a93..39b33b2d5f 100644
--- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingAll.java
+++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingAll.java
@@ -15,8 +15,10 @@ public class ProcessingAll implements gregtech.api.interfaces.IOreRecipeRegistra
@Override
public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName,
ItemStack aStack) {
- if (((aStack.getItem() instanceof net.minecraft.item.ItemBlock))
- && (aPrefix.mDefaultStackSize < aStack.getItem().getItemStackLimit(aStack)))
- aStack.getItem().setMaxStackSize(aPrefix.mDefaultStackSize);
+ if (((aStack.getItem() instanceof net.minecraft.item.ItemBlock)) && (aPrefix.mDefaultStackSize
+ < aStack.getItem()
+ .getItemStackLimit(aStack)))
+ aStack.getItem()
+ .setMaxStackSize(aPrefix.mDefaultStackSize);
}
}
diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingArrows.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingArrows.java
index 6c1d1896b1..9eb2fe13e0 100644
--- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingArrows.java
+++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingArrows.java
@@ -89,9 +89,9 @@ public class ProcessingArrows implements gregtech.api.interfaces.IOreRecipeRegis
GT_Utility.ItemNBT.addEnchantment(
tOutput,
gregtech.api.enchants.Enchantment_EnderDamage.INSTANCE,
- EnchantmentHelper
- .getEnchantmentLevel(gregtech.api.enchants.Enchantment_EnderDamage.INSTANCE.effectId, tOutput)
- + 1);
+ EnchantmentHelper.getEnchantmentLevel(
+ gregtech.api.enchants.Enchantment_EnderDamage.INSTANCE.effectId,
+ tOutput) + 1);
GT_Values.RA.addChemicalBathRecipe(
GT_Utility.copyAmount(1L, aStack),
Materials.Mercury.getFluid(25L),
diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingBlock.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingBlock.java
index 4043ea02aa..c9345964f1 100644
--- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingBlock.java
+++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingBlock.java
@@ -38,10 +38,26 @@ public class ProcessingBlock implements gregtech.api.interfaces.IOreRecipeRegist
GT_ModHandler.removeRecipeDelayed(GT_Utility.copyAmount(1L, aStack));
- if (tStack1 != null) GT_ModHandler
- .removeRecipeDelayed(tStack1, tStack1, tStack1, tStack1, tStack1, tStack1, tStack1, tStack1, tStack1);
- if (tStack2 != null) GT_ModHandler
- .removeRecipeDelayed(tStack2, tStack2, tStack2, tStack2, tStack2, tStack2, tStack2, tStack2, tStack2);
+ if (tStack1 != null) GT_ModHandler.removeRecipeDelayed(
+ tStack1,
+ tStack1,
+ tStack1,
+ tStack1,
+ tStack1,
+ tStack1,
+ tStack1,
+ tStack1,
+ tStack1);
+ if (tStack2 != null) GT_ModHandler.removeRecipeDelayed(
+ tStack2,
+ tStack2,
+ tStack2,
+ tStack2,
+ tStack2,
+ tStack2,
+ tStack2,
+ tStack2,
+ tStack2);
if (tStack3 != null) {
GT_ModHandler.removeRecipeDelayed(
tStack3,
@@ -69,7 +85,8 @@ public class ProcessingBlock implements gregtech.api.interfaces.IOreRecipeRegist
}
if (GregTech_API.sRecipeFile.get(
ConfigCategories.Recipes.storageblockcrafting,
- OrePrefixes.block.get(aMaterial).toString(),
+ OrePrefixes.block.get(aMaterial)
+ .toString(),
false)) {
if ((tStack1 == null) && (tStack2 == null) && (tStack3 != null)) GT_ModHandler.addCraftingRecipe(
GT_OreDictUnificator.get(OrePrefixes.block, aMaterial, 1L),
@@ -90,7 +107,8 @@ public class ProcessingBlock implements gregtech.api.interfaces.IOreRecipeRegist
if (GregTech_API.sRecipeFile.get(
ConfigCategories.Recipes.storageblockdecrafting,
- OrePrefixes.block.get(aMaterial).toString(),
+ OrePrefixes.block.get(aMaterial)
+ .toString(),
tStack2 != null)) {
if (tStack3 != null)
GT_ModHandler.addShapelessCraftingRecipe(tStack3, new Object[] { OrePrefixes.block.get(aMaterial) });
diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCell.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCell.java
index aa478a5560..e088330204 100644
--- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCell.java
+++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCell.java
@@ -60,8 +60,10 @@ public class ProcessingCell implements IOreRecipeRegistrator {
} else {
tStack = GT_OreDictUnificator.get(OrePrefixes.dust, tMat.mMaterial, tMat.mAmount);
if (tStack == null) {
- tStack = GT_OreDictUnificator
- .get(OrePrefixes.cell, tMat.mMaterial, tMat.mAmount);
+ tStack = GT_OreDictUnificator.get(
+ OrePrefixes.cell,
+ tMat.mMaterial,
+ tMat.mAmount);
}
}
if (tItemAmount + tMat.mAmount * 3628800L
@@ -81,8 +83,8 @@ public class ProcessingCell implements IOreRecipeRegistrator {
tList.add(GT_Utility.copyAmount(64L, tStack));
tStack.stackSize -= 64;
}
- int tThisCapsuleCount = GT_ModHandler
- .getCapsuleCellContainerCountMultipliedWithStackSize(tStack);
+ int tThisCapsuleCount = GT_ModHandler.getCapsuleCellContainerCountMultipliedWithStackSize(
+ tStack);
if (tStack.stackSize > 0 && tCapsuleCount + tThisCapsuleCount <= 64L) {
if (tCapsuleCount + tThisCapsuleCount < 0L ? tList.size() < 5
: tList.size() < 6) {
diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrop.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrop.java
index 9062533d93..2a6678c485 100644
--- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrop.java
+++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrop.java
@@ -26,7 +26,8 @@ public class ProcessingCrop implements gregtech.api.interfaces.IOreRecipeRegistr
GT_Values.RA.addBrewingRecipe(aStack, FluidRegistry.WATER, FluidRegistry.getFluid("potion.tea"), false);
GT_Values.RA.addBrewingRecipe(
aStack,
- GT_ModHandler.getDistilledWater(1L).getFluid(),
+ GT_ModHandler.getDistilledWater(1L)
+ .getFluid(),
FluidRegistry.getFluid("potion.tea"),
false);
break;
@@ -38,7 +39,8 @@ public class ProcessingCrop implements gregtech.api.interfaces.IOreRecipeRegistr
false);
GT_Values.RA.addBrewingRecipe(
aStack,
- GT_ModHandler.getDistilledWater(1L).getFluid(),
+ GT_ModHandler.getDistilledWater(1L)
+ .getFluid(),
FluidRegistry.getFluid("potion.grapejuice"),
false);
break;
@@ -72,7 +74,8 @@ public class ProcessingCrop implements gregtech.api.interfaces.IOreRecipeRegistr
true);
GT_Values.RA.addBrewingRecipe(
aStack,
- GT_ModHandler.getDistilledWater(1L).getFluid(),
+ GT_ModHandler.getDistilledWater(1L)
+ .getFluid(),
FluidRegistry.getFluid("potion.potatojuice"),
true);
break;
@@ -90,7 +93,8 @@ public class ProcessingCrop implements gregtech.api.interfaces.IOreRecipeRegistr
false);
GT_Values.RA.addBrewingRecipe(
aStack,
- GT_ModHandler.getDistilledWater(1L).getFluid(),
+ GT_ModHandler.getDistilledWater(1L)
+ .getFluid(),
FluidRegistry.getFluid("potion.lemonjuice"),
false);
GT_Values.RA.addBrewingRecipe(
diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingDust.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingDust.java
index 75ba5cc4af..8df5270399 100644
--- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingDust.java
+++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingDust.java
@@ -33,8 +33,11 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr
ItemStack aStack) {
switch (aPrefix) {
case dust:
- if (aMaterial.mFuelPower > 0) GT_Values.RA
- .addFuel(GT_Utility.copyAmount(1L, aStack), null, aMaterial.mFuelPower, aMaterial.mFuelType);
+ if (aMaterial.mFuelPower > 0) GT_Values.RA.addFuel(
+ GT_Utility.copyAmount(1L, aStack),
+ null,
+ aMaterial.mFuelPower,
+ aMaterial.mFuelType);
if (GT_Utility.getFluidForFilledItem(GT_OreDictUnificator.get(OrePrefixes.cell, aMaterial, 1L), true)
== null)
GT_Values.RA.addCannerRecipe(
@@ -69,8 +72,11 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr
null,
null,
aMaterial.mBlastFurnaceTemp > 1750
- ? GT_OreDictUnificator
- .get(OrePrefixes.ingotHot, aMaterial.mSmeltInto, tDustStack, 1L)
+ ? GT_OreDictUnificator.get(
+ OrePrefixes.ingotHot,
+ aMaterial.mSmeltInto,
+ tDustStack,
+ 1L)
: GT_Utility.copyAmount(1L, tDustStack),
null,
(int) Math.max(aMaterial.getMass() / 40L, 1L) * aMaterial.mBlastFurnaceTemp,
@@ -134,11 +140,11 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr
}
if ((tDustStack.stackSize > 0) && (tList.size() < 6)
&& (tCapsuleCount
- + GT_ModHandler
- .getCapsuleCellContainerCountMultipliedWithStackSize(tDustStack)
+ + GT_ModHandler.getCapsuleCellContainerCountMultipliedWithStackSize(
+ tDustStack)
<= 64L)) {
- tCapsuleCount += GT_ModHandler
- .getCapsuleCellContainerCountMultipliedWithStackSize(tDustStack);
+ tCapsuleCount += GT_ModHandler.getCapsuleCellContainerCountMultipliedWithStackSize(
+ tDustStack);
tList.add(tDustStack);
}
}
@@ -154,8 +160,8 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr
&& ((tFluid = GT_Utility.getFluidForFilledItem((ItemStack) tList.get(i), true))
!= null)) {
tFluid.amount *= tList.get(i).stackSize;
- tCapsuleCount -= GT_ModHandler
- .getCapsuleCellContainerCountMultipliedWithStackSize((ItemStack) tList.get(i));
+ tCapsuleCount -= GT_ModHandler.getCapsuleCellContainerCountMultipliedWithStackSize(
+ (ItemStack) tList.get(i));
tList.remove(i);
break;
}
diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingDye.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingDye.java
index 42b5571b2b..f8b1519b8a 100644
--- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingDye.java
+++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingDye.java
@@ -46,7 +46,10 @@ public class ProcessingDye implements IOreRecipeRegistrator {
null,
null,
Materials.Water.getFluid(216L),
- FluidRegistry.getFluidStack("dye.watermixed." + aDye.name().toLowerCase(Locale.ENGLISH), 192),
+ FluidRegistry.getFluidStack(
+ "dye.watermixed." + aDye.name()
+ .toLowerCase(Locale.ENGLISH),
+ 192),
null,
16,
4);
@@ -56,7 +59,10 @@ public class ProcessingDye implements IOreRecipeRegistrator {
null,
null,
GT_ModHandler.getDistilledWater(288L),
- FluidRegistry.getFluidStack("dye.watermixed." + aDye.name().toLowerCase(Locale.ENGLISH), 216),
+ FluidRegistry.getFluidStack(
+ "dye.watermixed." + aDye.name()
+ .toLowerCase(Locale.ENGLISH),
+ 216),
null,
16,
4);
@@ -64,7 +70,10 @@ public class ProcessingDye implements IOreRecipeRegistrator {
GT_Utility.copyAmount(1L, aStack),
GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Salt, 2),
Materials.SulfuricAcid.getFluid(432),
- FluidRegistry.getFluidStack("dye.chemical." + aDye.name().toLowerCase(Locale.ENGLISH), 288),
+ FluidRegistry.getFluidStack(
+ "dye.chemical." + aDye.name()
+ .toLowerCase(Locale.ENGLISH),
+ 288),
GT_Values.NI,
600,
48);
diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingFood.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingFood.java
index bfd85af1a4..27a11896f6 100644
--- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingFood.java
+++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingFood.java
@@ -31,8 +31,11 @@ public class ProcessingFood implements gregtech.api.interfaces.IOreRecipeRegistr
break;
case "foodDough":
GT_ModHandler.removeFurnaceSmelting(aStack);
- GT_Values.RA
- .addBenderRecipe(GT_Utility.copyAmount(1L, aStack), ItemList.Food_Flat_Dough.get(1L), 16, 4);
+ GT_Values.RA.addBenderRecipe(
+ GT_Utility.copyAmount(1L, aStack),
+ ItemList.Food_Flat_Dough.get(1L),
+ 16,
+ 4);
GT_Values.RA.addMixerRecipe(
aStack,
diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingGem.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingGem.java
index 0a3315a259..5bc183a1da 100644
--- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingGem.java
+++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingGem.java
@@ -232,8 +232,11 @@ public class ProcessingGem implements gregtech.api.interfaces.IOreRecipeRegistra
16);
break;
case gemFlawed:
- if (aFuelPower) GT_Values.RA
- .addFuel(GT_Utility.copyAmount(1L, aStack), null, aMaterial.mFuelPower, aMaterial.mFuelType);
+ if (aFuelPower) GT_Values.RA.addFuel(
+ GT_Utility.copyAmount(1L, aStack),
+ null,
+ aMaterial.mFuelPower,
+ aMaterial.mFuelType);
if (!aNoWorking) {
GT_Values.RA.addLatheRecipe(
GT_Utility.copyAmount(1L, aStack),
@@ -305,8 +308,11 @@ public class ProcessingGem implements gregtech.api.interfaces.IOreRecipeRegistra
new Object[] { "X", "m", 'X', OrePrefixes.gemFlawless.get(aMaterial) });
}
}
- GT_Values.RA
- .addForgeHammerRecipe(aStack, GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 2L), 64, 16);
+ GT_Values.RA.addForgeHammerRecipe(
+ aStack,
+ GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 2L),
+ 64,
+ 16);
for (ItemStack is : OreDictionary.getOres("craftingLens" + aMaterial.mColor.mName.replace(" ", ""))) { // Engraver
// Recipe
// adder
diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingIngot.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingIngot.java
index bc2534204a..fbc0766f81 100644
--- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingIngot.java
+++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingIngot.java
@@ -52,8 +52,14 @@ public class ProcessingIngot implements gregtech.api.interfaces.IOreRecipeRegist
}
}
GT_RecipeRegistrator.registerReverseFluidSmelting(aStack, aMaterial, aPrefix.mMaterialAmount, null);
- GT_RecipeRegistrator
- .registerReverseMacerating(aStack, aMaterial, aPrefix.mMaterialAmount, null, null, null, false);
+ GT_RecipeRegistrator.registerReverseMacerating(
+ aStack,
+ aMaterial,
+ aPrefix.mMaterialAmount,
+ null,
+ null,
+ null,
+ false);
if (aMaterial.mSmeltInto.mArcSmeltInto != aMaterial) {
GT_RecipeRegistrator.registerReverseArcSmelting(
GT_Utility.copyAmount(1L, aStack),
@@ -141,8 +147,10 @@ public class ProcessingIngot implements gregtech.api.interfaces.IOreRecipeRegist
// Enable crafting with hammer if tier is < IV.
if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) {
- if (aSpecialRecipeReq && GregTech_API.sRecipeFile
- .get(ConfigCategories.Tools.hammermultiingot, aMaterial.toString(), true)) {
+ if (aSpecialRecipeReq && GregTech_API.sRecipeFile.get(
+ ConfigCategories.Tools.hammermultiingot,
+ aMaterial.toString(),
+ true)) {
GT_ModHandler.addCraftingRecipe(
GT_OreDictUnificator.get(OrePrefixes.ingotDouble, aMaterial, 1L),
GT_Proxy.tBits,
@@ -164,8 +172,10 @@ public class ProcessingIngot implements gregtech.api.interfaces.IOreRecipeRegist
(int) Math.max(aMaterialMass * 3L, 1L),
calculateRecipeEU(aMaterial, 96));
if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) {
- if (aSpecialRecipeReq && GregTech_API.sRecipeFile
- .get(ConfigCategories.Tools.hammermultiingot, aMaterial.toString(), true)) {
+ if (aSpecialRecipeReq && GregTech_API.sRecipeFile.get(
+ ConfigCategories.Tools.hammermultiingot,
+ aMaterial.toString(),
+ true)) {
GT_ModHandler.addCraftingRecipe(
GT_OreDictUnificator.get(OrePrefixes.ingotTriple, aMaterial, 1L),
GT_Proxy.tBits,
@@ -185,8 +195,10 @@ public class ProcessingIngot implements gregtech.api.interfaces.IOreRecipeRegist
// If tier < IV add manual crafting.
if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) {
- if (aSpecialRecipeReq && GregTech_API.sRecipeFile
- .get(ConfigCategories.Tools.hammermultiingot, aMaterial.toString(), true)) {
+ if (aSpecialRecipeReq && GregTech_API.sRecipeFile.get(
+ ConfigCategories.Tools.hammermultiingot,
+ aMaterial.toString(),
+ true)) {
GT_ModHandler.addCraftingRecipe(
GT_OreDictUnificator.get(OrePrefixes.ingotQuadruple, aMaterial, 1L),
GT_Proxy.tBits,
@@ -205,8 +217,10 @@ public class ProcessingIngot implements gregtech.api.interfaces.IOreRecipeRegist
calculateRecipeEU(aMaterial, 96));
if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) {
- if (aSpecialRecipeReq && GregTech_API.sRecipeFile
- .get(ConfigCategories.Tools.hammermultiingot, aMaterial.toString(), true)) {
+ if (aSpecialRecipeReq && GregTech_API.sRecipeFile.get(
+ ConfigCategories.Tools.hammermultiingot,
+ aMaterial.toString(),
+ true)) {
GT_ModHandler.addCraftingRecipe(
GT_OreDictUnificator.get(OrePrefixes.ingotQuintuple, aMaterial, 1L),
GT_Proxy.tBits,
diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingLens.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingLens.java
index 6e3a8eac00..31c75fbcbb 100644
--- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingLens.java
+++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingLens.java
@@ -56,8 +56,10 @@ public class ProcessingLens implements gregtech.api.interfaces.IOreRecipeRegistr
GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 2L),
2400,
30);
- final ITexture lensCoverTexture = TextureFactory
- .of(Textures.BlockIcons.OVERLAY_LENS, aMaterial.mRGBa, false);
+ final ITexture lensCoverTexture = TextureFactory.of(
+ Textures.BlockIcons.OVERLAY_LENS,
+ aMaterial.mRGBa,
+ false);
GregTech_API.registerCover(
aStack,
TextureFactory.of(Textures.BlockIcons.MACHINE_CASINGS[2][0], lensCoverTexture),
diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingLog.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingLog.java
index 43b4e8b98f..4bb3dd2072 100644
--- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingLog.java
+++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingLog.java
@@ -112,8 +112,10 @@ public class ProcessingLog implements gregtech.api.interfaces.IOreRecipeRegistra
GT_ModHandler.getSmeltingOutput(GT_Utility.copyAmount(1L, aStack), false, null),
new ItemStack(Items.coal, 1, 1)))) {
addPyrolyeOvenRecipes(aStack);
- if (GregTech_API.sRecipeFile
- .get(ConfigCategories.Recipes.disabledrecipes, "wood2charcoalsmelting", true)) {
+ if (GregTech_API.sRecipeFile.get(
+ ConfigCategories.Recipes.disabledrecipes,
+ "wood2charcoalsmelting",
+ true)) {
GT_ModHandler.removeFurnaceSmelting(GT_Utility.copyAmount(1L, aStack));
}
}
@@ -122,8 +124,10 @@ public class ProcessingLog implements gregtech.api.interfaces.IOreRecipeRegistra
GT_ModHandler.getSmeltingOutput(new ItemStack(aStack.getItem(), 1, i), false, null),
new ItemStack(Items.coal, 1, 1)))) {
addPyrolyeOvenRecipes(aStack);
- if (GregTech_API.sRecipeFile
- .get(ConfigCategories.Recipes.disabledrecipes, "wood2charcoalsmelting", true)) {
+ if (GregTech_API.sRecipeFile.get(
+ ConfigCategories.Recipes.disabledrecipes,
+ "wood2charcoalsmelting",
+ true)) {
GT_ModHandler.removeFurnaceSmelting(new ItemStack(aStack.getItem(), 1, i));
}
}
@@ -155,14 +159,12 @@ public class ProcessingLog implements gregtech.api.interfaces.IOreRecipeRegistra
tPlanks,
GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 1L));
GT_ModHandler.removeRecipeDelayed(new ItemStack(aStack.getItem(), 1, i));
- GT_ModHandler
- .addCraftingRecipe(
- GT_Utility.copyAmount(
- GT_Mod.gregtechproxy.mNerfedWoodPlank ? tStack.stackSize
- : tStack.stackSize * 5 / 4,
- tStack),
- GT_ModHandler.RecipeBits.BUFFERED,
- new Object[] { "s", "L", 'L', new ItemStack(aStack.getItem(), 1, i) });
+ GT_ModHandler.addCraftingRecipe(
+ GT_Utility.copyAmount(
+ GT_Mod.gregtechproxy.mNerfedWoodPlank ? tStack.stackSize : tStack.stackSize * 5 / 4,
+ tStack),
+ GT_ModHandler.RecipeBits.BUFFERED,
+ new Object[] { "s", "L", 'L', new ItemStack(aStack.getItem(), 1, i) });
GT_ModHandler.addShapelessCraftingRecipe(
GT_Utility.copyAmount(
tStack.stackSize / (GT_Mod.gregtechproxy.mNerfedWoodPlank ? 2 : 1),
@@ -176,8 +178,10 @@ public class ProcessingLog implements gregtech.api.interfaces.IOreRecipeRegistra
GT_ModHandler.getSmeltingOutput(GT_Utility.copyAmount(1L, aStack), false, null),
new ItemStack(Items.coal, 1, 1)))) {
addPyrolyeOvenRecipes(aStack);
- if (GregTech_API.sRecipeFile
- .get(ConfigCategories.Recipes.disabledrecipes, "wood2charcoalsmelting", true)) {
+ if (GregTech_API.sRecipeFile.get(
+ ConfigCategories.Recipes.disabledrecipes,
+ "wood2charcoalsmelting",
+ true)) {
GT_ModHandler.removeFurnaceSmelting(GT_Utility.copyAmount(1L, aStack));
}
}
@@ -205,16 +209,15 @@ public class ProcessingLog implements gregtech.api.interfaces.IOreRecipeRegistra
tPlanks,
GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 1L));
GT_ModHandler.removeRecipeDelayed(GT_Utility.copyAmount(1L, aStack));
- GT_ModHandler
- .addCraftingRecipe(
- GT_Utility.copyAmount(
- GT_Mod.gregtechproxy.mNerfedWoodPlank ? tStack.stackSize
- : tStack.stackSize * 5 / 4,
- tStack),
- new Object[] { "s", "L", 'L', GT_Utility.copyAmount(1L, aStack) });
+ GT_ModHandler.addCraftingRecipe(
+ GT_Utility.copyAmount(
+ GT_Mod.gregtechproxy.mNerfedWoodPlank ? tStack.stackSize : tStack.stackSize * 5 / 4,
+ tStack),
+ new Object[] { "s", "L", 'L', GT_Utility.copyAmount(1L, aStack) });
GT_ModHandler.addShapelessCraftingRecipe(
- GT_Utility
- .copyAmount(tStack.stackSize / (GT_Mod.gregtechproxy.mNerfedWoodPlank ? 2 : 1), tStack),
+ GT_Utility.copyAmount(
+ tStack.stackSize / (GT_Mod.gregtechproxy.mNerfedWoodPlank ? 2 : 1),
+ tStack),
new Object[] { GT_Utility.copyAmount(1L, aStack) });
}
}
diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingNugget.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingNugget.java
index d62da2e857..af95ed62fd 100644
--- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingNugget.java
+++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingNugget.java
@@ -42,8 +42,14 @@ public class ProcessingNugget implements gregtech.api.interfaces.IOreRecipeRegis
}
GT_RecipeRegistrator.registerReverseFluidSmelting(aStack, aMaterial, aPrefix.mMaterialAmount, null);
- GT_RecipeRegistrator
- .registerReverseMacerating(aStack, aMaterial, aPrefix.mMaterialAmount, null, null, null, false);
+ GT_RecipeRegistrator.registerReverseMacerating(
+ aStack,
+ aMaterial,
+ aPrefix.mMaterialAmount,
+ null,
+ null,
+ null,
+ false);
if (!aMaterial.contains(SubTag.NO_SMELTING)) {
GT_Values.RA.addAlloySmelterRecipe(
GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 1L),
diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingOre.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingOre.java
index 0bc88296da..ca585feab6 100644
--- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingOre.java
+++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingOre.java
@@ -18,12 +18,13 @@ public class ProcessingOre implements gregtech.api.interfaces.IOreRecipeRegistra
private ArrayList<Materials> mAlreadyListedOres = new ArrayList(1000);
public ProcessingOre() {
- for (OrePrefixes tPrefix : OrePrefixes.values())
- if ((tPrefix.name().startsWith("ore")) && (tPrefix != OrePrefixes.orePoor)
- && (tPrefix != OrePrefixes.oreSmall)
- && (tPrefix != OrePrefixes.oreRich)
- && (tPrefix != OrePrefixes.oreNormal))
- tPrefix.add(this);
+ for (OrePrefixes tPrefix : OrePrefixes.values()) if ((tPrefix.name()
+ .startsWith("ore"))
+ && (tPrefix != OrePrefixes.orePoor)
+ && (tPrefix != OrePrefixes.oreSmall)
+ && (tPrefix != OrePrefixes.oreRich)
+ && (tPrefix != OrePrefixes.oreNormal))
+ tPrefix.add(this);
}
@Override
@@ -80,28 +81,29 @@ public class ProcessingOre implements gregtech.api.interfaces.IOreRecipeRegistra
ItemStack tIngot = GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial.mDirectSmelting, 1L);
ItemStack tGem = GT_OreDictUnificator.get(OrePrefixes.gem, tMaterial, 1L);
- ItemStack tSmeltInto = tIngot
- == null ? null
- : aMaterial.contains(SubTag.SMELTING_TO_GEM)
- ? GT_OreDictUnificator.get(
- OrePrefixes.gem,
+ ItemStack tSmeltInto = tIngot == null ? null
+ : aMaterial.contains(SubTag.SMELTING_TO_GEM)
+ ? GT_OreDictUnificator.get(
+ OrePrefixes.gem,
+ tMaterial.mDirectSmelting,
+ GT_OreDictUnificator.get(
+ OrePrefixes.crystal,
tMaterial.mDirectSmelting,
GT_OreDictUnificator.get(
- OrePrefixes.crystal,
- tMaterial.mDirectSmelting,
- GT_OreDictUnificator.get(
- OrePrefixes.gem,
- tMaterial,
- GT_OreDictUnificator.get(OrePrefixes.crystal, tMaterial, 1L),
- 1L),
+ OrePrefixes.gem,
+ tMaterial,
+ GT_OreDictUnificator.get(OrePrefixes.crystal, tMaterial, 1L),
1L),
- 1L)
- : tIngot;
+ 1L),
+ 1L)
+ : tIngot;
ItemStack tDust = GT_OreDictUnificator.get(OrePrefixes.dust, tMaterial, tGem, 1L);
ItemStack tCleaned = GT_OreDictUnificator.get(OrePrefixes.crushedPurified, tMaterial, tDust, 1L);
- ItemStack tCrushed = GT_OreDictUnificator
- .get(OrePrefixes.crushed, tMaterial, aMaterial.mOreMultiplier * aMultiplier);
+ ItemStack tCrushed = GT_OreDictUnificator.get(
+ OrePrefixes.crushed,
+ tMaterial,
+ aMaterial.mOreMultiplier * aMultiplier);
ItemStack tPrimaryByProduct = null;
if (tCrushed == null) {
@@ -120,12 +122,18 @@ public class ProcessingOre implements gregtech.api.interfaces.IOreRecipeRegistra
if (tPrimaryByProduct == null) {
tPrimaryByMaterial = tMat;
tPrimaryByProduct = GT_OreDictUnificator.get(OrePrefixes.dust, tMat, 1L);
- if (GT_OreDictUnificator.get(OrePrefixes.dustSmall, tMat, 1L) == null) GT_OreDictUnificator
- .get(OrePrefixes.dustTiny, tMat, GT_OreDictUnificator.get(OrePrefixes.nugget, tMat, 2L), 2L);
+ if (GT_OreDictUnificator.get(OrePrefixes.dustSmall, tMat, 1L) == null) GT_OreDictUnificator.get(
+ OrePrefixes.dustTiny,
+ tMat,
+ GT_OreDictUnificator.get(OrePrefixes.nugget, tMat, 2L),
+ 2L);
}
GT_OreDictUnificator.get(OrePrefixes.dust, tMat, 1L);
- if (GT_OreDictUnificator.get(OrePrefixes.dustSmall, tMat, 1L) == null) GT_OreDictUnificator
- .get(OrePrefixes.dustTiny, tMat, GT_OreDictUnificator.get(OrePrefixes.nugget, tMat, 2L), 2L);
+ if (GT_OreDictUnificator.get(OrePrefixes.dustSmall, tMat, 1L) == null) GT_OreDictUnificator.get(
+ OrePrefixes.dustTiny,
+ tMat,
+ GT_OreDictUnificator.get(OrePrefixes.nugget, tMat, 2L),
+ 2L);
}
if ((!tByProductStacks.isEmpty()) && (!this.mAlreadyListedOres.contains(aMaterial))) {
this.mAlreadyListedOres.add(aMaterial);
@@ -163,8 +171,9 @@ public class ProcessingOre implements gregtech.api.interfaces.IOreRecipeRegistra
null,
null,
GT_Utility.mul(aMultiplier * 3 * aMaterial.mSmeltingMultiplier, tSmeltInto),
- ItemList.TE_Slag
- .get(1L, GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.DarkAsh, 1L)),
+ ItemList.TE_Slag.get(
+ 1L,
+ GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.DarkAsh, 1L)),
tSmeltInto.stackSize * 500,
120,
1500);
@@ -174,8 +183,9 @@ public class ProcessingOre implements gregtech.api.interfaces.IOreRecipeRegistra
null,
null,
GT_Utility.mul(aMultiplier * 3 * aMaterial.mSmeltingMultiplier, tSmeltInto),
- ItemList.TE_Slag
- .get(1L, GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.DarkAsh, 1L)),
+ ItemList.TE_Slag.get(
+ 1L,
+ GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.DarkAsh, 1L)),
tSmeltInto.stackSize * 500,
120,
1500);
@@ -188,8 +198,9 @@ public class ProcessingOre implements gregtech.api.interfaces.IOreRecipeRegistra
null,
null,
GT_Utility.mul(aMultiplier * 2 * aMaterial.mSmeltingMultiplier, tSmeltInto),
- ItemList.TE_Slag
- .get(1L, GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.DarkAsh, 1L)),
+ ItemList.TE_Slag.get(
+ 1L,
+ GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.DarkAsh, 1L)),
tSmeltInto.stackSize * 500,
120,
1500);
@@ -199,8 +210,9 @@ public class ProcessingOre implements gregtech.api.interfaces.IOreRecipeRegistra
null,
null,
GT_Utility.mul(aMultiplier * 2 * aMaterial.mSmeltingMultiplier, tSmeltInto),
- ItemList.TE_Slag
- .get(1L, GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.DarkAsh, 1L)),
+ ItemList.TE_Slag.get(
+ 1L,
+ GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.DarkAsh, 1L)),
tSmeltInto.stackSize * 500,
120,
1500);
diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingOreSmelting.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingOreSmelting.java
index 55f1e6265a..128a8d1368 100644
--- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingOreSmelting.java
+++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingOreSmelting.java
@@ -32,11 +32,13 @@ public class ProcessingOreSmelting implements gregtech.api.interfaces.IOreRecipe
ItemList.Circuit_Integrated.getWithDamage(0L, 1L),
null,
null,
- aMaterial.mBlastFurnaceTemp > 1750 ? GT_OreDictUnificator.get(
- OrePrefixes.ingotHot,
- aMaterial,
- GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 1L),
- 1L) : GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 1L),
+ aMaterial.mBlastFurnaceTemp > 1750
+ ? GT_OreDictUnificator.get(
+ OrePrefixes.ingotHot,
+ aMaterial,
+ GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 1L),
+ 1L)
+ : GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 1L),
null,
(int) Math.max(aMaterial.getMass() / 4L, 1L) * aMaterial.mBlastFurnaceTemp,
120,
diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingPipe.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingPipe.java
index 45ecc36230..c9c7b25419 100644
--- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingPipe.java
+++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingPipe.java
@@ -119,8 +119,13 @@ public class ProcessingPipe implements gregtech.api.interfaces.IOreRecipeRegistr
GT_ModHandler.addCraftingRecipe(
GT_Utility.copyAmount(1, aStack),
GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED,
- new Object[] { "PPP", "PPP", "PPP", 'P', GT_OreDictUnificator
- .get(aOreDictName.replaceFirst("Nonuple", "Small"), null, 1L, false, true) });
+ new Object[] { "PPP", "PPP", "PPP", 'P',
+ GT_OreDictUnificator.get(
+ aOreDictName.replaceFirst("Nonuple", "Small"),
+ null,
+ 1L,
+ false,
+ true) });
}
RA.addAssemblerRecipe(
diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingPlate.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingPlate.java
index 73410bb80b..0fa3ac1082 100644
--- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingPlate.java
+++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingPlate.java
@@ -190,7 +190,8 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist
if (GregTech_API.sRecipeFile.get(
gregtech.api.enums.ConfigCategories.Tools.hammerdoubleplate,
- OrePrefixes.plate.get(aMaterial).toString(),
+ OrePrefixes.plate.get(aMaterial)
+ .toString(),
true)) {
Object aPlateStack = OrePrefixes.plate.get(aMaterial);
@@ -247,7 +248,8 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist
if (GregTech_API.sRecipeFile.get(
gregtech.api.enums.ConfigCategories.Tools.hammertripleplate,
- OrePrefixes.plate.get(aMaterial).toString(),
+ OrePrefixes.plate.get(aMaterial)
+ .toString(),
true)) {
if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) {
@@ -309,7 +311,8 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist
if (GregTech_API.sRecipeFile.get(
gregtech.api.enums.ConfigCategories.Tools.hammerquadrupleplate,
- OrePrefixes.plate.get(aMaterial).toString(),
+ OrePrefixes.plate.get(aMaterial)
+ .toString(),
true)) {
if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) {
@@ -358,7 +361,8 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist
if (GregTech_API.sRecipeFile.get(
gregtech.api.enums.ConfigCategories.Tools.hammerquintupleplate,
- OrePrefixes.plate.get(aMaterial).toString(),
+ OrePrefixes.plate.get(aMaterial)
+ .toString(),
true)) {
if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) {
@@ -547,8 +551,11 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist
// If there is an ItemStack of Block for Materials
tStack == NI ?
// Use Materials mRGBa dyed blocs/materialicons/MATERIALSET/block1 icons
- TextureFactory.builder().addIcon(aMaterial.mIconSet.mTextures[TextureSet.INDEX_block1])
- .setRGBA(aMaterial.mRGBa).stdOrient().build()
+ TextureFactory.builder()
+ .addIcon(aMaterial.mIconSet.mTextures[TextureSet.INDEX_block1])
+ .setRGBA(aMaterial.mRGBa)
+ .stdOrient()
+ .build()
:
// or copy Block texture
TextureFactory.of(Block.getBlockFromItem(tStack.getItem()), tStack.getItemDamage()),
diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingRound.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingRound.java
index fd9ab7dbad..c470801b7e 100644
--- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingRound.java
+++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingRound.java
@@ -41,8 +41,9 @@ public class ProcessingRound implements gregtech.api.interfaces.IOreRecipeRegist
}
}
if (GT_Mod.gregtechproxy.mAE2Integration) {
- Api.INSTANCE.registries().matterCannon()
- .registerAmmo(GT_OreDictUnificator.get(OrePrefixes.round, aMaterial, 1L), aMaterial.getMass());
+ Api.INSTANCE.registries()
+ .matterCannon()
+ .registerAmmo(GT_OreDictUnificator.get(OrePrefixes.round, aMaterial, 1L), aMaterial.getMass());
}
}
}
diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingShaping.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingShaping.java
index 3afc8201c6..011bdf3bc8 100644
--- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingShaping.java
+++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingShaping.java
@@ -32,9 +32,10 @@ public class ProcessingShaping implements gregtech.api.interfaces.IOreRecipeRegi
if (aMaterial.contains(SubTag.NO_SMASHING)) {
tVoltageMultiplier /= 4;
- } else if (aPrefix.name().startsWith(OrePrefixes.dust.name())) {
- return;
- }
+ } else if (aPrefix.name()
+ .startsWith(OrePrefixes.dust.name())) {
+ return;
+ }
if (!OrePrefixes.block.isIgnored(aMaterial.mSmeltInto)) {
GT_Values.RA.addExtruderRecipe(
diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingToolOther.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingToolOther.java
index 59a9e6a479..9925e013bf 100644
--- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingToolOther.java
+++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingToolOther.java
@@ -19,8 +19,12 @@ public class ProcessingToolOther implements gregtech.api.interfaces.IOreRecipeRe
if ((aMaterial != Materials.Stone) && (aMaterial != Materials.Flint)) {
if (aMaterial != Materials.Rubber) {
GT_ModHandler.addCraftingRecipe(
- GT_MetaGenerated_Tool_01.INSTANCE
- .getToolWithStats(GT_MetaGenerated_Tool_01.PLUNGER, 1, aMaterial, aMaterial, null),
+ GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(
+ GT_MetaGenerated_Tool_01.PLUNGER,
+ 1,
+ aMaterial,
+ aMaterial,
+ null),
GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED,
new Object[] { "xRR", " SR", "S f", 'S', OrePrefixes.stick.get(aMaterial), 'R',
OrePrefixes.plate.get(Materials.AnyRubber) });
@@ -28,13 +32,21 @@ public class ProcessingToolOther implements gregtech.api.interfaces.IOreRecipeRe
if ((!aMaterial.contains(SubTag.WOOD)) && (!aMaterial.contains(SubTag.BOUNCY))
&& (!aMaterial.contains(SubTag.NO_SMASHING))) {
GT_ModHandler.addCraftingRecipe(
- GT_MetaGenerated_Tool_01.INSTANCE
- .getToolWithStats(GT_MetaGenerated_Tool_01.WRENCH, 1, aMaterial, aMaterial, null),
+ GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(
+ GT_MetaGenerated_Tool_01.WRENCH,
+ 1,
+ aMaterial,
+ aMaterial,
+ null),
GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED,
new Object[] { "IhI", "III", " I ", 'I', OrePrefixes.ingot.get(aMaterial) });
GT_ModHandler.addCraftingRecipe(
- GT_MetaGenerated_Tool_01.INSTANCE
- .getToolWithStats(GT_MetaGenerated_Tool_01.CROWBAR, 1, aMaterial, aMaterial, null),
+ GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(
+ GT_MetaGenerated_Tool_01.CROWBAR,
+ 1,
+ aMaterial,
+ aMaterial,
+ null),
GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED,
new Object[] { "hDS", "DSD", "SDf", 'S', OrePrefixes.stick.get(aMaterial), 'D', Dyes.dyeBlue });
GT_ModHandler.addCraftingRecipe(
@@ -48,26 +60,42 @@ public class ProcessingToolOther implements gregtech.api.interfaces.IOreRecipeRe
new Object[] { " fS", " Sh", "W ", 'S', OrePrefixes.stick.get(aMaterial), 'W',
OrePrefixes.stick.get(aMaterial.mHandleMaterial) });
GT_ModHandler.addCraftingRecipe(
- GT_MetaGenerated_Tool_01.INSTANCE
- .getToolWithStats(GT_MetaGenerated_Tool_01.WIRECUTTER, 1, aMaterial, aMaterial, null),
+ GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(
+ GT_MetaGenerated_Tool_01.WIRECUTTER,
+ 1,
+ aMaterial,
+ aMaterial,
+ null),
GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED,
new Object[] { "PfP", "hPd", "STS", 'S', OrePrefixes.stick.get(aMaterial), 'P',
OrePrefixes.plate.get(aMaterial), 'T', OrePrefixes.screw.get(aMaterial) });
GT_ModHandler.addCraftingRecipe(
- GT_MetaGenerated_Tool_01.INSTANCE
- .getToolWithStats(GT_MetaGenerated_Tool_01.SCOOP, 1, aMaterial, aMaterial, null),
+ GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(
+ GT_MetaGenerated_Tool_01.SCOOP,
+ 1,
+ aMaterial,
+ aMaterial,
+ null),
GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED,
new Object[] { "SWS", "SSS", "xSh", 'S', OrePrefixes.stick.get(aMaterial), 'W',
new ItemStack(Blocks.wool, 1, 32767) });
GT_ModHandler.addCraftingRecipe(
- GT_MetaGenerated_Tool_01.INSTANCE
- .getToolWithStats(GT_MetaGenerated_Tool_01.BRANCHCUTTER, 1, aMaterial, aMaterial, null),
+ GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(
+ GT_MetaGenerated_Tool_01.BRANCHCUTTER,
+ 1,
+ aMaterial,
+ aMaterial,
+ null),
GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED,
new Object[] { "PfP", "PdP", "STS", 'S', OrePrefixes.stick.get(aMaterial), 'P',
OrePrefixes.plate.get(aMaterial), 'T', OrePrefixes.screw.get(aMaterial) });
GT_ModHandler.addCraftingRecipe(
- GT_MetaGenerated_Tool_01.INSTANCE
- .getToolWithStats(GT_MetaGenerated_Tool_01.KNIFE, 1, aMaterial, aMaterial, null),
+ GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(
+ GT_MetaGenerated_Tool_01.KNIFE,
+ 1,
+ aMaterial,
+ aMaterial,
+ null),
GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED,
new Object[] { "fPh", " S ", 'S', OrePrefixes.stick.get(aMaterial), 'P',
OrePrefixes.plate.get(aMaterial) });
diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingTransforming.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingTransforming.java
index 1d0fa1c3bb..4d37fc2eb1 100644
--- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingTransforming.java
+++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingTransforming.java
@@ -26,8 +26,8 @@ public class ProcessingTransforming implements IOreRecipeRegistrator {
case "Wood":
GT_Values.RA.addChemicalBathRecipe(
GT_Utility.copyAmount(1L, aStack),
- Materials.SeedOil
- .getFluid(GT_Utility.translateMaterialToAmount(aPrefix.mMaterialAmount, 120L, true)),
+ Materials.SeedOil.getFluid(
+ GT_Utility.translateMaterialToAmount(aPrefix.mMaterialAmount, 120L, true)),
GT_OreDictUnificator.get(aPrefix, Materials.WoodSealed, 1L),
GT_Values.NI,
GT_Values.NI,
@@ -36,8 +36,8 @@ public class ProcessingTransforming implements IOreRecipeRegistrator {
8);
GT_Values.RA.addChemicalBathRecipe(
GT_Utility.copyAmount(1L, aStack),
- Materials.SeedOilLin
- .getFluid(GT_Utility.translateMaterialToAmount(aPrefix.mMaterialAmount, 80L, true)),
+ Materials.SeedOilLin.getFluid(
+ GT_Utility.translateMaterialToAmount(aPrefix.mMaterialAmount, 80L, true)),
GT_OreDictUnificator.get(aPrefix, Materials.WoodSealed, 1L),
GT_Values.NI,
GT_Values.NI,
@@ -46,8 +46,8 @@ public class ProcessingTransforming implements IOreRecipeRegistrator {
8);
GT_Values.RA.addChemicalBathRecipe(
GT_Utility.copyAmount(1L, aStack),
- Materials.SeedOilHemp
- .getFluid(GT_Utility.translateMaterialToAmount(aPrefix.mMaterialAmount, 80L, true)),
+ Materials.SeedOilHemp.getFluid(
+ GT_Utility.translateMaterialToAmount(aPrefix.mMaterialAmount, 80L, true)),
GT_OreDictUnificator.get(aPrefix, Materials.WoodSealed, 1L),
GT_Values.NI,
GT_Values.NI,
@@ -58,8 +58,8 @@ public class ProcessingTransforming implements IOreRecipeRegistrator {
case "Iron":
GT_Values.RA.addChemicalBathRecipe(
GT_Utility.copyAmount(1L, aStack),
- Materials.FierySteel
- .getFluid(GT_Utility.translateMaterialToAmount(aPrefix.mMaterialAmount, 250L, true)),
+ Materials.FierySteel.getFluid(
+ GT_Utility.translateMaterialToAmount(aPrefix.mMaterialAmount, 250L, true)),
GT_OreDictUnificator.get(aPrefix, Materials.FierySteel, 1L),
GT_Values.NI,
GT_Values.NI,
@@ -75,8 +75,8 @@ public class ProcessingTransforming implements IOreRecipeRegistrator {
case "WroughtIron":
GT_Values.RA.addChemicalBathRecipe(
GT_Utility.copyAmount(1L, aStack),
- Materials.FierySteel
- .getFluid(GT_Utility.translateMaterialToAmount(aPrefix.mMaterialAmount, 225L, true)),
+ Materials.FierySteel.getFluid(
+ GT_Utility.translateMaterialToAmount(aPrefix.mMaterialAmount, 225L, true)),
GT_OreDictUnificator.get(aPrefix, Materials.FierySteel, 1L),
GT_Values.NI,
GT_Values.NI,
@@ -92,8 +92,8 @@ public class ProcessingTransforming implements IOreRecipeRegistrator {
case "Steel":
GT_Values.RA.addChemicalBathRecipe(
GT_Utility.copyAmount(1L, aStack),
- Materials.FierySteel
- .getFluid(GT_Utility.translateMaterialToAmount(aPrefix.mMaterialAmount, 200L, true)),
+ Materials.FierySteel.getFluid(
+ GT_Utility.translateMaterialToAmount(aPrefix.mMaterialAmount, 200L, true)),
GT_OreDictUnificator.get(aPrefix, Materials.FierySteel, 1L),
GT_Values.NI,
GT_Values.NI,
diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingWire.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingWire.java
index 11333e2e2c..c991fdd149 100644
--- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingWire.java
+++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingWire.java
@@ -377,8 +377,10 @@ public class ProcessingWire implements gregtech.api.interfaces.IOreRecipeRegistr
calculateRecipeEU(aMaterial, 8));
GT_Values.RA.addAssemblerRecipe(
new ItemStack[] { aStack,
- GT_OreDictUnificator
- .get(OrePrefixes.foil, Materials.PolyphenyleneSulfide, costMultiplier),
+ GT_OreDictUnificator.get(
+ OrePrefixes.foil,
+ Materials.PolyphenyleneSulfide,
+ costMultiplier),
GT_Utility.getIntegratedCircuit(24) },
Materials.Silicone.getMolten(costMultiplier * 72),
GT_OreDictUnificator.get(correspondingCable, aMaterial, 1L),
@@ -386,16 +388,14 @@ public class ProcessingWire implements gregtech.api.interfaces.IOreRecipeRegistr
calculateRecipeEU(aMaterial, 8));
for (Materials dielectric : dielectrics) {
for (Materials syntheticRubber : syntheticRubbers) {
- GT_Values.RA
- .addAssemblerRecipe(
- new ItemStack[] { GT_Utility.copyAmount(4, aStack),
- dielectric.getDust(costMultiplier),
- GT_OreDictUnificator
- .get(OrePrefixes.foil, aMaterial, costMultiplier * 4) },
- syntheticRubber.getMolten(costMultiplier * 144),
- GT_OreDictUnificator.get(correspondingCable, aMaterial, 4L),
- 400,
- calculateRecipeEU(aMaterial, 8));
+ GT_Values.RA.addAssemblerRecipe(
+ new ItemStack[] { GT_Utility.copyAmount(4, aStack),
+ dielectric.getDust(costMultiplier),
+ GT_OreDictUnificator.get(OrePrefixes.foil, aMaterial, costMultiplier * 4) },
+ syntheticRubber.getMolten(costMultiplier * 144),
+ GT_OreDictUnificator.get(correspondingCable, aMaterial, 4L),
+ 400,
+ calculateRecipeEU(aMaterial, 8));
GT_Values.RA.addAssemblerRecipe(
new ItemStack[] { GT_Utility.copyAmount(4, aStack),
dielectric.getDust(costMultiplier),
@@ -407,15 +407,13 @@ public class ProcessingWire implements gregtech.api.interfaces.IOreRecipeRegistr
GT_OreDictUnificator.get(correspondingCable, aMaterial, 4L),
400,
calculateRecipeEU(aMaterial, 8));
- GT_Values.RA
- .addAssemblerRecipe(
- new ItemStack[] { aStack, dielectric.getDustSmall(costMultiplier),
- GT_OreDictUnificator
- .get(OrePrefixes.foil, aMaterial, costMultiplier) },
- syntheticRubber.getMolten(costMultiplier * 36),
- GT_OreDictUnificator.get(correspondingCable, aMaterial, 1L),
- 100,
- calculateRecipeEU(aMaterial, 8));
+ GT_Values.RA.addAssemblerRecipe(
+ new ItemStack[] { aStack, dielectric.getDustSmall(costMultiplier),
+ GT_OreDictUnificator.get(OrePrefixes.foil, aMaterial, costMultiplier) },
+ syntheticRubber.getMolten(costMultiplier * 36),
+ GT_OreDictUnificator.get(correspondingCable, aMaterial, 1L),
+ 100,
+ calculateRecipeEU(aMaterial, 8));
GT_Values.RA.addAssemblerRecipe(
new ItemStack[] { aStack, dielectric.getDustSmall(costMultiplier),
GT_OreDictUnificator.get(
@@ -453,13 +451,18 @@ public class ProcessingWire implements gregtech.api.interfaces.IOreRecipeRegistr
}
private void AE2addNewAttunement(ItemStack aStack) {
- Api.INSTANCE.registries().p2pTunnel().addNewAttunement(aStack, (TunnelType) tt);
+ Api.INSTANCE.registries()
+ .p2pTunnel()
+ .addNewAttunement(aStack, (TunnelType) tt);
}
private void AE2AddNetAttunementCable(ItemStack aStack, OrePrefixes correspondingCable, Materials aMaterial) {
- Api.INSTANCE.registries().p2pTunnel().addNewAttunement(aStack, (TunnelType) tt);
- Api.INSTANCE.registries().p2pTunnel()
- .addNewAttunement(GT_OreDictUnificator.get(correspondingCable, aMaterial, 1L), (TunnelType) tt);
+ Api.INSTANCE.registries()
+ .p2pTunnel()
+ .addNewAttunement(aStack, (TunnelType) tt);
+ Api.INSTANCE.registries()
+ .p2pTunnel()
+ .addNewAttunement(GT_OreDictUnificator.get(correspondingCable, aMaterial, 1L), (TunnelType) tt);
}
// end region
}