diff options
| author | Jordan Byrne <draknyte1@hotmail.com> | 2018-02-26 04:59:03 +1000 |
|---|---|---|
| committer | Jordan Byrne <draknyte1@hotmail.com> | 2018-02-26 04:59:03 +1000 |
| commit | c30fc210a3ada13c43f2bd63812d8fc584abc8fb (patch) | |
| tree | 92eec8de494532d1ec5ca1722df8a0c57a4810b3 /src | |
| parent | 5787445c8d1549edd5c648bc3241683dcfe17316 (diff) | |
| download | GT5-Unofficial-c30fc210a3ada13c43f2bd63812d8fc584abc8fb.tar.gz GT5-Unofficial-c30fc210a3ada13c43f2bd63812d8fc584abc8fb.tar.bz2 GT5-Unofficial-c30fc210a3ada13c43f2bd63812d8fc584abc8fb.zip | |
$ Fixed a bug with Cyanite plates added when Big Reactors is found. They were incorrectly getting OreDicted to plateBlutonium.
$ Fixed Clay plates generating if they already exist.
Diffstat (limited to 'src')
| -rw-r--r-- | src/Java/gtPlusPlus/core/item/ModItems.java | 14 | ||||
| -rw-r--r-- | src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_PowerSubStationController.java | 7 |
2 files changed, 11 insertions, 10 deletions
diff --git a/src/Java/gtPlusPlus/core/item/ModItems.java b/src/Java/gtPlusPlus/core/item/ModItems.java index a3c40d53cc..2095893da4 100644 --- a/src/Java/gtPlusPlus/core/item/ModItems.java +++ b/src/Java/gtPlusPlus/core/item/ModItems.java @@ -668,10 +668,14 @@ public final class ModItems { FluidUtils.generateFluidNoPrefix("xpjuice", "xpjuice", 0, new short[]{50, 150, 50, 100}); } - //Just an unusual plate needed for some black magic. - itemPlateClay = new BaseItemPlate(MaterialUtils.generateMaterialFromGtENUM(Materials.Clay)); - itemDoublePlateClay = new BaseItemPlateDouble(MaterialUtils.generateMaterialFromGtENUM(Materials.Clay)); - + //Just an unusual plate needed for some black magic. + if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("plateClay", 1) == null){ + itemPlateClay = new BaseItemPlate(MaterialUtils.generateMaterialFromGtENUM(Materials.Clay)); + } + if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("plateDoubleClay", 1) == null){ + itemDoublePlateClay = new BaseItemPlateDouble(MaterialUtils.generateMaterialFromGtENUM(Materials.Clay)); + } + //A small gear needed for wizardry. if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("gearGtSmallWroughtIron", 1) == null){ itemSmallWroughtIronGear = new BaseItemSmallGear(MaterialUtils.generateMaterialFromGtENUM(Materials.WroughtIron)); @@ -764,7 +768,7 @@ public final class ModItems { Logger.INFO("BigReactors Found - Loading Resources."); //Item Init itemPlateBlutonium = ItemUtils.generateSpecialUsePlate("Blutonium", "Blutonium", new short[]{0, 0, 255}, 0); - itemPlateBlutonium = ItemUtils.generateSpecialUsePlate("Cyanite", "Cyanite", new short[]{0, 191, 255}, 0); + itemPlateCyanite = ItemUtils.generateSpecialUsePlate("Cyanite", "Cyanite", new short[]{0, 191, 255}, 0); itemPlateLudicrite = ItemUtils.generateSpecialUsePlate("Ludicrite", "Ludicrite", new short[]{167, 5, 179}, 0); } else { diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_PowerSubStationController.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_PowerSubStationController.java index 26c89999bd..5be4dcd6d8 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_PowerSubStationController.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_PowerSubStationController.java @@ -97,10 +97,7 @@ public class GregtechMetaTileEntity_PowerSubStationController extends GregtechMe @Override public boolean checkRecipe(final ItemStack aStack) { - - - - return false; + return (this.mActualStoredEU >= 0); } @Override @@ -418,7 +415,7 @@ public class GregtechMetaTileEntity_PowerSubStationController extends GregtechMe if (this.getBaseMetaTileEntity().isAllowedToWork()){ //Input Power - if (this.mActualStoredEU < this.maxEUStore() && mMaxProgresstime > 0){ + if (this.mActualStoredEU < this.maxEUStore()){ if (this.getBaseMetaTileEntity().isAllowedToWork()){ this.getBaseMetaTileEntity().enableWorking(); } |