diff options
| author | chochem <40274384+chochem@users.noreply.github.com> | 2023-04-07 14:15:07 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-07 15:15:07 +0200 |
| commit | c68c9019d1285f48436661a031b4aff3823b2a37 (patch) | |
| tree | 98c4bafc814634816d50ad86c819547484be7fc0 | |
| parent | 0a3566700e7e7599562df78b6908a163a61a9115 (diff) | |
| download | GT5-Unofficial-c68c9019d1285f48436661a031b4aff3823b2a37.tar.gz GT5-Unofficial-c68c9019d1285f48436661a031b4aff3823b2a37.tar.bz2 GT5-Unofficial-c68c9019d1285f48436661a031b4aff3823b2a37.zip | |
Wiremillfix (#1843)
* finewire check
* prefix2 check
* make logic clear
| -rw-r--r-- | src/main/java/gregtech/loaders/postload/recipes/WiremillRecipes.java | 162 |
1 files changed, 86 insertions, 76 deletions
diff --git a/src/main/java/gregtech/loaders/postload/recipes/WiremillRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/WiremillRecipes.java index 3803d18c3f..d43747401b 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/WiremillRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/WiremillRecipes.java @@ -83,89 +83,99 @@ public class WiremillRecipes implements Runnable { .eut(eut) .addTo(sWiremillRecipes); - GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(prefix2, materials, 2L / multiplier), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.wireGt01, materials, 1L)) - .noFluidInputs() - .noFluidOutputs() - .duration(baseDuration / 2) - .eut(eut) - .addTo(sWiremillRecipes); + if (GT_OreDictUnificator.get(prefix2, materials, 1L) != null) { + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(prefix2, materials, 2L / multiplier), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.wireGt01, materials, 1L)) + .noFluidInputs() + .noFluidOutputs() + .duration(baseDuration / 2) + .eut(eut) + .addTo(sWiremillRecipes); - GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(prefix2, materials, 4L / multiplier), - GT_Utility.getIntegratedCircuit(2)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.wireGt02, materials, 1L)) - .noFluidInputs() - .noFluidOutputs() - .duration(baseDuration) - .eut(eut) - .addTo(sWiremillRecipes); + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(prefix2, materials, 4L / multiplier), + GT_Utility.getIntegratedCircuit(2)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.wireGt02, materials, 1L)) + .noFluidInputs() + .noFluidOutputs() + .duration(baseDuration) + .eut(eut) + .addTo(sWiremillRecipes); - GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(prefix2, materials, 8L / multiplier), - GT_Utility.getIntegratedCircuit(4)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.wireGt04, materials, 1L)) - .noFluidInputs() - .noFluidOutputs() - .duration((int) (baseDuration * 1.5f)) - .eut(eut) - .addTo(sWiremillRecipes); + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(prefix2, materials, 8L / multiplier), + GT_Utility.getIntegratedCircuit(4)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.wireGt04, materials, 1L)) + .noFluidInputs() + .noFluidOutputs() + .duration((int) (baseDuration * 1.5f)) + .eut(eut) + .addTo(sWiremillRecipes); - GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(prefix2, materials, 16L / multiplier), - GT_Utility.getIntegratedCircuit(8)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.wireGt08, materials, 1L)) - .noFluidInputs() - .noFluidOutputs() - .duration(baseDuration * 2) - .eut(eut) - .addTo(sWiremillRecipes); + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(prefix2, materials, 16L / multiplier), + GT_Utility.getIntegratedCircuit(8)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.wireGt08, materials, 1L)) + .noFluidInputs() + .noFluidOutputs() + .duration(baseDuration * 2) + .eut(eut) + .addTo(sWiremillRecipes); - GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(prefix2, materials, 24L / multiplier), - GT_Utility.getIntegratedCircuit(12)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.wireGt12, materials, 1L)) - .noFluidInputs() - .noFluidOutputs() - .duration((int) (baseDuration * 2.5f)) - .eut(eut) - .addTo(sWiremillRecipes); + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(prefix2, materials, 24L / multiplier), + GT_Utility.getIntegratedCircuit(12)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.wireGt12, materials, 1L)) + .noFluidInputs() + .noFluidOutputs() + .duration((int) (baseDuration * 2.5f)) + .eut(eut) + .addTo(sWiremillRecipes); - GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(prefix2, materials, 32L / multiplier), - GT_Utility.getIntegratedCircuit(16)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.wireGt16, materials, 1L)) - .noFluidInputs() - .noFluidOutputs() - .duration(baseDuration * 3) - .eut(eut) - .addTo(sWiremillRecipes); + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(prefix2, materials, 32L / multiplier), + GT_Utility.getIntegratedCircuit(16)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.wireGt16, materials, 1L)) + .noFluidInputs() + .noFluidOutputs() + .duration(baseDuration * 3) + .eut(eut) + .addTo(sWiremillRecipes); + } - GT_Values.RA.stdBuilder() - .itemInputs(GT_OreDictUnificator.get(prefix1, materials, 1L), GT_Utility.getIntegratedCircuit(3)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.wireFine, materials, 4L * multiplier)) - .noFluidInputs() - .noFluidOutputs() - .duration(baseDuration) - .eut(eut) - .addTo(sWiremillRecipes); + if (GT_OreDictUnificator.get(OrePrefixes.wireFine, materials, 1L) != null) { - GT_Values.RA.stdBuilder() - .itemInputs(GT_OreDictUnificator.get(prefix2, materials, 1L), GT_Utility.getIntegratedCircuit(3)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.wireFine, materials, 2L * multiplier)) - .noFluidInputs() - .noFluidOutputs() - .duration(baseDuration / 2) - .eut(eut) - .addTo(sWiremillRecipes); + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(prefix1, materials, 1L), + GT_Utility.getIntegratedCircuit(3)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.wireFine, materials, 4L * multiplier)) + .noFluidInputs() + .noFluidOutputs() + .duration(baseDuration) + .eut(eut) + .addTo(sWiremillRecipes); + if (GT_OreDictUnificator.get(prefix2, materials, 1L) != null) { + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(prefix2, materials, 1L), + GT_Utility.getIntegratedCircuit(3)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.wireFine, materials, 2L * multiplier)) + .noFluidInputs() + .noFluidOutputs() + .duration(baseDuration / 2) + .eut(eut) + .addTo(sWiremillRecipes); + } + } } void registerWiremillRecipes(Materials aMaterial, int baseDuration, int aEUt) { |