From 0a75249eb470083bb12162aed5bd029e4514d979 Mon Sep 17 00:00:00 2001 From: Richard Hendricks Date: Fri, 24 Nov 2017 14:42:24 -0600 Subject: Side branch that has working debug messages. --- src/main/java/bloodasp/galacticgreg/GT_TileEntity_Ores_Space.java | 6 +++--- src/main/java/bloodasp/galacticgreg/auxiliary/LogHelper.java | 5 +++++ 2 files changed, 8 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/main/java/bloodasp/galacticgreg/GT_TileEntity_Ores_Space.java b/src/main/java/bloodasp/galacticgreg/GT_TileEntity_Ores_Space.java index 682a4d98bd..86442b778e 100644 --- a/src/main/java/bloodasp/galacticgreg/GT_TileEntity_Ores_Space.java +++ b/src/main/java/bloodasp/galacticgreg/GT_TileEntity_Ores_Space.java @@ -89,18 +89,18 @@ public class GT_TileEntity_Ores_Space { // Unable to lookup replacement state. Means: The block is unknown, and shall not be replaced if (tRS == ReplaceState.Unknown) { - GalacticGreg.Logger.trace("Not placing ore Meta %d, as target block is unknown", pMetaData); + //GalacticGreg.Logger.trace("Not placing ore Meta %d, as target block is unknown", pMetaData); return false; } else if(tRS == ReplaceState.Airblock && !pAir) { - GalacticGreg.Logger.trace("Not placing ore Meta %d in midair, as AIR is FALSE", pMetaData); + //GalacticGreg.Logger.trace("Not placing ore Meta %d in midair, as AIR is FALSE", pMetaData); return false; } if (tRS == ReplaceState.CannotReplace) { // wrong metaData ID for target block - GalacticGreg.Logger.trace("Not placing ore Meta %d, as the state is CANNOTREPLACE", pMetaData); + //GalacticGreg.Logger.trace("Not placing ore Meta %d, as the state is CANNOTREPLACE", pMetaData); return false; } diff --git a/src/main/java/bloodasp/galacticgreg/auxiliary/LogHelper.java b/src/main/java/bloodasp/galacticgreg/auxiliary/LogHelper.java index 4f6166e3eb..d98df70ce4 100644 --- a/src/main/java/bloodasp/galacticgreg/auxiliary/LogHelper.java +++ b/src/main/java/bloodasp/galacticgreg/auxiliary/LogHelper.java @@ -93,6 +93,11 @@ public final class LogHelper { } FMLLog.log(_mModID.toUpperCase() + tt, pLogLevel, pMessage, args); + System.out.println( + _mModID.toUpperCase() + + " " + + String.format(pMessage, args) + ); } -- cgit From 8f0fa74d14d88fa438151f0c6e215e5eedbde77b Mon Sep 17 00:00:00 2001 From: Richard Hendricks Date: Mon, 11 Dec 2017 20:54:29 -0600 Subject: Change setBlock to align with GT5U. Makes Galena and Lead use pickaxe instead of shovel for harvesting on planets. --- src/main/java/bloodasp/galacticgreg/GT_TileEntity_Ores_Space.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/main/java/bloodasp/galacticgreg/GT_TileEntity_Ores_Space.java b/src/main/java/bloodasp/galacticgreg/GT_TileEntity_Ores_Space.java index 86442b778e..5fcf162c6e 100644 --- a/src/main/java/bloodasp/galacticgreg/GT_TileEntity_Ores_Space.java +++ b/src/main/java/bloodasp/galacticgreg/GT_TileEntity_Ores_Space.java @@ -3,6 +3,7 @@ package bloodasp.galacticgreg; import gregtech.api.GregTech_API; import gregtech.api.util.GT_Log; import gregtech.common.blocks.GT_TileEntity_Ores; +import gregtech.common.blocks.GT_Block_Ores_Abstract; import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.tileentity.TileEntity; @@ -108,8 +109,8 @@ public class GT_TileEntity_Ores_Space { pMetaData += pDimensionDef.getStoneType().getOffset(); else pMetaData += pCustomGTOreOffset; - - pWorld.setBlock(pX, pY, pZ, GregTech_API.sBlockOres1, GT_TileEntity_Ores.getHarvestData((short) 1, pMetaData), 0); + // This fix seems like cargo cult coding...The Abstract class just returns 0 for the harvest level. But it aligns with the GT5U method, so yay? + pWorld.setBlock(pX, pY, pZ, GregTech_API.sBlockOres1, GT_TileEntity_Ores.getHarvestData((short) pMetaData, ( (GT_Block_Ores_Abstract)GregTech_API.sBlockOres1).getBaseBlockHarvestLevel(pMetaData % 16000 / 1000)), 0); TileEntity tTileEntity = pWorld.getTileEntity(pX, pY, pZ); if ((tTileEntity instanceof GT_TileEntity_Ores)) { ((GT_TileEntity_Ores) tTileEntity).mMetaData = ((short) pMetaData); -- cgit From fe47490eea5aecd39cceed7232818cdd32624e5e Mon Sep 17 00:00:00 2001 From: Richard Hendricks Date: Mon, 11 Dec 2017 21:02:18 -0600 Subject: Revert "Side branch that has working debug messages." This reverts commit 0a75249eb470083bb12162aed5bd029e4514d979. --- src/main/java/bloodasp/galacticgreg/GT_TileEntity_Ores_Space.java | 6 +++--- src/main/java/bloodasp/galacticgreg/auxiliary/LogHelper.java | 5 ----- 2 files changed, 3 insertions(+), 8 deletions(-) (limited to 'src') diff --git a/src/main/java/bloodasp/galacticgreg/GT_TileEntity_Ores_Space.java b/src/main/java/bloodasp/galacticgreg/GT_TileEntity_Ores_Space.java index 5fcf162c6e..e100f4557f 100644 --- a/src/main/java/bloodasp/galacticgreg/GT_TileEntity_Ores_Space.java +++ b/src/main/java/bloodasp/galacticgreg/GT_TileEntity_Ores_Space.java @@ -90,18 +90,18 @@ public class GT_TileEntity_Ores_Space { // Unable to lookup replacement state. Means: The block is unknown, and shall not be replaced if (tRS == ReplaceState.Unknown) { - //GalacticGreg.Logger.trace("Not placing ore Meta %d, as target block is unknown", pMetaData); + GalacticGreg.Logger.trace("Not placing ore Meta %d, as target block is unknown", pMetaData); return false; } else if(tRS == ReplaceState.Airblock && !pAir) { - //GalacticGreg.Logger.trace("Not placing ore Meta %d in midair, as AIR is FALSE", pMetaData); + GalacticGreg.Logger.trace("Not placing ore Meta %d in midair, as AIR is FALSE", pMetaData); return false; } if (tRS == ReplaceState.CannotReplace) { // wrong metaData ID for target block - //GalacticGreg.Logger.trace("Not placing ore Meta %d, as the state is CANNOTREPLACE", pMetaData); + GalacticGreg.Logger.trace("Not placing ore Meta %d, as the state is CANNOTREPLACE", pMetaData); return false; } diff --git a/src/main/java/bloodasp/galacticgreg/auxiliary/LogHelper.java b/src/main/java/bloodasp/galacticgreg/auxiliary/LogHelper.java index d98df70ce4..4f6166e3eb 100644 --- a/src/main/java/bloodasp/galacticgreg/auxiliary/LogHelper.java +++ b/src/main/java/bloodasp/galacticgreg/auxiliary/LogHelper.java @@ -93,11 +93,6 @@ public final class LogHelper { } FMLLog.log(_mModID.toUpperCase() + tt, pLogLevel, pMessage, args); - System.out.println( - _mModID.toUpperCase() + - " " + - String.format(pMessage, args) - ); } -- cgit