diff options
| author | Jordan Byrne <draknyte1@hotmail.com> | 2018-02-09 20:41:08 +1000 |
|---|---|---|
| committer | Jordan Byrne <draknyte1@hotmail.com> | 2018-02-09 20:41:08 +1000 |
| commit | 3a098ecbcf1ca794807cf393560ccd05ace105a7 (patch) | |
| tree | 50ea97e7c3f1d53b1c41657245990bff5cc2a49d /src/Java/gtPlusPlus/xmod | |
| parent | a9c1cbd0288f630fc273a7a10b10a68dbcd3b134 (diff) | |
| download | GT5-Unofficial-3a098ecbcf1ca794807cf393560ccd05ace105a7.tar.gz GT5-Unofficial-3a098ecbcf1ca794807cf393560ccd05ace105a7.tar.bz2 GT5-Unofficial-3a098ecbcf1ca794807cf393560ccd05ace105a7.zip | |
$ Fixed issue where Zhuhai wouldn't accept water.
^ Version Bump.
Diffstat (limited to 'src/Java/gtPlusPlus/xmod')
| -rw-r--r-- | src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_IndustrialFishingPond.java | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_IndustrialFishingPond.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_IndustrialFishingPond.java index 0c3dcf0903..98dc3140bb 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_IndustrialFishingPond.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_IndustrialFishingPond.java @@ -16,7 +16,6 @@ import gregtech.api.objects.GT_RenderedTexture; import gregtech.api.util.FishPondFakeRecipe; import gregtech.api.util.GT_Recipe; import gregtech.api.util.GT_Utility; -import gregtech.api.util.Recipe_GT; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.block.ModBlocks; import gtPlusPlus.core.lib.CORE; @@ -26,8 +25,6 @@ import gtPlusPlus.core.util.fluid.FluidUtils; import gtPlusPlus.core.util.item.ItemUtils; import gtPlusPlus.core.util.math.MathUtils; import gtPlusPlus.core.util.reflect.ReflectionUtils; -import gtPlusPlus.xmod.gregtech.api.gui.CONTAINER_MultiMachine; -import gtPlusPlus.xmod.gregtech.api.gui.GUI_MultiMachine; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase; import ic2.core.init.BlocksItems; import ic2.core.init.InternalName; @@ -102,7 +99,7 @@ extends GregtechMeta_MultiBlockBase { @Override public GT_Recipe.GT_Recipe_Map getRecipeMap() { - return Recipe_GT.Gregtech_Recipe_Map.sFishPondRecipes; + return null; } @Override @@ -305,7 +302,7 @@ extends GregtechMeta_MultiBlockBase { for (int j = mOffsetZ_Lower + 1; j <= mOffsetZ_Upper - 1; ++j) { for (int h = 0; h < 2; ++h) { Block tBlock = aBaseMetaTileEntity.getBlockOffset(xDir + i, h, zDir + j); - byte tMeta = aBaseMetaTileEntity.getMetaIDOffset(xDir + i, h, zDir + j); + //byte tMeta = aBaseMetaTileEntity.getMetaIDOffset(xDir + i, h, zDir + j); if (tBlock == Blocks.air || tBlock == Blocks.flowing_water || tBlock == Blocks.water) { if (this.getStoredFluids() != null) { for (FluidStack stored : this.getStoredFluids()) { @@ -348,7 +345,7 @@ extends GregtechMeta_MultiBlockBase { return (tAmount >= 80); } - private static AutoMap<AutoMap> categories = new AutoMap<AutoMap>(); + private static AutoMap<AutoMap<WeightedRandomFishable>> categories = new AutoMap<AutoMap<WeightedRandomFishable>>(); private static AutoMap<WeightedRandomFishable> categoryFish = new AutoMap<WeightedRandomFishable>(); private static AutoMap<WeightedRandomFishable> categoryJunk = new AutoMap<WeightedRandomFishable>(); private static AutoMap<WeightedRandomFishable> categoryLoot = new AutoMap<WeightedRandomFishable>(); @@ -514,7 +511,7 @@ extends GregtechMeta_MultiBlockBase { } // EU discount - float tRecipeEUt = (32 * aEUPercent) / 100.0f; + //float tRecipeEUt = (32 * aEUPercent) / 100.0f; float tTotalEUt = 0.0f; // Reset outputs and progress stats |