diff options
| author | Jordan Byrne <draknyte1@hotmail.com> | 2018-02-26 08:08:00 +1000 |
|---|---|---|
| committer | Jordan Byrne <draknyte1@hotmail.com> | 2018-02-26 08:08:00 +1000 |
| commit | 41eb02602c8a6d5899b3e375572ee9990a5a752b (patch) | |
| tree | 80263f91e6a304fe7ab527fbab18d2810e134aff /src/Java/gtPlusPlus/core/material | |
| parent | 90addb9717e2a1bffeec55d064248d6f98835f01 (diff) | |
| download | GT5-Unofficial-41eb02602c8a6d5899b3e375572ee9990a5a752b.tar.gz GT5-Unofficial-41eb02602c8a6d5899b3e375572ee9990a5a752b.tar.bz2 GT5-Unofficial-41eb02602c8a6d5899b3e375572ee9990a5a752b.zip | |
% Made all GTNH recipes use cheaper circuits for all recipes I add.
% Recipe tweaks.
% Tried to fluorite ore not having correct recipe outputs during ore processing. (This is still broken due to an invalid output)
$ Fixed old fluorite ore not having a valid shapeless recipe.
$ Fixed all custom ores trying to register static textures.
$ Fixed plugin loading system not registering plugins, I think?
$ Fixed missing texture for Nitro Fix.
Diffstat (limited to 'src/Java/gtPlusPlus/core/material')
| -rw-r--r-- | src/Java/gtPlusPlus/core/material/Material.java | 5 | ||||
| -rw-r--r-- | src/Java/gtPlusPlus/core/material/nuclear/FLUORIDES.java | 6 |
2 files changed, 4 insertions, 7 deletions
diff --git a/src/Java/gtPlusPlus/core/material/Material.java b/src/Java/gtPlusPlus/core/material/Material.java index 09b6e24d9e..749431b6de 100644 --- a/src/Java/gtPlusPlus/core/material/Material.java +++ b/src/Java/gtPlusPlus/core/material/Material.java @@ -3,16 +3,12 @@ package gtPlusPlus.core.material; import static gregtech.api.enums.GT_Values.M; import java.util.*; -import java.util.Map.Entry; - import gregtech.api.enums.*; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.api.objects.data.AutoMap; -import gtPlusPlus.api.objects.data.Pair; import gtPlusPlus.core.item.base.cell.BaseItemCell; import gtPlusPlus.core.material.state.MaterialState; import gtPlusPlus.core.util.Utils; -import gtPlusPlus.core.util.data.ArrayUtils; import gtPlusPlus.core.util.data.StringUtils; import gtPlusPlus.core.util.math.MathUtils; import gtPlusPlus.core.util.minecraft.FluidUtils; @@ -24,7 +20,6 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; -import scala.xml.dtd.ELEMENTS; public class Material { diff --git a/src/Java/gtPlusPlus/core/material/nuclear/FLUORIDES.java b/src/Java/gtPlusPlus/core/material/nuclear/FLUORIDES.java index 5f83074a0d..132db39f3f 100644 --- a/src/Java/gtPlusPlus/core/material/nuclear/FLUORIDES.java +++ b/src/Java/gtPlusPlus/core/material/nuclear/FLUORIDES.java @@ -3,6 +3,7 @@ package gtPlusPlus.core.material.nuclear; import gregtech.api.enums.Materials; import gtPlusPlus.core.material.*; import gtPlusPlus.core.material.state.MaterialState; +import gtPlusPlus.core.util.minecraft.MaterialUtils; public class FLUORIDES { @@ -22,8 +23,9 @@ public class FLUORIDES { false, //Generate cells //Material Stacks with Percentage of required elements. new MaterialStack[]{ - new MaterialStack(ELEMENT.getInstance().CALCIUM, 1), - new MaterialStack(ELEMENT.getInstance().FLUORINE, 2) + new MaterialStack(ELEMENT.getInstance().CALCIUM, 24), + new MaterialStack(ELEMENT.getInstance().FLUORINE, 72), + new MaterialStack(MaterialUtils.generateMaterialFromGtENUM(Materials.Galena), 4) }); //ThF4 |