diff options
| author | Alkalus <3060479+draknyte1@users.noreply.github.com> | 2018-05-24 08:12:44 +1000 |
|---|---|---|
| committer | Alkalus <3060479+draknyte1@users.noreply.github.com> | 2018-05-24 08:12:44 +1000 |
| commit | 4af770de7faa9f6816d0cfd51858c5c5b77e758a (patch) | |
| tree | aca46e963bf84c4e38bf3f043158fdbcac9f5e38 /src/Java/gtPlusPlus/core/util | |
| parent | b44d061f6ca95236a873bb0835d0e2fd77b96851 (diff) | |
| download | GT5-Unofficial-4af770de7faa9f6816d0cfd51858c5c5b77e758a.tar.gz GT5-Unofficial-4af770de7faa9f6816d0cfd51858c5c5b77e758a.tar.bz2 GT5-Unofficial-4af770de7faa9f6816d0cfd51858c5c5b77e758a.zip | |
+ Added a new interface RunnableWithInfo.java. Allows passing through type V and an object, for extra manipulation during runnable events where required.
$ Further improvements to the recipe generation system. Added safety catches in case a particular material is having issues, so as not to corrupt the whole map.
$ Added extra maps for recipes that get added from auto-generation elsewhere. Cached maps should also register to be run upon creation.
Diffstat (limited to 'src/Java/gtPlusPlus/core/util')
| -rw-r--r-- | src/Java/gtPlusPlus/core/util/minecraft/FluidUtils.java | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/Java/gtPlusPlus/core/util/minecraft/FluidUtils.java b/src/Java/gtPlusPlus/core/util/minecraft/FluidUtils.java index f7f3906d18..08b37645eb 100644 --- a/src/Java/gtPlusPlus/core/util/minecraft/FluidUtils.java +++ b/src/Java/gtPlusPlus/core/util/minecraft/FluidUtils.java @@ -16,6 +16,7 @@ import gtPlusPlus.core.item.base.BaseItemComponent; import gtPlusPlus.core.item.base.cell.BaseItemCell; import gtPlusPlus.core.item.base.cell.BaseItemPlasmaCell; import gtPlusPlus.core.material.Material; +import gtPlusPlus.core.material.MaterialGenerator; import gtPlusPlus.core.material.MaterialStack; import gtPlusPlus.core.util.Utils; import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials; @@ -233,7 +234,7 @@ public class FluidUtils { } } if ((aFullContainer != null) && (aEmptyContainer != null) && !FluidContainerRegistry.registerFluidContainer(new FluidStack(rFluid, aFluidAmount), aFullContainer, aEmptyContainer)) { - GT_Values.RA.addFluidCannerRecipe(aFullContainer, container(aFullContainer, false), null, new FluidStack(rFluid, aFluidAmount)); + MaterialGenerator.addFluidCannerRecipe(aFullContainer, container(aFullContainer, false), null, new FluidStack(rFluid, aFluidAmount)); } return rFluid; } @@ -327,7 +328,7 @@ public class FluidUtils { rFluid.setTemperature((int) (aTemperatureK)); } if ((aFullContainer != null) && (aEmptyContainer != null) && !FluidContainerRegistry.registerFluidContainer(new FluidStack(rFluid, aFluidAmount), aFullContainer, aEmptyContainer)) { - GT_Values.RA.addFluidCannerRecipe(aFullContainer, container(aFullContainer, false), null, new FluidStack(rFluid, aFluidAmount)); + MaterialGenerator.addFluidCannerRecipe(aFullContainer, container(aFullContainer, false), null, new FluidStack(rFluid, aFluidAmount)); } else { //Utils.LOG_INFO("Failed creating recipes to fill/empty cells of "+aName+"."); @@ -440,7 +441,7 @@ public class FluidUtils { 1000); //Disable this, not sure why it exists //TODO - /*GT_Values.RA.addFluidExtractionRecipe( + /*MaterialGenerator.addFluidExtractionRecipe( ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dust"+Utils.sanitizeString(localizedName), 1), //Input null, //Input 2 FluidUtils.getFluidStack(gtFluid, 144), //Fluid Output @@ -485,7 +486,7 @@ public class FluidUtils { 1000); if (dustStack != null){ - GT_Values.RA.addFluidExtractionRecipe( + MaterialGenerator.addFluidExtractionRecipe( dustStack, //Input null, //Input 2 FluidUtils.getFluidStack(gtFluid, amountPerItem), //Fluid Output @@ -495,7 +496,7 @@ public class FluidUtils { ); } if (dustStack2 != null){ - GT_Values.RA.addFluidExtractionRecipe( + MaterialGenerator.addFluidExtractionRecipe( dustStack2, //Input null, //Input 2 FluidUtils.getFluidStack(gtFluid, amountPerItem), //Fluid Output |