diff options
Diffstat (limited to 'src/main')
3 files changed, 45 insertions, 12 deletions
diff --git a/src/main/java/gregtech/api/util/GT_Utility.java b/src/main/java/gregtech/api/util/GT_Utility.java index c5d0b29106..4976ad26e5 100644 --- a/src/main/java/gregtech/api/util/GT_Utility.java +++ b/src/main/java/gregtech/api/util/GT_Utility.java @@ -2122,6 +2122,34 @@ public class GT_Utility { tNBT.setString("prospection_oils", joinListToString(tOilsTransformed)); + + String tOilsPosStr = "X: " + (aX/16/8)*16 + " Z: " + (aZ/16/8)*16; + int xOff = aX/16 - (aX/16/8)*8; + xOff = (xOff > 7) ? 7 : xOff; + int xOffRemain = 7 - xOff; + int yOff = aY/16 - (aY/16/8)*8; + yOff = (yOff > 7) ? 7 : yOff; + int yOffRemain = 7 - yOff; + + for( ; xOff > 0; xOff-- ) { + tOilsPosStr.concat("........\n"); + } + for( ; yOff > 0; yOff-- ) { + tOilsPosStr.concat("."); + } + + tOilsPosStr.concat("P"); + + for( ; yOffRemain > 0; yOffRemain-- ) { + tOilsPosStr.concat("."); + } + for( ; xOffRemain > 0; xOffRemain-- ) { + tOilsPosStr.concat("........\n"); + } + tOilsPosStr.concat( " X: " + (aX/16/8 + 1)*8*16 + " Z: " + (aZ/16/8 + 1)*8*16 ); // +1 oilfied to find bottomright of [5] + + tNBT.setString("prospection_oils_pos", tOilsPosStr); + tNBT.setString("prospection_bounds", aNear + "|" + aMiddle + "|" + aRadius); setNBT(aStack, tNBT); @@ -2153,6 +2181,7 @@ public class GT_Utility { String tMiddleOresStr = tNBT.getString("prospection_middle"); String tFarOresStr = tNBT.getString("prospection_far"); String tOilsStr = tNBT.getString("prospection_oils"); + String tOilsPosStr = tNBT.getString("prospection_oils_pos"); String[] tNearOres = tNearOresStr.isEmpty() ? null : tNearOresStr.split("\\|"); String[] tMiddleOres = tMiddleOresStr.isEmpty() ? null : tMiddleOresStr.split("\\|"); @@ -2183,14 +2212,18 @@ public class GT_Utility { fillBookWithList(tNBTList, "Oils%s\n\n", "\n", 9, tOils); tPageText = "Oil notes\n\n" - + "Prospects from NW to SE 324 chunks (9 8x8 oilfields)\n around and gives min-max amount" + "\n\n" + + "Prospects from NW to SE 576 chunks (9 8x8 oilfields)\n around and gives min-max amount" + "\n\n" + "[1][2][3]" + "\n" + "[4][5][6]" + "\n" + "[7][8][9]" + "\n" + "\n" - + "[5] - Prospector"; + + "[5] - Prospector in this 8x8 chunk area"; tNBTList.appendTag(new NBTTagString(tPageText)); + tPageText = "Corners of [5] are \n" + + tOilsPosStr; + tNBTList.appendTag(new NBTTagString(tPageText)); + tNBT.setString("author", tPos.replace("\n"," ")); tNBT.setTag("pages", tNBTList); setNBT(aStack, tNBT); diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_AdvSeismicProspector.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_AdvSeismicProspector.java index b52e57901b..65cab244ba 100644 --- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_AdvSeismicProspector.java +++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_AdvSeismicProspector.java @@ -77,7 +77,7 @@ public class GT_MetaTileEntity_AdvSeismicProspector extends GT_MetaTileEntity_Ba "Near < " + near, "Middle < " + middle, "Far >= " + middle, - "Oil prospecting area 3x3 oilfields"}; + "Oil prospecting area 3x3 oilfields, each is 8x8 chunks"}; } protected GT_MetaTileEntity_AdvSeismicProspector(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures, diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AssemblyLine.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AssemblyLine.java index 20752dfad7..98b8d3b005 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AssemblyLine.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AssemblyLine.java @@ -44,15 +44,15 @@ public class GT_MetaTileEntity_AssemblyLine public String[] getDescription() {
return new String[]{"Assembling Line",
"Size: 3x(5-16)x4, variable length",
- "Bottom: Steel Machine Casing(or Maintenance or Input Hatch),",
- "Input Bus (Last Output Bus), Steel Machine Casing",
- "Middle: Reinforced Glass, Assembly Line, Reinforced Glass",
- "UpMiddle: Grate Machine Casing,",
- " Assembler Machine Casing,",
- " Grate Machine Casing (or Controller or Data Access Hatch)",
- "Top: Steel Casing(or Energy Hatch)",
- "Up to 16 repeating slices, last is Output Bus",
- "Optional 1x Data Access Hatch next to the Controller"};
+ "From Bottom to Top, Left to Right",
+ "Layer 1 - Solid Steel Machine Casing, Input Bus (last is Output Bus), Solid Steel Machine Casing",
+ " - Casings can be replaced by Maint or Input Hatch",
+ "Layer 2 - Reinforced Glass, Assembling Line Casing, Reinforced Glass",
+ "Layer 3 - Grate Machine Casing, Assembler Machine Casing, Grate Machine Casing",
+ "Layer 4 - Empty, Solid Steel Machine Casing, Empty - Casing can be replaced by Energy Hatch",
+ "Up to 16 repeating slices, First replaces 1 Grate with Assembly Line,",
+ "Last has Output Bus instead of Input Bus",
+ "Optional - Replace 1x Grate with Data Access Hatch next to the Controller"};
}
public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, boolean aActive, boolean aRedstone) {
|