diff options
author | Alkalus <3060479+draknyte1@users.noreply.github.com> | 2019-04-26 00:41:41 +1000 |
---|---|---|
committer | Alkalus <3060479+draknyte1@users.noreply.github.com> | 2019-04-26 00:41:41 +1000 |
commit | cf5475a417af586af27ae1de3d5e52e374c5a0b7 (patch) | |
tree | 9aa3b54ac2c433238adbf4caf67bb8510747a7db /src/Java/gtPlusPlus/xmod | |
parent | 866b2aee8b00f39c30728612dcdf3f10722e57f1 (diff) | |
download | GT5-Unofficial-cf5475a417af586af27ae1de3d5e52e374c5a0b7.tar.gz GT5-Unofficial-cf5475a417af586af27ae1de3d5e52e374c5a0b7.tar.bz2 GT5-Unofficial-cf5475a417af586af27ae1de3d5e52e374c5a0b7.zip |
% Re-enabled Tree Farmer recipes.
- Disabled some logging.
Diffstat (limited to 'src/Java/gtPlusPlus/xmod')
2 files changed, 27 insertions, 27 deletions
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/helpers/treefarm/TreeGenerator.java b/src/Java/gtPlusPlus/xmod/gregtech/common/helpers/treefarm/TreeGenerator.java index 6093909167..b94ebf2918 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/helpers/treefarm/TreeGenerator.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/helpers/treefarm/TreeGenerator.java @@ -23,7 +23,7 @@ public class TreeGenerator { private static final FakeTreeInFakeWorldGenerator mTreeData; static { - Logger.INFO("Created Fake Tree Generator."); + Logger.WARNING("Created Fake Tree Generator."); mTreeData = new FakeTreeInFakeWorldGenerator(); } @@ -38,10 +38,10 @@ public class TreeGenerator { AutoMap<ItemStack> aTemp = new AutoMap<ItemStack>(); AutoMap<ItemStack> aOutputMap = mTreeData.getOutputFromTree(); if (aOutputMap != null && aOutputMap.size() > 0) { - Logger.INFO("Valid tree data output"); + Logger.WARNING("Valid tree data output"); return aOutputMap; } - Logger.INFO("Invalid tree data output"); + Logger.WARNING("Invalid tree data output"); return aTemp; } @@ -78,20 +78,20 @@ public class TreeGenerator { this.vinesGrow = aVines; this.mFakeWorld = new AutoMap<FakeWorld>(); this.mTreesToGenerate = aTreeCount; - Logger.INFO("Created Fake Tree In Fake World Instance."); + Logger.WARNING("Created Fake Tree In Fake World Instance."); } public AutoMap<ItemStack> getOutputFromTree(){ if (!hasGenerated) { - Logger.INFO("Generating Tree sample data"); + Logger.WARNING("Generating Tree sample data"); generate(null, CORE.RANDOM, 0, 0, 0); } AutoMap<ItemStack> aOutputMap = new AutoMap<ItemStack>(); int aRandomTreeID = MathUtils.randInt(0, this.mFakeWorld.size()-1); FakeWorld aWorld = this.mFakeWorld.get(aRandomTreeID); if (aWorld != null) { - Logger.INFO("Getting all block data from fake world"); + //Logger.WARNING("Getting all block data from fake world"); aOutputMap = aWorld.getAllBlocksStoredInFakeWorld(); } return aOutputMap; @@ -154,7 +154,7 @@ public class TreeGenerator { //Set some static values - Logger.INFO("Stepping through generateTree [0]"); + Logger.WARNING("Stepping through generateTree [0]"); //Dummy Value int aWorldY = 10; @@ -163,7 +163,7 @@ public class TreeGenerator { if (aWorldY >= 1 && aWorldY + l + 1 <= 256) { - Logger.INFO("Stepping through generateTree [1]"); + Logger.WARNING("Stepping through generateTree [1]"); byte b0; int k1; Block block; @@ -205,19 +205,19 @@ public class TreeGenerator { if (!flag) { - Logger.INFO("Stepping through generateTree [2]"); + Logger.WARNING("Stepping through generateTree [2]"); return false; } else { - Logger.INFO("Stepping through generateTree [3]"); + Logger.WARNING("Stepping through generateTree [3]"); Block block2 = aWorld.getBlock(aWorldX, aWorldY - 1, aWorldZ); FakeBlockPos aBlockToGrowPlantOn = aWorld.getBlockAtCoords(aWorldX, aWorldY-1, aWorldZ); boolean isSoil = block2.canSustainPlant(aWorld, aWorldX, aWorldY - 1, aWorldZ, ForgeDirection.UP, (BlockSapling)Blocks.sapling); if (/*isSoil &&*/ aWorldY < 256 - l - 1) { - Logger.INFO("Stepping through generateTree [4]"); + Logger.WARNING("Stepping through generateTree [4]"); aBlockToGrowPlantOn.onPlantGrow(aWorld, aWorldX, aWorldY - 1, aWorldZ, aWorldX, aWorldY, aWorldZ); b0 = 3; byte b1 = 0; @@ -251,7 +251,7 @@ public class TreeGenerator { } } } - Logger.INFO("Stepping through generateTree [5]"); + Logger.WARNING("Stepping through generateTree [5]"); for (k1 = 0; k1 < l; ++k1) { @@ -285,11 +285,11 @@ public class TreeGenerator { } } } - Logger.INFO("Stepping through generateTree [6]"); + Logger.WARNING("Stepping through generateTree [6]"); if (this.vinesGrow) { - Logger.INFO("Stepping through generateTree [7]"); + Logger.WARNING("Stepping through generateTree [7]"); for (k1 = aWorldY - 3 + l; k1 <= aWorldY + l; ++k1) { i3 = k1 - (aWorldY + l); @@ -324,7 +324,7 @@ public class TreeGenerator { } } } - Logger.INFO("Stepping through generateTree [8]"); + Logger.WARNING("Stepping through generateTree [8]"); if (CORE.RANDOM.nextInt(5) == 0 && l > 5) { @@ -341,19 +341,19 @@ public class TreeGenerator { } } } - Logger.INFO("Stepping through generateTree [9]"); + Logger.WARNING("Stepping through generateTree [9]"); return true; } else { - Logger.INFO("Stepping through generateTree [10]"); + Logger.WARNING("Stepping through generateTree [10]"); return false; } } } else { - Logger.INFO("Stepping through generateTree [11]"); + Logger.WARNING("Stepping through generateTree [11]"); return false; } } @@ -376,7 +376,7 @@ public class TreeGenerator { protected void setBlockAndNotifyAdequately(FakeWorld aWorld, int aX, int aY, int aZ, Block aBlock, int aMeta) { if (aBlock != null && (aMeta >= 0 && aMeta <= Short.MAX_VALUE)) { - Logger.INFO("Setting block "+aX+", "+aY+", "+aZ+" | "+aBlock.getLocalizedName()+" | "+aMeta); + Logger.WARNING("Setting block "+aX+", "+aY+", "+aZ+" | "+aBlock.getLocalizedName()+" | "+aMeta); aWorld.setBlockAtCoords(aX, aY, aZ, aBlock, aMeta); //aOutputsFromGenerator.put(ItemUtils.simpleMetaStack(aBlock, aMeta, 1)); } diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntityTreeFarm.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntityTreeFarm.java index 2ee2acd726..4357765303 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntityTreeFarm.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntityTreeFarm.java @@ -166,9 +166,9 @@ public class GregtechMetaTileEntityTreeFarm extends GregtechMeta_MultiBlockBase } public boolean checkRecipe(final ItemStack aStack) { - //Logger.INFO("Trying to process virtual tree farming"); + //Logger.WARNING("Trying to process virtual tree farming"); if (mTreeData != null) { - //Logger.INFO("Tree Data is valid"); + //Logger.WARNING("Tree Data is valid"); long tVoltage = getMaxInputVoltage(); byte tTier = (byte) Math.max(1, GT_Utility.getTier(tVoltage)); @@ -200,13 +200,13 @@ public class GregtechMetaTileEntityTreeFarm extends GregtechMeta_MultiBlockBase AutoMap<ItemStack> aOutputs = new AutoMap<ItemStack>(); try { - //Logger.INFO("Output Chance - "+aChance+" | Valid number? "+(aChance < 1000)); + //Logger.WARNING("Output Chance - "+aChance+" | Valid number? "+(aChance < 1000)); if (aChance < 8) { //1% Chance per Tick for (int u=0; u<(Math.max(1, (MathUtils.randInt((3*tTier), 100)*tTier*tTier)/8));u++) { aOutputs = mTreeData.generateOutput(0); if (aOutputs.size() > 0) { - Logger.INFO("Generated some Loot, adding it to the output busses"); + Logger.WARNING("Generated some Loot, adding it to the output busses"); ItemStack aLeaves = ItemUtils.getSimpleStack(Blocks.leaves); @@ -215,7 +215,7 @@ public class GregtechMetaTileEntityTreeFarm extends GregtechMeta_MultiBlockBase this.addOutput(aOutputItemStack); } } - Logger.INFO("Updating Slots"); + Logger.WARNING("Updating Slots"); this.updateSlots(); } } @@ -226,11 +226,11 @@ public class GregtechMetaTileEntityTreeFarm extends GregtechMeta_MultiBlockBase t.printStackTrace(); } - //Logger.INFO("Valid Recipe"); + //Logger.WARNING("Valid Recipe"); return true; } else { - //Logger.INFO("Invalid Recipe"); + //Logger.WARNING("Invalid Recipe"); return false; } //return this.checkRecipeGeneric(4, 100, 100); @@ -264,7 +264,7 @@ public class GregtechMetaTileEntityTreeFarm extends GregtechMeta_MultiBlockBase if (!isValidBlockForStructure(tTileEntity, CASING_TEXTURE_ID, true, aBlock, aMeta, ModBlocks.blockCasings2Misc, 15)) { - Logger.INFO("Bad centrifuge casing"); + Logger.WARNING("Bad centrifuge casing"); return false; } ++tAmount; |