From ba16b0edce576aa226127d5e83618ee17f791ca0 Mon Sep 17 00:00:00 2001 From: kekzdealer Date: Wed, 23 Oct 2019 00:02:34 +0200 Subject: fixed misleading TFFT build guid in readme --- .gradle/4.4.1/fileContent/fileContent.lock | Bin 17 -> 17 bytes .gradle/4.4.1/fileHashes/fileHashes.bin | Bin 86915 -> 87665 bytes .gradle/4.4.1/fileHashes/fileHashes.lock | Bin 17 -> 17 bytes .gradle/4.4.1/taskHistory/taskHistory.bin | Bin 251445 -> 310291 bytes .gradle/4.4.1/taskHistory/taskHistory.lock | Bin 17 -> 17 bytes .gradle/buildOutputCleanup/buildOutputCleanup.lock | Bin 17 -> 17 bytes GregTech.lang | 4 ++ config/IC2.ini | 2 +- config/splash.properties | 2 +- screenshots/TFFT_Display.jpeg | Bin 74036 -> 94414 bytes .../GUIContainer_ModularNuclearReactor.java | 6 ++- .../tileentities/GTMTE_ModularNuclearReactor.java | 48 ++++++++++++--------- .../textures/gui/MultiblockDisplay_REACTOR.png | Bin 0 -> 2125 bytes 13 files changed, 38 insertions(+), 24 deletions(-) create mode 100644 src/main/resources/assets/kekztech/textures/gui/MultiblockDisplay_REACTOR.png diff --git a/.gradle/4.4.1/fileContent/fileContent.lock b/.gradle/4.4.1/fileContent/fileContent.lock index 448a49c62b..3a0998d9f8 100644 Binary files a/.gradle/4.4.1/fileContent/fileContent.lock and b/.gradle/4.4.1/fileContent/fileContent.lock differ diff --git a/.gradle/4.4.1/fileHashes/fileHashes.bin b/.gradle/4.4.1/fileHashes/fileHashes.bin index 27622cf4f1..3808292b0f 100644 Binary files a/.gradle/4.4.1/fileHashes/fileHashes.bin and b/.gradle/4.4.1/fileHashes/fileHashes.bin differ diff --git a/.gradle/4.4.1/fileHashes/fileHashes.lock b/.gradle/4.4.1/fileHashes/fileHashes.lock index 4f62341bdb..d4892b96c6 100644 Binary files a/.gradle/4.4.1/fileHashes/fileHashes.lock and b/.gradle/4.4.1/fileHashes/fileHashes.lock differ diff --git a/.gradle/4.4.1/taskHistory/taskHistory.bin b/.gradle/4.4.1/taskHistory/taskHistory.bin index f5b48db8a3..e14eeb7eb0 100644 Binary files a/.gradle/4.4.1/taskHistory/taskHistory.bin and b/.gradle/4.4.1/taskHistory/taskHistory.bin differ diff --git a/.gradle/4.4.1/taskHistory/taskHistory.lock b/.gradle/4.4.1/taskHistory/taskHistory.lock index 744ca39a76..6a21252069 100644 Binary files a/.gradle/4.4.1/taskHistory/taskHistory.lock and b/.gradle/4.4.1/taskHistory/taskHistory.lock differ diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock index 740a07c25b..845d9b2263 100644 Binary files a/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/GregTech.lang b/GregTech.lang index 50b5ce8c71..1bc082a29c 100644 --- a/GregTech.lang +++ b/GregTech.lang @@ -955,6 +955,10 @@ languagefile { S:TileEntity_DESCRIPTION_13103_Index_1=I'm not quite finished yet S:TileEntity_DESCRIPTION_13103_Index_10=Hold §l[LSHIFT]§rto display structure guidelines S:TileEntity_DESCRIPTION_13103_Index_11=Created by Kekzdealer + S:TileEntity_DESCRIPTION_13103_Index_12= Consult controller GUI on how to arrange the outer casings. + S:TileEntity_DESCRIPTION_13103_Index_13=----------------------------------------- + S:TileEntity_DESCRIPTION_13103_Index_14=Hold §l[LSHIFT]§r§7 to display structure guidelines + S:TileEntity_DESCRIPTION_13103_Index_15=Created by Kekzdealer S:TileEntity_DESCRIPTION_13103_Index_2=------------------------------------------ S:TileEntity_DESCRIPTION_13103_Index_3=Dimensions: 5x5x5 (WxHxL) S:TileEntity_DESCRIPTION_13103_Index_4=Structure: diff --git a/config/IC2.ini b/config/IC2.ini index 57d760f28a..bfd80df245 100644 --- a/config/IC2.ini +++ b/config/IC2.ini @@ -1,5 +1,5 @@ ; ic2 general config -; created Oct 14, 2019 1:54:38 AM +; created Oct 22, 2019 11:53:16 PM ;--- [worldgen] diff --git a/config/splash.properties b/config/splash.properties index 32b8ccd69e..655e362f26 100644 --- a/config/splash.properties +++ b/config/splash.properties @@ -1,5 +1,5 @@ #Splash screen properties -#Mon Oct 14 01:54:30 CEST 2019 +#Tue Oct 22 23:53:07 CEST 2019 logoTexture=textures/gui/title/mojang.png background=0xFFFFFF font=0x0 diff --git a/screenshots/TFFT_Display.jpeg b/screenshots/TFFT_Display.jpeg index fc5c12c135..eeae2d2cf6 100644 Binary files a/screenshots/TFFT_Display.jpeg and b/screenshots/TFFT_Display.jpeg differ diff --git a/src/main/java/container/GUIContainer_ModularNuclearReactor.java b/src/main/java/container/GUIContainer_ModularNuclearReactor.java index 0e8ccbb145..106c96b092 100644 --- a/src/main/java/container/GUIContainer_ModularNuclearReactor.java +++ b/src/main/java/container/GUIContainer_ModularNuclearReactor.java @@ -12,7 +12,7 @@ import net.minecraft.util.ResourceLocation; public class GUIContainer_ModularNuclearReactor extends GuiContainer { - private ResourceLocation texture = new ResourceLocation(KekzCore.MODID, "textures/gui/ReaktorGUI_background.png"); + private ResourceLocation texture = new ResourceLocation(KekzCore.MODID, "textures/gui/MultiblockDisplay_REACTOR.png"); private InventoryPlayer inventory; private IGregTechTileEntity te; @@ -31,7 +31,9 @@ public class GUIContainer_ModularNuclearReactor extends GuiContainer { GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - drawTexturedModalRect(100, 100, 0, 0, 260, 230); + final int x = (super.width - super.xSize) / 2; + final int y = (super.height - super.ySize) / 2; + super.drawTexturedModalRect(x, y, 0, 0, super.xSize, super.ySize); } @Override diff --git a/src/main/java/tileentities/GTMTE_ModularNuclearReactor.java b/src/main/java/tileentities/GTMTE_ModularNuclearReactor.java index 6d37a31d83..a6b91a60ca 100644 --- a/src/main/java/tileentities/GTMTE_ModularNuclearReactor.java +++ b/src/main/java/tileentities/GTMTE_ModularNuclearReactor.java @@ -1,14 +1,12 @@ package tileentities; -import org.joml.Vector2i; -import org.joml.Vector2ic; import org.joml.Vector3i; -import org.joml.Vector3ic; import org.lwjgl.input.Keyboard; import blocks.Block_ControlRod; import blocks.Block_ReactorChamber_OFF; import blocks.Block_ReactorChamber_ON; +import container.GUIContainer_ModularNuclearReactor; import gregtech.api.GregTech_API; import gregtech.api.enums.Textures; import gregtech.api.gui.GT_GUIContainer_MultiMachine; @@ -53,12 +51,25 @@ public class GTMTE_ModularNuclearReactor extends GT_MetaTileEntity_MultiBlockBas @Override public String[] getDescription() { final MultiBlockTooltipBuilder b = new MultiBlockTooltipBuilder(); - b.addInfo("DO NOT CHEAT IN THIS MACHINE") - .addInfo("I'm not quite finished yet") + b.addInfo("Can be built, BUT DOES NOT WORK") + .addInfo("Converts fissile material and outputs power or heat") .addSeparator() - .beginStructureBlock(5, 5, 5) - .addController("Front Center") - .addCasingInfo("Radiation Proof Machine Casing", 80) + .addInfo("EU-MODE:") + .addInfo(" Directly outputs electricity depending on inserted fuel rods") + .addSeparator() + .addInfo("COOLANT-MODE:") + .addInfo(" Requires coolant to be pumped into the reactor.") + .addInfo(" Coolant is heated and should be drained and converted to electricity by other means.") + .addSeparator() + .addInfo("NOTES:") + .addInfo(" Does NOT use Industrialcraft 2 reactor components!") + .addInfo(" Consult controller GUI on how to arrange the outer casings.") + .addSeparator() + .beginStructureBlock(7, 6, 7) + .addController("Front bottom Center") + .addCasingInfo("Radiation Proof Machine Casing", 100) + .addOtherStructurePart("Control Rods", "Four pillars, four blocks high each. Diagonal to the inner edges of the shell") + .addOtherStructurePart("Nuclear Reactor Chamber", "17 of them to fill out the rest of the floor inside the shell") .addDynamoHatch("ONLY in EU-mode, at least one") .addOtherStructurePart("Input Bus, Output Bus", "Optional but required for automation") .addOtherStructurePart("Input Hatch, Output Hatch", "ONLY in Coolant-Mode, at least one each") @@ -83,10 +94,9 @@ public class GTMTE_ModularNuclearReactor extends GT_MetaTileEntity_MultiBlockBas // TODO: Opening UI crashes server. Controller isn't craftable right now. public Object getClientGUI(int aID, InventoryPlayer aPlayerInventory, IGregTechTileEntity aBaseMetaTileEntity) { - return new GT_GUIContainer_MultiMachine(aPlayerInventory, aBaseMetaTileEntity, this.getLocalName(), - "MultiblockDisplay.png"); - // In case someone ignores the warning... - //return new GUIContainer_ModularNuclearReactor(aBaseMetaTileEntity, aPlayerInventory.player); + /*return new GT_GUIContainer_MultiMachine(aPlayerInventory, aBaseMetaTileEntity, this.getLocalName(), + "MultiblockDisplay.png");*/ + return new GUIContainer_ModularNuclearReactor(aBaseMetaTileEntity, aPlayerInventory.player); } @Override @@ -113,19 +123,17 @@ public class GTMTE_ModularNuclearReactor extends GT_MetaTileEntity_MultiBlockBas @Override public boolean checkMachine(IGregTechTileEntity thisController, ItemStack guiSlotItem) { // Figure out the vector for the direction the back face of the controller is facing - final Vector2ic forgeDirection = new Vector2i( - ForgeDirection.getOrientation(thisController.getBackFacing()).offsetX, - ForgeDirection.getOrientation(thisController.getBackFacing()).offsetZ - ); + final int dirX = ForgeDirection.getOrientation(thisController.getBackFacing()).offsetX; + final int dirZ = ForgeDirection.getOrientation(thisController.getBackFacing()).offsetZ; int minCasingAmount = 100; boolean checklist = true; // if this is still true at the end, machine is good to go :) // Determine the ground level center of the structure - final Vector3ic center = new Vector3i( + final Vector3i center = new Vector3i( thisController.getXCoord(), thisController.getYCoord(), thisController.getZCoord()) - .add(forgeDirection.x() * 3, 0, forgeDirection.y() * 3); + .add(dirX * 3, 0, dirZ * 3); // Scan for outer tube // - Scan sides for(int x = -3; x <= 3; x++) { @@ -133,7 +141,7 @@ public class GTMTE_ModularNuclearReactor extends GT_MetaTileEntity_MultiBlockBas // Only scan the three wide even sides, skip rest if((Math.abs(x) <= 1 && Math.abs(z) == 3) || (Math.abs(z) <= 1 && Math.abs(x) == 3)) { for(int h = 0; h < 6; h++) { - final Vector3ic pos = new Vector3i(center.x() + x, center.y() + h, center.z() + z); + final Vector3i pos = new Vector3i(center.x() + x, center.y() + h, center.z() + z); if(h == 0 && pos.x() == thisController.getXCoord() && pos.y() == thisController.getYCoord() && pos.z() == thisController.getZCoord()) { // Ignore controller continue; @@ -153,7 +161,7 @@ public class GTMTE_ModularNuclearReactor extends GT_MetaTileEntity_MultiBlockBas // Only scan the four corners, skip rest if(Math.abs(x) + Math.abs(z) == 4) { for(int h = 0; h < 6; h++) { - final Vector3ic pos = new Vector3i(center.x() + x, center.y() + h, center.z() + z); + final Vector3i pos = new Vector3i(center.x() + x, center.y() + h, center.z() + z); if(h == 0 && pos.x() == thisController.getXCoord() && pos.y() == thisController.getYCoord() && pos.z() == thisController.getZCoord()) { // Ignore controller continue; diff --git a/src/main/resources/assets/kekztech/textures/gui/MultiblockDisplay_REACTOR.png b/src/main/resources/assets/kekztech/textures/gui/MultiblockDisplay_REACTOR.png new file mode 100644 index 0000000000..aff9248d4a Binary files /dev/null and b/src/main/resources/assets/kekztech/textures/gui/MultiblockDisplay_REACTOR.png differ -- cgit