From 95ae4bcb0146fbccb6eaf0f0b3477050b8dde533 Mon Sep 17 00:00:00 2001 From: kekzdealer Date: Fri, 11 Oct 2019 02:29:41 +0200 Subject: Fixed TFFT persistency. Made TFFT storage more expensive. Added Multi Hatch recipe. Increased version #. Perparing for release. --- .gradle/4.4.1/fileChanges/last-build.bin | Bin 0 -> 1 bytes .../4.4.1/fileContent/annotation-processors.bin | Bin 0 -> 19685 bytes .gradle/4.4.1/fileContent/fileContent.lock | Bin 0 -> 17 bytes .gradle/4.4.1/fileHashes/fileHashes.bin | Bin 0 -> 85765 bytes .gradle/4.4.1/fileHashes/fileHashes.lock | Bin 0 -> 17 bytes .gradle/4.4.1/fileHashes/resourceHashesCache.bin | Bin 0 -> 20673 bytes .gradle/4.4.1/taskHistory/taskHistory.bin | Bin 0 -> 200074 bytes .gradle/4.4.1/taskHistory/taskHistory.lock | Bin 0 -> 17 bytes .gradle/buildOutputCleanup/buildOutputCleanup.lock | Bin 0 -> 17 bytes .gradle/buildOutputCleanup/cache.properties | 2 + .gradle/buildOutputCleanup/outputFiles.bin | Bin 0 -> 18983 bytes GregTech.lang | 59 ++++ config/GregTech/Recipes.cfg | 2 + config/IC2.ini | 2 +- config/splash.properties | 2 +- logs/2019-05-20-1.log.gz | Bin 328 -> 0 bytes logs/2019-05-20-2.log.gz | Bin 319 -> 0 bytes logs/2019-05-20-3.log.gz | Bin 149 -> 0 bytes logs/2019-05-20-4.log.gz | Bin 79 -> 0 bytes logs/2019-05-20-5.log.gz | Bin 249 -> 0 bytes logs/2019-05-28-1.log.gz | Bin 707 -> 0 bytes logs/2019-05-28-2.log.gz | Bin 719 -> 0 bytes logs/2019-05-28-3.log.gz | Bin 770 -> 0 bytes logs/2019-05-28-4.log.gz | Bin 677 -> 0 bytes logs/2019-05-28-5.log.gz | Bin 262 -> 0 bytes logs/2019-05-28-6.log.gz | Bin 81 -> 0 bytes logs/2019-05-28-7.log.gz | Bin 900 -> 0 bytes logs/2019-05-29-1.log.gz | Bin 1179 -> 0 bytes logs/2019-05-29-2.log.gz | Bin 672 -> 0 bytes logs/2019-05-29-3.log.gz | Bin 635 -> 0 bytes logs/2019-05-29-4.log.gz | Bin 684 -> 0 bytes logs/2019-05-29-5.log.gz | Bin 311 -> 0 bytes logs/2019-05-29-6.log.gz | Bin 313 -> 0 bytes logs/2019-05-29-7.log.gz | Bin 684 -> 0 bytes logs/2019-05-30-1.log.gz | Bin 312 -> 0 bytes logs/2019-05-30-2.log.gz | Bin 310 -> 0 bytes logs/2019-05-30-3.log.gz | Bin 693 -> 0 bytes logs/2019-05-30-4.log.gz | Bin 682 -> 0 bytes logs/2019-05-30-5.log.gz | Bin 671 -> 0 bytes logs/2019-05-30-6.log.gz | Bin 677 -> 0 bytes logs/2019-05-30-7.log.gz | Bin 678 -> 0 bytes logs/2019-06-07-1.log.gz | Bin 650 -> 0 bytes logs/2019-06-07-2.log.gz | Bin 809 -> 0 bytes logs/2019-06-07-3.log.gz | Bin 699 -> 0 bytes logs/2019-06-08-1.log.gz | Bin 713 -> 0 bytes logs/2019-06-08-2.log.gz | Bin 663 -> 0 bytes logs/2019-06-08-3.log.gz | Bin 672 -> 0 bytes logs/2019-06-08-4.log.gz | Bin 663 -> 0 bytes logs/2019-06-08-5.log.gz | Bin 880 -> 0 bytes logs/2019-06-08-6.log.gz | Bin 683 -> 0 bytes logs/2019-06-08-7.log.gz | Bin 686 -> 0 bytes logs/2019-06-09-1.log.gz | Bin 666 -> 0 bytes logs/2019-06-09-2.log.gz | Bin 319 -> 0 bytes logs/2019-06-09-3.log.gz | Bin 318 -> 0 bytes logs/2019-06-09-4.log.gz | Bin 702 -> 0 bytes logs/2019-06-09-5.log.gz | Bin 2801 -> 0 bytes logs/2019-06-09-6.log.gz | Bin 1313 -> 0 bytes logs/2019-06-09-7.log.gz | Bin 665 -> 0 bytes logs/2019-06-11-1.log.gz | Bin 663 -> 0 bytes logs/2019-06-11-2.log.gz | Bin 662 -> 0 bytes logs/2019-06-11-3.log.gz | Bin 318 -> 0 bytes logs/2019-06-11-4.log.gz | Bin 651 -> 0 bytes logs/2019-06-17-1.log.gz | Bin 768 -> 0 bytes logs/2019-07-01-1.log.gz | Bin 555 -> 0 bytes logs/2019-07-01-2.log.gz | Bin 666 -> 0 bytes logs/2019-07-01-3.log.gz | Bin 666 -> 0 bytes logs/2019-07-01-4.log.gz | Bin 727 -> 0 bytes logs/2019-07-01-5.log.gz | Bin 697 -> 0 bytes logs/2019-07-01-6.log.gz | Bin 621 -> 0 bytes logs/2019-07-01-7.log.gz | Bin 803 -> 0 bytes logs/2019-07-02-1.log.gz | Bin 777 -> 0 bytes logs/2019-07-02-2.log.gz | Bin 768 -> 0 bytes logs/2019-07-02-3.log.gz | Bin 676 -> 0 bytes logs/2019-07-02-4.log.gz | Bin 750 -> 0 bytes logs/2019-07-02-5.log.gz | Bin 814 -> 0 bytes logs/2019-07-02-6.log.gz | Bin 1012 -> 0 bytes logs/2019-07-02-7.log.gz | Bin 1078 -> 0 bytes logs/2019-07-03-1.log.gz | Bin 687 -> 0 bytes logs/2019-07-03-2.log.gz | Bin 718 -> 0 bytes logs/2019-07-03-3.log.gz | Bin 688 -> 0 bytes logs/2019-07-03-4.log.gz | Bin 667 -> 0 bytes logs/2019-07-03-5.log.gz | Bin 728 -> 0 bytes logs/2019-07-03-6.log.gz | Bin 1998 -> 0 bytes logs/2019-07-03-7.log.gz | Bin 1601 -> 0 bytes logs/2019-07-04-1.log.gz | Bin 2959 -> 0 bytes logs/2019-07-04-2.log.gz | Bin 2983 -> 0 bytes logs/2019-07-04-3.log.gz | Bin 2342 -> 0 bytes logs/2019-07-04-4.log.gz | Bin 1871 -> 0 bytes logs/2019-07-04-5.log.gz | Bin 777 -> 0 bytes logs/2019-07-04-6.log.gz | Bin 690 -> 0 bytes logs/2019-07-04-7.log.gz | Bin 774 -> 0 bytes logs/2019-07-25-1.log.gz | Bin 2108 -> 0 bytes logs/2019-07-30-1.log.gz | Bin 1629 -> 0 bytes logs/2019-07-30-2.log.gz | Bin 890 -> 0 bytes logs/2019-10-02-1.log.gz | Bin 764 -> 0 bytes logs/2019-10-08-1.log.gz | Bin 669 -> 0 bytes logs/2019-10-08-2.log.gz | Bin 669 -> 0 bytes logs/2019-10-08-3.log.gz | Bin 684 -> 0 bytes logs/2019-10-08-4.log.gz | Bin 719 -> 0 bytes logs/2019-10-08-5.log.gz | Bin 681 -> 0 bytes logs/2019-10-08-6.log.gz | Bin 684 -> 0 bytes logs/2019-10-08-7.log.gz | Bin 985 -> 0 bytes logs/2019-10-09-1.log.gz | Bin 1260 -> 0 bytes logs/2019-10-09-2.log.gz | Bin 1297 -> 0 bytes logs/2019-10-09-3.log.gz | Bin 1167 -> 0 bytes logs/2019-10-09-4.log.gz | Bin 1162 -> 0 bytes logs/2019-10-09-5.log.gz | Bin 2490 -> 0 bytes logs/2019-10-09-6.log.gz | Bin 886 -> 0 bytes logs/2019-10-09-7.log.gz | Bin 1611 -> 0 bytes logs/2019-10-10-1.log.gz | Bin 1270 -> 1583 bytes logs/2019-10-10-2.log.gz | Bin 1661 -> 0 bytes logs/2019-10-10-3.log.gz | Bin 1305 -> 0 bytes logs/2019-10-10-4.log.gz | Bin 1952 -> 0 bytes logs/2019-10-10-5.log.gz | Bin 3380 -> 0 bytes logs/2019-10-10-6.log.gz | Bin 1938 -> 0 bytes logs/2019-10-11-1.log.gz | Bin 0 -> 179 bytes options.txt | 9 + saves/NEI/local/New World/NEI.cfg | 5 - saves/NEI/local/New World/NEI.dat | Bin 75 -> 0 bytes saves/New World/DIM-1/data/villages.dat | Bin 56 -> 0 bytes saves/New World/DIM-1/forcedchunks.dat | Bin 22 -> 0 bytes saves/New World/DIM1/data/villages.dat | Bin 56 -> 0 bytes saves/New World/DIM1/forcedchunks.dat | Bin 22 -> 0 bytes saves/New World/NEI/banneditems.cfg | 2 - saves/New World/NEI/players/kekzdealer.dat | 0 saves/New World/NEI/server.cfg | 19 -- saves/New World/data/villages.dat | Bin 56 -> 0 bytes saves/New World/forcedchunks.dat | Bin 22 -> 0 bytes saves/New World/level.dat | Bin 16729 -> 0 bytes saves/New World/level.dat_mcr | Bin 13883 -> 0 bytes saves/New World/level.dat_old | Bin 16729 -> 0 bytes saves/New World/region/r.-1.0.mca | Bin 655360 -> 0 bytes saves/New World/region/r.0.0.mca | Bin 73728 -> 0 bytes saves/New World/session.lock | Bin 8 -> 0 bytes src/main/java/blocks/Block_TFFTCasing.java | 2 +- src/main/java/kekztech/KekzCore.java | 52 ++- src/main/java/kekztech/MultiFluidHandler.java | 28 +- .../java/tileentities/GTMTE_FluidMultiStorage.java | 376 ++++++++++----------- .../tileentities/GTMTE_ModularNuclearReactor.java | 7 +- src/main/resources/assets/kekztech/lang/en_US.lang | 1 + 140 files changed, 326 insertions(+), 242 deletions(-) create mode 100644 .gradle/4.4.1/fileChanges/last-build.bin create mode 100644 .gradle/4.4.1/fileContent/annotation-processors.bin create mode 100644 .gradle/4.4.1/fileContent/fileContent.lock create mode 100644 .gradle/4.4.1/fileHashes/fileHashes.bin create mode 100644 .gradle/4.4.1/fileHashes/fileHashes.lock create mode 100644 .gradle/4.4.1/fileHashes/resourceHashesCache.bin create mode 100644 .gradle/4.4.1/taskHistory/taskHistory.bin create mode 100644 .gradle/4.4.1/taskHistory/taskHistory.lock create mode 100644 .gradle/buildOutputCleanup/buildOutputCleanup.lock create mode 100644 .gradle/buildOutputCleanup/cache.properties create mode 100644 .gradle/buildOutputCleanup/outputFiles.bin delete mode 100644 logs/2019-05-20-1.log.gz delete mode 100644 logs/2019-05-20-2.log.gz delete mode 100644 logs/2019-05-20-3.log.gz delete mode 100644 logs/2019-05-20-4.log.gz delete mode 100644 logs/2019-05-20-5.log.gz delete mode 100644 logs/2019-05-28-1.log.gz delete mode 100644 logs/2019-05-28-2.log.gz delete mode 100644 logs/2019-05-28-3.log.gz delete mode 100644 logs/2019-05-28-4.log.gz delete mode 100644 logs/2019-05-28-5.log.gz delete mode 100644 logs/2019-05-28-6.log.gz delete mode 100644 logs/2019-05-28-7.log.gz delete mode 100644 logs/2019-05-29-1.log.gz delete mode 100644 logs/2019-05-29-2.log.gz delete mode 100644 logs/2019-05-29-3.log.gz delete mode 100644 logs/2019-05-29-4.log.gz delete mode 100644 logs/2019-05-29-5.log.gz delete mode 100644 logs/2019-05-29-6.log.gz delete mode 100644 logs/2019-05-29-7.log.gz delete mode 100644 logs/2019-05-30-1.log.gz delete mode 100644 logs/2019-05-30-2.log.gz delete mode 100644 logs/2019-05-30-3.log.gz delete mode 100644 logs/2019-05-30-4.log.gz delete mode 100644 logs/2019-05-30-5.log.gz delete mode 100644 logs/2019-05-30-6.log.gz delete mode 100644 logs/2019-05-30-7.log.gz delete mode 100644 logs/2019-06-07-1.log.gz delete mode 100644 logs/2019-06-07-2.log.gz delete mode 100644 logs/2019-06-07-3.log.gz delete mode 100644 logs/2019-06-08-1.log.gz delete mode 100644 logs/2019-06-08-2.log.gz delete mode 100644 logs/2019-06-08-3.log.gz delete mode 100644 logs/2019-06-08-4.log.gz delete mode 100644 logs/2019-06-08-5.log.gz delete mode 100644 logs/2019-06-08-6.log.gz delete mode 100644 logs/2019-06-08-7.log.gz delete mode 100644 logs/2019-06-09-1.log.gz delete mode 100644 logs/2019-06-09-2.log.gz delete mode 100644 logs/2019-06-09-3.log.gz delete mode 100644 logs/2019-06-09-4.log.gz delete mode 100644 logs/2019-06-09-5.log.gz delete mode 100644 logs/2019-06-09-6.log.gz delete mode 100644 logs/2019-06-09-7.log.gz delete mode 100644 logs/2019-06-11-1.log.gz delete mode 100644 logs/2019-06-11-2.log.gz delete mode 100644 logs/2019-06-11-3.log.gz delete mode 100644 logs/2019-06-11-4.log.gz delete mode 100644 logs/2019-06-17-1.log.gz delete mode 100644 logs/2019-07-01-1.log.gz delete mode 100644 logs/2019-07-01-2.log.gz delete mode 100644 logs/2019-07-01-3.log.gz delete mode 100644 logs/2019-07-01-4.log.gz delete mode 100644 logs/2019-07-01-5.log.gz delete mode 100644 logs/2019-07-01-6.log.gz delete mode 100644 logs/2019-07-01-7.log.gz delete mode 100644 logs/2019-07-02-1.log.gz delete mode 100644 logs/2019-07-02-2.log.gz delete mode 100644 logs/2019-07-02-3.log.gz delete mode 100644 logs/2019-07-02-4.log.gz delete mode 100644 logs/2019-07-02-5.log.gz delete mode 100644 logs/2019-07-02-6.log.gz delete mode 100644 logs/2019-07-02-7.log.gz delete mode 100644 logs/2019-07-03-1.log.gz delete mode 100644 logs/2019-07-03-2.log.gz delete mode 100644 logs/2019-07-03-3.log.gz delete mode 100644 logs/2019-07-03-4.log.gz delete mode 100644 logs/2019-07-03-5.log.gz delete mode 100644 logs/2019-07-03-6.log.gz delete mode 100644 logs/2019-07-03-7.log.gz delete mode 100644 logs/2019-07-04-1.log.gz delete mode 100644 logs/2019-07-04-2.log.gz delete mode 100644 logs/2019-07-04-3.log.gz delete mode 100644 logs/2019-07-04-4.log.gz delete mode 100644 logs/2019-07-04-5.log.gz delete mode 100644 logs/2019-07-04-6.log.gz delete mode 100644 logs/2019-07-04-7.log.gz delete mode 100644 logs/2019-07-25-1.log.gz delete mode 100644 logs/2019-07-30-1.log.gz delete mode 100644 logs/2019-07-30-2.log.gz delete mode 100644 logs/2019-10-02-1.log.gz delete mode 100644 logs/2019-10-08-1.log.gz delete mode 100644 logs/2019-10-08-2.log.gz delete mode 100644 logs/2019-10-08-3.log.gz delete mode 100644 logs/2019-10-08-4.log.gz delete mode 100644 logs/2019-10-08-5.log.gz delete mode 100644 logs/2019-10-08-6.log.gz delete mode 100644 logs/2019-10-08-7.log.gz delete mode 100644 logs/2019-10-09-1.log.gz delete mode 100644 logs/2019-10-09-2.log.gz delete mode 100644 logs/2019-10-09-3.log.gz delete mode 100644 logs/2019-10-09-4.log.gz delete mode 100644 logs/2019-10-09-5.log.gz delete mode 100644 logs/2019-10-09-6.log.gz delete mode 100644 logs/2019-10-09-7.log.gz delete mode 100644 logs/2019-10-10-2.log.gz delete mode 100644 logs/2019-10-10-3.log.gz delete mode 100644 logs/2019-10-10-4.log.gz delete mode 100644 logs/2019-10-10-5.log.gz delete mode 100644 logs/2019-10-10-6.log.gz create mode 100644 logs/2019-10-11-1.log.gz delete mode 100644 saves/NEI/local/New World/NEI.cfg delete mode 100644 saves/NEI/local/New World/NEI.dat delete mode 100644 saves/New World/DIM-1/data/villages.dat delete mode 100644 saves/New World/DIM-1/forcedchunks.dat delete mode 100644 saves/New World/DIM1/data/villages.dat delete mode 100644 saves/New World/DIM1/forcedchunks.dat delete mode 100644 saves/New World/NEI/banneditems.cfg delete mode 100644 saves/New World/NEI/players/kekzdealer.dat delete mode 100644 saves/New World/NEI/server.cfg delete mode 100644 saves/New World/data/villages.dat delete mode 100644 saves/New World/forcedchunks.dat delete mode 100644 saves/New World/level.dat delete mode 100644 saves/New World/level.dat_mcr delete mode 100644 saves/New World/level.dat_old delete mode 100644 saves/New World/region/r.-1.0.mca delete mode 100644 saves/New World/region/r.0.0.mca delete mode 100644 saves/New World/session.lock diff --git a/.gradle/4.4.1/fileChanges/last-build.bin b/.gradle/4.4.1/fileChanges/last-build.bin new file mode 100644 index 0000000000..f76dd238ad Binary files /dev/null and b/.gradle/4.4.1/fileChanges/last-build.bin differ diff --git a/.gradle/4.4.1/fileContent/annotation-processors.bin b/.gradle/4.4.1/fileContent/annotation-processors.bin new file mode 100644 index 0000000000..bf4a1e62a8 Binary files /dev/null and b/.gradle/4.4.1/fileContent/annotation-processors.bin differ diff --git a/.gradle/4.4.1/fileContent/fileContent.lock b/.gradle/4.4.1/fileContent/fileContent.lock new file mode 100644 index 0000000000..914f184b18 Binary files /dev/null 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 new file mode 100644 index 0000000000..dde1de976c Binary files /dev/null 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 new file mode 100644 index 0000000000..e38ad2694c Binary files /dev/null and b/.gradle/4.4.1/fileHashes/fileHashes.lock differ diff --git a/.gradle/4.4.1/fileHashes/resourceHashesCache.bin b/.gradle/4.4.1/fileHashes/resourceHashesCache.bin new file mode 100644 index 0000000000..d6817bf881 Binary files /dev/null and b/.gradle/4.4.1/fileHashes/resourceHashesCache.bin differ diff --git a/.gradle/4.4.1/taskHistory/taskHistory.bin b/.gradle/4.4.1/taskHistory/taskHistory.bin new file mode 100644 index 0000000000..6c54c2cf09 Binary files /dev/null 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 new file mode 100644 index 0000000000..2af254906c Binary files /dev/null and b/.gradle/4.4.1/taskHistory/taskHistory.lock differ diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock new file mode 100644 index 0000000000..889f5acb66 Binary files /dev/null and b/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/.gradle/buildOutputCleanup/cache.properties b/.gradle/buildOutputCleanup/cache.properties new file mode 100644 index 0000000000..d32ed2b7bd --- /dev/null +++ b/.gradle/buildOutputCleanup/cache.properties @@ -0,0 +1,2 @@ +#Fri Oct 11 01:00:16 CEST 2019 +gradle.version=4.4.1 diff --git a/.gradle/buildOutputCleanup/outputFiles.bin b/.gradle/buildOutputCleanup/outputFiles.bin new file mode 100644 index 0000000000..d481035b39 Binary files /dev/null and b/.gradle/buildOutputCleanup/outputFiles.bin differ diff --git a/GregTech.lang b/GregTech.lang index ab5f26fc5d..f7518d06ad 100644 --- a/GregTech.lang +++ b/GregTech.lang @@ -923,6 +923,65 @@ languagefile { S:TileEntity_DESCRIPTION_130_Index_2=Size(WxHxD): 3x4x3 (Hollow, with opening on top) S:TileEntity_DESCRIPTION_130_Index_3=Built from 32 Firebrick blocks S:TileEntity_DESCRIPTION_130_Index_4=Causes 50 Pollution per second + S:TileEntity_DESCRIPTION_13101_Index_0=Oxidizes gas fuels to generate electricity without polluting the environment + S:TileEntity_DESCRIPTION_13101_Index_1=Consumes 29,480EU worth of fuel with up to 97% efficiency each second + S:TileEntity_DESCRIPTION_13101_Index_10= 3x YSZ Ceramic Electrolyte Unit: Center 1x1x3 + S:TileEntity_DESCRIPTION_13101_Index_11= 12x Clean Stainless Steel Machine Casing (at least) + S:TileEntity_DESCRIPTION_13101_Index_12= 6x Reinforced Glass: Touching the Electrolyte Units on the horizontal sides + S:TileEntity_DESCRIPTION_13101_Index_13= Maintenance Hatch, I/O Hatches: Instead of any casing + S:TileEntity_DESCRIPTION_13101_Index_2=Steam production requires the SOFC to heat up completely first + S:TileEntity_DESCRIPTION_13101_Index_3=Outputs 1024EU/t and 900L/t Steam + S:TileEntity_DESCRIPTION_13101_Index_4=Additionally requires 20L/t Oxygen gas + S:TileEntity_DESCRIPTION_13101_Index_5=------------------------------------------ + S:TileEntity_DESCRIPTION_13101_Index_6=Dimensions: 3x3x5 (WxHxL) + S:TileEntity_DESCRIPTION_13101_Index_7=Structure: + S:TileEntity_DESCRIPTION_13101_Index_8= Controller: Front center + S:TileEntity_DESCRIPTION_13101_Index_9= Dynamo Hatch: Back center + S:TileEntity_DESCRIPTION_13102_Index_0=Oxidizes gas fuels to generate electricity without polluting the environment + S:TileEntity_DESCRIPTION_13102_Index_1=Consumes 442,200EU worth of fuel with up to 160% efficiency each second + S:TileEntity_DESCRIPTION_13102_Index_10= 3x GDC Ceramic Electrolyte Unit (center 1x1x3) + S:TileEntity_DESCRIPTION_13102_Index_11= 12x Robust Tungstensteel Machine Casing (at least) + S:TileEntity_DESCRIPTION_13102_Index_12= 6x Reinforced Glass: Touching the Electrolyte Units on the horizontal sides + S:TileEntity_DESCRIPTION_13102_Index_13= Maintenance Hatch, I/O Hatches: Instead of any casing + S:TileEntity_DESCRIPTION_13102_Index_2=Steam production requires the SOFC to heat up completely first + S:TileEntity_DESCRIPTION_13102_Index_3=Outputs 24576EU/t and 4800L/t Superheated Steam + S:TileEntity_DESCRIPTION_13102_Index_4=Additionally requires 100L/t Oxygen gas + S:TileEntity_DESCRIPTION_13102_Index_5=------------------------------------------ + S:TileEntity_DESCRIPTION_13102_Index_6=Dimensions: 3x3x5 (WxHxL) + S:TileEntity_DESCRIPTION_13102_Index_7=Structure: + S:TileEntity_DESCRIPTION_13102_Index_8= Controller front center + S:TileEntity_DESCRIPTION_13102_Index_9= Dynamo Hatch back center + S:TileEntity_DESCRIPTION_13103_Index_0=DO NOT CHEAT IN THIS MACHINE + S:TileEntity_DESCRIPTION_13103_Index_1=I'm not quite finished yet + S:TileEntity_DESCRIPTION_13103_Index_2=------------------------------------------ + S:TileEntity_DESCRIPTION_13103_Index_3=Dimensions: 5x5x5 (WxHxL) + S:TileEntity_DESCRIPTION_13103_Index_4=Structure: + S:TileEntity_DESCRIPTION_13103_Index_5= Controller: Front center + S:TileEntity_DESCRIPTION_13103_Index_6= 80x Radiation Proof Machine Casing (at least) + S:TileEntity_DESCRIPTION_13103_Index_7= Dynamo Hatch: ONLY in EU-mode, at least one + S:TileEntity_DESCRIPTION_13103_Index_8= Input Bus, Output Bus: Optional but required for automation + S:TileEntity_DESCRIPTION_13103_Index_9= Input Hatch, Output Hatch: ONLY in Coolant-Mode, at least one each + S:TileEntity_DESCRIPTION_13104_Index_0=High-Tech fluid tank that can hold up to 25 different fluids + S:TileEntity_DESCRIPTION_13104_Index_1=Has 1/25th of the total capacity as capacity for each fluid + S:TileEntity_DESCRIPTION_13104_Index_10=Use an integrated circuit in the GUI slot to limit which fluid is outputted + S:TileEntity_DESCRIPTION_13104_Index_11=The number of a stored fluid can be obtained through the Tricorder. + S:TileEntity_DESCRIPTION_13104_Index_12=------------------------------------------ + S:TileEntity_DESCRIPTION_13104_Index_13=Dimensions: 5x9x5 (WxHxL) + S:TileEntity_DESCRIPTION_13104_Index_14=Structure: + S:TileEntity_DESCRIPTION_13104_Index_15= Controller: Top center + S:TileEntity_DESCRIPTION_13104_Index_16= Energy Hatch: Any top or bottom casing + S:TileEntity_DESCRIPTION_13104_Index_17= Inner 3x7x3 tube are Storage Field Blocks + S:TileEntity_DESCRIPTION_13104_Index_18= Outer 5x7x5 glass shell is AE2 Quartz Glass or Vanilla Stained Glass + S:TileEntity_DESCRIPTION_13104_Index_19= Maintenance Hatch: Any top or bottom casing + S:TileEntity_DESCRIPTION_13104_Index_2=Rightclicking the controller with a screwdriver will turn on excess voiding + S:TileEntity_DESCRIPTION_13104_Index_20= I/O Hatches: Instead of any casing or glass, have to touch storage field + S:TileEntity_DESCRIPTION_13104_Index_3=Fluid storage amount and running cost depends on the storage field blocks used + S:TileEntity_DESCRIPTION_13104_Index_4=Tier I: 500,000L per block, 0.5EU/t + S:TileEntity_DESCRIPTION_13104_Index_5=Tier II: 4,000,000L per block, 1EU/t + S:TileEntity_DESCRIPTION_13104_Index_6=Tier III: 16,000,000L per block, 2EU/t + S:TileEntity_DESCRIPTION_13104_Index_7=Tier IV: 64,000,000L per block, 4EU/t + S:TileEntity_DESCRIPTION_13104_Index_8=------------------------------------------ + S:TileEntity_DESCRIPTION_13104_Index_9=Note on hatch locking: S:TileEntity_DESCRIPTION_1310_Index_0=Max Voltage: %s S:TileEntity_DESCRIPTION_1310_Index_1=Max Amperage: %s S:TileEntity_DESCRIPTION_1310_Index_2=Loss/Meter/Ampere: %s EU-Volt diff --git a/config/GregTech/Recipes.cfg b/config/GregTech/Recipes.cfg index d15efea11c..0441cbeb13 100644 --- a/config/GregTech/Recipes.cfg +++ b/config/GregTech/Recipes.cfg @@ -4702,6 +4702,8 @@ assembling { I:tile.jukebox_400=400 I:tile.kekztech_gdcceramicelectrolyteunit_block_2400=2400 I:tile.kekztech_tfftcasing_block_200=200 + I:tile.kekztech_tfftcasingblock_block_200=200 + I:tile.kekztech_tfftmultihatch_block_6000=6000 I:tile.kekztech_tfftstoragefieldblock1_block_200=200 I:tile.kekztech_tfftstoragefieldblock2_block_200=200 I:tile.kekztech_tfftstoragefieldblock3_block_300=300 diff --git a/config/IC2.ini b/config/IC2.ini index b22fa00f9f..34e97e643d 100644 --- a/config/IC2.ini +++ b/config/IC2.ini @@ -1,5 +1,5 @@ ; ic2 general config -; created Oct 10, 2019 4:06:49 AM +; created Oct 11, 2019 2:18:17 AM ;--- [worldgen] diff --git a/config/splash.properties b/config/splash.properties index 6ae82a8b9c..966b9ae3b6 100644 --- a/config/splash.properties +++ b/config/splash.properties @@ -1,5 +1,5 @@ #Splash screen properties -#Thu Oct 10 04:06:42 CEST 2019 +#Fri Oct 11 02:18:09 CEST 2019 logoTexture=textures/gui/title/mojang.png background=0xFFFFFF font=0x0 diff --git a/logs/2019-05-20-1.log.gz b/logs/2019-05-20-1.log.gz deleted file mode 100644 index 643029d0a3..0000000000 Binary files a/logs/2019-05-20-1.log.gz and /dev/null differ diff --git a/logs/2019-05-20-2.log.gz b/logs/2019-05-20-2.log.gz deleted file mode 100644 index 56847b14d3..0000000000 Binary files a/logs/2019-05-20-2.log.gz and /dev/null differ diff --git a/logs/2019-05-20-3.log.gz b/logs/2019-05-20-3.log.gz deleted file mode 100644 index 846a643bc4..0000000000 Binary files a/logs/2019-05-20-3.log.gz and /dev/null differ diff --git a/logs/2019-05-20-4.log.gz b/logs/2019-05-20-4.log.gz deleted file mode 100644 index 189a770071..0000000000 Binary files a/logs/2019-05-20-4.log.gz and /dev/null differ diff --git a/logs/2019-05-20-5.log.gz b/logs/2019-05-20-5.log.gz deleted file mode 100644 index 0a383a65f8..0000000000 Binary files a/logs/2019-05-20-5.log.gz and /dev/null differ diff --git a/logs/2019-05-28-1.log.gz b/logs/2019-05-28-1.log.gz deleted file mode 100644 index d073d2f814..0000000000 Binary files a/logs/2019-05-28-1.log.gz and /dev/null differ diff --git a/logs/2019-05-28-2.log.gz b/logs/2019-05-28-2.log.gz deleted file mode 100644 index 21e353de3f..0000000000 Binary files a/logs/2019-05-28-2.log.gz and /dev/null differ diff --git a/logs/2019-05-28-3.log.gz b/logs/2019-05-28-3.log.gz deleted file mode 100644 index edd9966d6c..0000000000 Binary files a/logs/2019-05-28-3.log.gz and /dev/null differ diff --git a/logs/2019-05-28-4.log.gz b/logs/2019-05-28-4.log.gz deleted file mode 100644 index aa32e1d848..0000000000 Binary files a/logs/2019-05-28-4.log.gz and /dev/null differ diff --git a/logs/2019-05-28-5.log.gz b/logs/2019-05-28-5.log.gz deleted file mode 100644 index dd57cdc3c5..0000000000 Binary files a/logs/2019-05-28-5.log.gz and /dev/null differ diff --git a/logs/2019-05-28-6.log.gz b/logs/2019-05-28-6.log.gz deleted file mode 100644 index 7b5a202eca..0000000000 Binary files a/logs/2019-05-28-6.log.gz and /dev/null differ diff --git a/logs/2019-05-28-7.log.gz b/logs/2019-05-28-7.log.gz deleted file mode 100644 index 1f7e0820c1..0000000000 Binary files a/logs/2019-05-28-7.log.gz and /dev/null differ diff --git a/logs/2019-05-29-1.log.gz b/logs/2019-05-29-1.log.gz deleted file mode 100644 index f6b9af60ca..0000000000 Binary files a/logs/2019-05-29-1.log.gz and /dev/null differ diff --git a/logs/2019-05-29-2.log.gz b/logs/2019-05-29-2.log.gz deleted file mode 100644 index da78de0cde..0000000000 Binary files a/logs/2019-05-29-2.log.gz and /dev/null differ diff --git a/logs/2019-05-29-3.log.gz b/logs/2019-05-29-3.log.gz deleted file mode 100644 index 115c78cbe1..0000000000 Binary files a/logs/2019-05-29-3.log.gz and /dev/null differ diff --git a/logs/2019-05-29-4.log.gz b/logs/2019-05-29-4.log.gz deleted file mode 100644 index 383e7442e6..0000000000 Binary files a/logs/2019-05-29-4.log.gz and /dev/null differ diff --git a/logs/2019-05-29-5.log.gz b/logs/2019-05-29-5.log.gz deleted file mode 100644 index 84ebdebcb7..0000000000 Binary files a/logs/2019-05-29-5.log.gz and /dev/null differ diff --git a/logs/2019-05-29-6.log.gz b/logs/2019-05-29-6.log.gz deleted file mode 100644 index 51cb45adae..0000000000 Binary files a/logs/2019-05-29-6.log.gz and /dev/null differ diff --git a/logs/2019-05-29-7.log.gz b/logs/2019-05-29-7.log.gz deleted file mode 100644 index c5dad3a65d..0000000000 Binary files a/logs/2019-05-29-7.log.gz and /dev/null differ diff --git a/logs/2019-05-30-1.log.gz b/logs/2019-05-30-1.log.gz deleted file mode 100644 index d9ff2f8e53..0000000000 Binary files a/logs/2019-05-30-1.log.gz and /dev/null differ diff --git a/logs/2019-05-30-2.log.gz b/logs/2019-05-30-2.log.gz deleted file mode 100644 index 32ae0de352..0000000000 Binary files a/logs/2019-05-30-2.log.gz and /dev/null differ diff --git a/logs/2019-05-30-3.log.gz b/logs/2019-05-30-3.log.gz deleted file mode 100644 index 1b36cf0662..0000000000 Binary files a/logs/2019-05-30-3.log.gz and /dev/null differ diff --git a/logs/2019-05-30-4.log.gz b/logs/2019-05-30-4.log.gz deleted file mode 100644 index a3ff770b43..0000000000 Binary files a/logs/2019-05-30-4.log.gz and /dev/null differ diff --git a/logs/2019-05-30-5.log.gz b/logs/2019-05-30-5.log.gz deleted file mode 100644 index 6f404e0044..0000000000 Binary files a/logs/2019-05-30-5.log.gz and /dev/null differ diff --git a/logs/2019-05-30-6.log.gz b/logs/2019-05-30-6.log.gz deleted file mode 100644 index fce9df1f02..0000000000 Binary files a/logs/2019-05-30-6.log.gz and /dev/null differ diff --git a/logs/2019-05-30-7.log.gz b/logs/2019-05-30-7.log.gz deleted file mode 100644 index abc090c619..0000000000 Binary files a/logs/2019-05-30-7.log.gz and /dev/null differ diff --git a/logs/2019-06-07-1.log.gz b/logs/2019-06-07-1.log.gz deleted file mode 100644 index 7a3e666f11..0000000000 Binary files a/logs/2019-06-07-1.log.gz and /dev/null differ diff --git a/logs/2019-06-07-2.log.gz b/logs/2019-06-07-2.log.gz deleted file mode 100644 index 2ceba00feb..0000000000 Binary files a/logs/2019-06-07-2.log.gz and /dev/null differ diff --git a/logs/2019-06-07-3.log.gz b/logs/2019-06-07-3.log.gz deleted file mode 100644 index 167fdf8a6c..0000000000 Binary files a/logs/2019-06-07-3.log.gz and /dev/null differ diff --git a/logs/2019-06-08-1.log.gz b/logs/2019-06-08-1.log.gz deleted file mode 100644 index 1b3dc7304d..0000000000 Binary files a/logs/2019-06-08-1.log.gz and /dev/null differ diff --git a/logs/2019-06-08-2.log.gz b/logs/2019-06-08-2.log.gz deleted file mode 100644 index 46c003444c..0000000000 Binary files a/logs/2019-06-08-2.log.gz and /dev/null differ diff --git a/logs/2019-06-08-3.log.gz b/logs/2019-06-08-3.log.gz deleted file mode 100644 index 60ea60d661..0000000000 Binary files a/logs/2019-06-08-3.log.gz and /dev/null differ diff --git a/logs/2019-06-08-4.log.gz b/logs/2019-06-08-4.log.gz deleted file mode 100644 index 4af0292995..0000000000 Binary files a/logs/2019-06-08-4.log.gz and /dev/null differ diff --git a/logs/2019-06-08-5.log.gz b/logs/2019-06-08-5.log.gz deleted file mode 100644 index 587f29e5b7..0000000000 Binary files a/logs/2019-06-08-5.log.gz and /dev/null differ diff --git a/logs/2019-06-08-6.log.gz b/logs/2019-06-08-6.log.gz deleted file mode 100644 index b5f0576dc9..0000000000 Binary files a/logs/2019-06-08-6.log.gz and /dev/null differ diff --git a/logs/2019-06-08-7.log.gz b/logs/2019-06-08-7.log.gz deleted file mode 100644 index 08d49fa2e9..0000000000 Binary files a/logs/2019-06-08-7.log.gz and /dev/null differ diff --git a/logs/2019-06-09-1.log.gz b/logs/2019-06-09-1.log.gz deleted file mode 100644 index e4ac076134..0000000000 Binary files a/logs/2019-06-09-1.log.gz and /dev/null differ diff --git a/logs/2019-06-09-2.log.gz b/logs/2019-06-09-2.log.gz deleted file mode 100644 index 90b204a53f..0000000000 Binary files a/logs/2019-06-09-2.log.gz and /dev/null differ diff --git a/logs/2019-06-09-3.log.gz b/logs/2019-06-09-3.log.gz deleted file mode 100644 index a32627c915..0000000000 Binary files a/logs/2019-06-09-3.log.gz and /dev/null differ diff --git a/logs/2019-06-09-4.log.gz b/logs/2019-06-09-4.log.gz deleted file mode 100644 index 525ac02f16..0000000000 Binary files a/logs/2019-06-09-4.log.gz and /dev/null differ diff --git a/logs/2019-06-09-5.log.gz b/logs/2019-06-09-5.log.gz deleted file mode 100644 index e5f2d4cc1a..0000000000 Binary files a/logs/2019-06-09-5.log.gz and /dev/null differ diff --git a/logs/2019-06-09-6.log.gz b/logs/2019-06-09-6.log.gz deleted file mode 100644 index 69d1687129..0000000000 Binary files a/logs/2019-06-09-6.log.gz and /dev/null differ diff --git a/logs/2019-06-09-7.log.gz b/logs/2019-06-09-7.log.gz deleted file mode 100644 index e3cfa93b16..0000000000 Binary files a/logs/2019-06-09-7.log.gz and /dev/null differ diff --git a/logs/2019-06-11-1.log.gz b/logs/2019-06-11-1.log.gz deleted file mode 100644 index 25893e1779..0000000000 Binary files a/logs/2019-06-11-1.log.gz and /dev/null differ diff --git a/logs/2019-06-11-2.log.gz b/logs/2019-06-11-2.log.gz deleted file mode 100644 index 4e798dc328..0000000000 Binary files a/logs/2019-06-11-2.log.gz and /dev/null differ diff --git a/logs/2019-06-11-3.log.gz b/logs/2019-06-11-3.log.gz deleted file mode 100644 index 7cd1086b6e..0000000000 Binary files a/logs/2019-06-11-3.log.gz and /dev/null differ diff --git a/logs/2019-06-11-4.log.gz b/logs/2019-06-11-4.log.gz deleted file mode 100644 index 264c788ae1..0000000000 Binary files a/logs/2019-06-11-4.log.gz and /dev/null differ diff --git a/logs/2019-06-17-1.log.gz b/logs/2019-06-17-1.log.gz deleted file mode 100644 index dc49bd1cd9..0000000000 Binary files a/logs/2019-06-17-1.log.gz and /dev/null differ diff --git a/logs/2019-07-01-1.log.gz b/logs/2019-07-01-1.log.gz deleted file mode 100644 index 43c1f5c16f..0000000000 Binary files a/logs/2019-07-01-1.log.gz and /dev/null differ diff --git a/logs/2019-07-01-2.log.gz b/logs/2019-07-01-2.log.gz deleted file mode 100644 index f22aba1013..0000000000 Binary files a/logs/2019-07-01-2.log.gz and /dev/null differ diff --git a/logs/2019-07-01-3.log.gz b/logs/2019-07-01-3.log.gz deleted file mode 100644 index f37dd6c7f3..0000000000 Binary files a/logs/2019-07-01-3.log.gz and /dev/null differ diff --git a/logs/2019-07-01-4.log.gz b/logs/2019-07-01-4.log.gz deleted file mode 100644 index 63f7628ca6..0000000000 Binary files a/logs/2019-07-01-4.log.gz and /dev/null differ diff --git a/logs/2019-07-01-5.log.gz b/logs/2019-07-01-5.log.gz deleted file mode 100644 index abc1f0b34b..0000000000 Binary files a/logs/2019-07-01-5.log.gz and /dev/null differ diff --git a/logs/2019-07-01-6.log.gz b/logs/2019-07-01-6.log.gz deleted file mode 100644 index bf523bf526..0000000000 Binary files a/logs/2019-07-01-6.log.gz and /dev/null differ diff --git a/logs/2019-07-01-7.log.gz b/logs/2019-07-01-7.log.gz deleted file mode 100644 index c1d987b573..0000000000 Binary files a/logs/2019-07-01-7.log.gz and /dev/null differ diff --git a/logs/2019-07-02-1.log.gz b/logs/2019-07-02-1.log.gz deleted file mode 100644 index 8928ce3f1c..0000000000 Binary files a/logs/2019-07-02-1.log.gz and /dev/null differ diff --git a/logs/2019-07-02-2.log.gz b/logs/2019-07-02-2.log.gz deleted file mode 100644 index ef095d42e6..0000000000 Binary files a/logs/2019-07-02-2.log.gz and /dev/null differ diff --git a/logs/2019-07-02-3.log.gz b/logs/2019-07-02-3.log.gz deleted file mode 100644 index cb3e9c7a68..0000000000 Binary files a/logs/2019-07-02-3.log.gz and /dev/null differ diff --git a/logs/2019-07-02-4.log.gz b/logs/2019-07-02-4.log.gz deleted file mode 100644 index fc5981289a..0000000000 Binary files a/logs/2019-07-02-4.log.gz and /dev/null differ diff --git a/logs/2019-07-02-5.log.gz b/logs/2019-07-02-5.log.gz deleted file mode 100644 index a21f69cc95..0000000000 Binary files a/logs/2019-07-02-5.log.gz and /dev/null differ diff --git a/logs/2019-07-02-6.log.gz b/logs/2019-07-02-6.log.gz deleted file mode 100644 index d9c4bcc3d6..0000000000 Binary files a/logs/2019-07-02-6.log.gz and /dev/null differ diff --git a/logs/2019-07-02-7.log.gz b/logs/2019-07-02-7.log.gz deleted file mode 100644 index 56ae143167..0000000000 Binary files a/logs/2019-07-02-7.log.gz and /dev/null differ diff --git a/logs/2019-07-03-1.log.gz b/logs/2019-07-03-1.log.gz deleted file mode 100644 index 27a1de6183..0000000000 Binary files a/logs/2019-07-03-1.log.gz and /dev/null differ diff --git a/logs/2019-07-03-2.log.gz b/logs/2019-07-03-2.log.gz deleted file mode 100644 index 2c5a92ed5d..0000000000 Binary files a/logs/2019-07-03-2.log.gz and /dev/null differ diff --git a/logs/2019-07-03-3.log.gz b/logs/2019-07-03-3.log.gz deleted file mode 100644 index 80d4a58c2e..0000000000 Binary files a/logs/2019-07-03-3.log.gz and /dev/null differ diff --git a/logs/2019-07-03-4.log.gz b/logs/2019-07-03-4.log.gz deleted file mode 100644 index a38007f205..0000000000 Binary files a/logs/2019-07-03-4.log.gz and /dev/null differ diff --git a/logs/2019-07-03-5.log.gz b/logs/2019-07-03-5.log.gz deleted file mode 100644 index 1be59ea91f..0000000000 Binary files a/logs/2019-07-03-5.log.gz and /dev/null differ diff --git a/logs/2019-07-03-6.log.gz b/logs/2019-07-03-6.log.gz deleted file mode 100644 index 9c374222d5..0000000000 Binary files a/logs/2019-07-03-6.log.gz and /dev/null differ diff --git a/logs/2019-07-03-7.log.gz b/logs/2019-07-03-7.log.gz deleted file mode 100644 index 186ccefa2a..0000000000 Binary files a/logs/2019-07-03-7.log.gz and /dev/null differ diff --git a/logs/2019-07-04-1.log.gz b/logs/2019-07-04-1.log.gz deleted file mode 100644 index ff6924de7b..0000000000 Binary files a/logs/2019-07-04-1.log.gz and /dev/null differ diff --git a/logs/2019-07-04-2.log.gz b/logs/2019-07-04-2.log.gz deleted file mode 100644 index b31a662fcb..0000000000 Binary files a/logs/2019-07-04-2.log.gz and /dev/null differ diff --git a/logs/2019-07-04-3.log.gz b/logs/2019-07-04-3.log.gz deleted file mode 100644 index e02204d078..0000000000 Binary files a/logs/2019-07-04-3.log.gz and /dev/null differ diff --git a/logs/2019-07-04-4.log.gz b/logs/2019-07-04-4.log.gz deleted file mode 100644 index ee99d99d76..0000000000 Binary files a/logs/2019-07-04-4.log.gz and /dev/null differ diff --git a/logs/2019-07-04-5.log.gz b/logs/2019-07-04-5.log.gz deleted file mode 100644 index e20fd8beb8..0000000000 Binary files a/logs/2019-07-04-5.log.gz and /dev/null differ diff --git a/logs/2019-07-04-6.log.gz b/logs/2019-07-04-6.log.gz deleted file mode 100644 index 00594b280b..0000000000 Binary files a/logs/2019-07-04-6.log.gz and /dev/null differ diff --git a/logs/2019-07-04-7.log.gz b/logs/2019-07-04-7.log.gz deleted file mode 100644 index 560b311c5f..0000000000 Binary files a/logs/2019-07-04-7.log.gz and /dev/null differ diff --git a/logs/2019-07-25-1.log.gz b/logs/2019-07-25-1.log.gz deleted file mode 100644 index b00e1e4d4b..0000000000 Binary files a/logs/2019-07-25-1.log.gz and /dev/null differ diff --git a/logs/2019-07-30-1.log.gz b/logs/2019-07-30-1.log.gz deleted file mode 100644 index 5245354be9..0000000000 Binary files a/logs/2019-07-30-1.log.gz and /dev/null differ diff --git a/logs/2019-07-30-2.log.gz b/logs/2019-07-30-2.log.gz deleted file mode 100644 index eac305e091..0000000000 Binary files a/logs/2019-07-30-2.log.gz and /dev/null differ diff --git a/logs/2019-10-02-1.log.gz b/logs/2019-10-02-1.log.gz deleted file mode 100644 index a9aa9b9d21..0000000000 Binary files a/logs/2019-10-02-1.log.gz and /dev/null differ diff --git a/logs/2019-10-08-1.log.gz b/logs/2019-10-08-1.log.gz deleted file mode 100644 index b235f35517..0000000000 Binary files a/logs/2019-10-08-1.log.gz and /dev/null differ diff --git a/logs/2019-10-08-2.log.gz b/logs/2019-10-08-2.log.gz deleted file mode 100644 index 67d8e615f8..0000000000 Binary files a/logs/2019-10-08-2.log.gz and /dev/null differ diff --git a/logs/2019-10-08-3.log.gz b/logs/2019-10-08-3.log.gz deleted file mode 100644 index efb5e3da17..0000000000 Binary files a/logs/2019-10-08-3.log.gz and /dev/null differ diff --git a/logs/2019-10-08-4.log.gz b/logs/2019-10-08-4.log.gz deleted file mode 100644 index 7fe6f88451..0000000000 Binary files a/logs/2019-10-08-4.log.gz and /dev/null differ diff --git a/logs/2019-10-08-5.log.gz b/logs/2019-10-08-5.log.gz deleted file mode 100644 index e0a895c030..0000000000 Binary files a/logs/2019-10-08-5.log.gz and /dev/null differ diff --git a/logs/2019-10-08-6.log.gz b/logs/2019-10-08-6.log.gz deleted file mode 100644 index b16e824b37..0000000000 Binary files a/logs/2019-10-08-6.log.gz and /dev/null differ diff --git a/logs/2019-10-08-7.log.gz b/logs/2019-10-08-7.log.gz deleted file mode 100644 index 07bcb00d89..0000000000 Binary files a/logs/2019-10-08-7.log.gz and /dev/null differ diff --git a/logs/2019-10-09-1.log.gz b/logs/2019-10-09-1.log.gz deleted file mode 100644 index 2fa689065d..0000000000 Binary files a/logs/2019-10-09-1.log.gz and /dev/null differ diff --git a/logs/2019-10-09-2.log.gz b/logs/2019-10-09-2.log.gz deleted file mode 100644 index 36eee8ffa7..0000000000 Binary files a/logs/2019-10-09-2.log.gz and /dev/null differ diff --git a/logs/2019-10-09-3.log.gz b/logs/2019-10-09-3.log.gz deleted file mode 100644 index 27a3212817..0000000000 Binary files a/logs/2019-10-09-3.log.gz and /dev/null differ diff --git a/logs/2019-10-09-4.log.gz b/logs/2019-10-09-4.log.gz deleted file mode 100644 index 846a92b304..0000000000 Binary files a/logs/2019-10-09-4.log.gz and /dev/null differ diff --git a/logs/2019-10-09-5.log.gz b/logs/2019-10-09-5.log.gz deleted file mode 100644 index 8304733e88..0000000000 Binary files a/logs/2019-10-09-5.log.gz and /dev/null differ diff --git a/logs/2019-10-09-6.log.gz b/logs/2019-10-09-6.log.gz deleted file mode 100644 index 29ffdfed00..0000000000 Binary files a/logs/2019-10-09-6.log.gz and /dev/null differ diff --git a/logs/2019-10-09-7.log.gz b/logs/2019-10-09-7.log.gz deleted file mode 100644 index 52f02f707c..0000000000 Binary files a/logs/2019-10-09-7.log.gz and /dev/null differ diff --git a/logs/2019-10-10-1.log.gz b/logs/2019-10-10-1.log.gz index 20fc48d4d1..bc6f3b51f8 100644 Binary files a/logs/2019-10-10-1.log.gz and b/logs/2019-10-10-1.log.gz differ diff --git a/logs/2019-10-10-2.log.gz b/logs/2019-10-10-2.log.gz deleted file mode 100644 index 2a08b897e3..0000000000 Binary files a/logs/2019-10-10-2.log.gz and /dev/null differ diff --git a/logs/2019-10-10-3.log.gz b/logs/2019-10-10-3.log.gz deleted file mode 100644 index f052dca82b..0000000000 Binary files a/logs/2019-10-10-3.log.gz and /dev/null differ diff --git a/logs/2019-10-10-4.log.gz b/logs/2019-10-10-4.log.gz deleted file mode 100644 index 186a7ffa19..0000000000 Binary files a/logs/2019-10-10-4.log.gz and /dev/null differ diff --git a/logs/2019-10-10-5.log.gz b/logs/2019-10-10-5.log.gz deleted file mode 100644 index 7e49490bcd..0000000000 Binary files a/logs/2019-10-10-5.log.gz and /dev/null differ diff --git a/logs/2019-10-10-6.log.gz b/logs/2019-10-10-6.log.gz deleted file mode 100644 index 7803858251..0000000000 Binary files a/logs/2019-10-10-6.log.gz and /dev/null differ diff --git a/logs/2019-10-11-1.log.gz b/logs/2019-10-11-1.log.gz new file mode 100644 index 0000000000..127f46923d Binary files /dev/null and b/logs/2019-10-11-1.log.gz differ diff --git a/options.txt b/options.txt index 5bc5167523..d32a1c420e 100644 --- a/options.txt +++ b/options.txt @@ -90,6 +90,15 @@ key_Boost Key:0 key_Mode Switch Key:0 key_Side Inventory Key:0 key_Hub Expand Key:0 +key_Glider Toggle:34 +key_Sound Locator:38 +key_Night Vision:25 +key_Goggles of Revealing:19 +key_Step Assist:0 +key_Speed:0 +key_Jump:0 +key_Yeta Wrench Mode:21 +key_Toggle Electromagnet:0 soundCategory_master:0.25496688 soundCategory_music:0.0 soundCategory_record:0.0 diff --git a/saves/NEI/local/New World/NEI.cfg b/saves/NEI/local/New World/NEI.cfg deleted file mode 100644 index 6e4acab17e..0000000000 --- a/saves/NEI/local/New World/NEI.cfg +++ /dev/null @@ -1,5 +0,0 @@ -#World based configuration of NEI. -#Most of these options can be changed ingame. -#Deleting any element will restore it to it's default value - -inventory.cheatmode=2 diff --git a/saves/NEI/local/New World/NEI.dat b/saves/NEI/local/New World/NEI.dat deleted file mode 100644 index 4796f879bf..0000000000 Binary files a/saves/NEI/local/New World/NEI.dat and /dev/null differ diff --git a/saves/New World/DIM-1/data/villages.dat b/saves/New World/DIM-1/data/villages.dat deleted file mode 100644 index c8bc45545a..0000000000 Binary files a/saves/New World/DIM-1/data/villages.dat and /dev/null differ diff --git a/saves/New World/DIM-1/forcedchunks.dat b/saves/New World/DIM-1/forcedchunks.dat deleted file mode 100644 index e4345475ef..0000000000 Binary files a/saves/New World/DIM-1/forcedchunks.dat and /dev/null differ diff --git a/saves/New World/DIM1/data/villages.dat b/saves/New World/DIM1/data/villages.dat deleted file mode 100644 index c8bc45545a..0000000000 Binary files a/saves/New World/DIM1/data/villages.dat and /dev/null differ diff --git a/saves/New World/DIM1/forcedchunks.dat b/saves/New World/DIM1/forcedchunks.dat deleted file mode 100644 index e4345475ef..0000000000 Binary files a/saves/New World/DIM1/forcedchunks.dat and /dev/null differ diff --git a/saves/New World/NEI/banneditems.cfg b/saves/New World/NEI/banneditems.cfg deleted file mode 100644 index 210b036169..0000000000 --- a/saves/New World/NEI/banneditems.cfg +++ /dev/null @@ -1,2 +0,0 @@ -#Saved in this format for external editing. The format isn't that hard to figure out. If you think you're up to it, modify it here! -{name:"minecraft:command_block"}=[NONE] diff --git a/saves/New World/NEI/players/kekzdealer.dat b/saves/New World/NEI/players/kekzdealer.dat deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/saves/New World/NEI/server.cfg b/saves/New World/NEI/server.cfg deleted file mode 100644 index b954a5b9cc..0000000000 --- a/saves/New World/NEI/server.cfg +++ /dev/null @@ -1,19 +0,0 @@ - -#List of players who can use these features. -#Eg. time=CodeChicken, Friend1 -permissions -{ - adventure=OP - creative=OP - creative+=OP - delete=OP - enchant=OP - heal=OP - item=OP - magnet=OP - notify-item=CONSOLE, OP - potion=OP - rain=OP - save-state=OP - time=OP -} diff --git a/saves/New World/data/villages.dat b/saves/New World/data/villages.dat deleted file mode 100644 index c8bc45545a..0000000000 Binary files a/saves/New World/data/villages.dat and /dev/null differ diff --git a/saves/New World/forcedchunks.dat b/saves/New World/forcedchunks.dat deleted file mode 100644 index e4345475ef..0000000000 Binary files a/saves/New World/forcedchunks.dat and /dev/null differ diff --git a/saves/New World/level.dat b/saves/New World/level.dat deleted file mode 100644 index c74cfce812..0000000000 Binary files a/saves/New World/level.dat and /dev/null differ diff --git a/saves/New World/level.dat_mcr b/saves/New World/level.dat_mcr deleted file mode 100644 index 18145f40ad..0000000000 Binary files a/saves/New World/level.dat_mcr and /dev/null differ diff --git a/saves/New World/level.dat_old b/saves/New World/level.dat_old deleted file mode 100644 index 5c1066d134..0000000000 Binary files a/saves/New World/level.dat_old and /dev/null differ diff --git a/saves/New World/region/r.-1.0.mca b/saves/New World/region/r.-1.0.mca deleted file mode 100644 index 98be9c18aa..0000000000 Binary files a/saves/New World/region/r.-1.0.mca and /dev/null differ diff --git a/saves/New World/region/r.0.0.mca b/saves/New World/region/r.0.0.mca deleted file mode 100644 index 92e6e9c5de..0000000000 Binary files a/saves/New World/region/r.0.0.mca and /dev/null differ diff --git a/saves/New World/session.lock b/saves/New World/session.lock deleted file mode 100644 index 265bc7f667..0000000000 Binary files a/saves/New World/session.lock and /dev/null differ diff --git a/src/main/java/blocks/Block_TFFTCasing.java b/src/main/java/blocks/Block_TFFTCasing.java index f2011a8bae..02f44a9dd7 100644 --- a/src/main/java/blocks/Block_TFFTCasing.java +++ b/src/main/java/blocks/Block_TFFTCasing.java @@ -20,7 +20,7 @@ public class Block_TFFTCasing extends Block { } public void registerBlock() { - final String blockName = "kekztech_tfftcasing_block"; + final String blockName = "kekztech_tfftcasingblock_block"; super.setBlockName(blockName); super.setCreativeTab(CreativeTabs.tabMisc); super.setBlockTextureName(KekzCore.MODID + ":" + "TFFTCasing"); diff --git a/src/main/java/kekztech/KekzCore.java b/src/main/java/kekztech/KekzCore.java index 33ad34d015..94aea7adc2 100644 --- a/src/main/java/kekztech/KekzCore.java +++ b/src/main/java/kekztech/KekzCore.java @@ -32,6 +32,12 @@ import tileentities.GTMTE_SOFuelCellMK2; import tileentities.TE_TFFTMultiHatch; import util.Util; +/** + * My GT-Meta-IDs are: 13101 - 13500 + * + * @author kekzdealer + * + */ @Mod(modid = KekzCore.MODID, name = KekzCore.NAME, version = KekzCore.VERSION, dependencies = "required-after:IC2; " + "required-after:gregtech" @@ -40,13 +46,14 @@ public class KekzCore { public static final String NAME = "KekzTech"; public static final String MODID = "kekztech"; - public static final String VERSION = "0.1a"; + public static final String VERSION = "0.2"; @Mod.Instance("kekztech") public static KekzCore instance; private GTMTE_SOFuelCellMK1 sofc1; private GTMTE_SOFuelCellMK2 sofc2; + @SuppressWarnings("unused") private GTMTE_ModularNuclearReactor mdr; private GTMTE_FluidMultiStorage fms; @@ -72,10 +79,10 @@ public class KekzCore { @Mod.EventHandler public void init(FMLInitializationEvent event ) { // Multiblock controllers - sofc1 = new GTMTE_SOFuelCellMK1(5000, "multimachine.fuelcellmk1", "Solid-Oxide Fuel Cell Mk I"); - sofc2 = new GTMTE_SOFuelCellMK2(5001, "multimachine.fuelcellmk2", "Solid-Oxide Fuel Cell Mk II"); - mdr = new GTMTE_ModularNuclearReactor(5002, "multimachine.nuclearreactor", "Nuclear Reactor"); - fms = new GTMTE_FluidMultiStorage(5003, "multimachine.tf_fluidtank", "T.F.F.T"); + sofc1 = new GTMTE_SOFuelCellMK1(13101, "multimachine.fuelcellmk1", "Solid-Oxide Fuel Cell Mk I"); + sofc2 = new GTMTE_SOFuelCellMK2(13102, "multimachine.fuelcellmk2", "Solid-Oxide Fuel Cell Mk II"); + mdr = new GTMTE_ModularNuclearReactor(13103, "multimachine.nuclearreactor", "Nuclear Reactor"); + fms = new GTMTE_FluidMultiStorage(13104, "multimachine.tf_fluidtank", "T.F.F.T"); } @Mod.EventHandler @@ -109,10 +116,10 @@ public class KekzCore { final Object[] tfft_recipe = { "HFH", "PVP", "CFC", 'H', OrePrefixes.pipeMedium.get(Materials.StainlessSteel), - 'F', ItemList.Field_Generator_LV.get(1L, (Object[]) null), + 'F', ItemList.Field_Generator_MV.get(1L, (Object[]) null), 'P', ItemList.Electric_Pump_HV.get(1L, (Object[]) null), 'V', OrePrefixes.rotor.get(Materials.VibrantAlloy), - 'C', OrePrefixes.circuit.get(Materials.Advanced) + 'C', OrePrefixes.circuit.get(Materials.Data) }; GT_ModHandler.addCraftingRecipe(fms.getStackForm(1), tfft_recipe); @@ -156,10 +163,10 @@ public class KekzCore { 200, 256); final ItemStack[] tfftstoragefield1 = { GT_Utility.getIntegratedCircuit(6), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Basic, 4), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Good, 4), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.PulsatingIron, 1), GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.Steel, 1), - ItemList.Electric_Pump_LV.get(1L, (Object[]) null) + ItemList.Electric_Pump_MV.get(1L, (Object[]) null) }; GT_Values.RA.addAssemblerRecipe( tfftstoragefield1, @@ -168,23 +175,23 @@ public class KekzCore { 200, 256); final ItemStack[] tfftstoragefield2 = { GT_Utility.getIntegratedCircuit(6), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Good, 4), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Advanced, 4), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.PulsatingIron, 4), GT_OreDictUnificator.get(OrePrefixes.pipeHuge, Materials.StainlessSteel, 1), - ItemList.Electric_Pump_MV.get(1L, (Object[]) null) + ItemList.Electric_Pump_HV.get(1L, (Object[]) null) }; GT_Values.RA.addAssemblerRecipe( tfftstoragefield2, - FluidRegistry.getFluidStack("molten.plastic", 144), + FluidRegistry.getFluidStack("molten.plastic", 576), new ItemStack(Block_TFFTStorageFieldBlockT2.getInstance(), 1), 200, 480); final ItemStack[] tfftstoragefield3 = { GT_Utility.getIntegratedCircuit(6), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Advanced, 4), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Data, 4), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.VibrantAlloy, 2), GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Titanium, 1), - ItemList.Field_Generator_LV.get(1L, (Object[]) null), - ItemList.Electric_Pump_HV.get(1L, (Object[]) null) + ItemList.Field_Generator_MV.get(1L, (Object[]) null), + ItemList.Electric_Pump_EV.get(1L, (Object[]) null) }; GT_Values.RA.addAssemblerRecipe( tfftstoragefield3, @@ -197,13 +204,26 @@ public class KekzCore { GT_OreDictUnificator.get(OrePrefixes.plateTriple, Materials.NiobiumTitanium, 1), GT_OreDictUnificator.get(OrePrefixes.pipeHuge, Materials.TungstenSteel, 1), ItemList.Field_Generator_HV.get(1L, (Object[]) null), - ItemList.Electric_Pump_EV.get(1L, (Object[]) null) + ItemList.Electric_Pump_IV.get(1L, (Object[]) null) }; GT_Values.RA.addAssemblerRecipe( tfftstoragefield4, FluidRegistry.getFluidStack("molten.epoxid", 1152), new ItemStack(Block_TFFTStorageFieldBlockT4.getInstance(), 1), 400, 4098); + final ItemStack[] tfftmultihatch = { + GT_Utility.getIntegratedCircuit(6), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Master, 2), + GT_OreDictUnificator.get(OrePrefixes.pipeTiny, Materials.StainlessSteel, 25), + GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.RoseGold, 64), + GT_OreDictUnificator.get(OrePrefixes.spring, Materials.Thorium, 12), + ItemList.Field_Generator_HV.get(1L, (Object[]) null), + }; + GT_Values.RA.addAssemblerRecipe( + tfftmultihatch, + FluidRegistry.getFluidStack("molten.epoxid", 576), + new ItemStack(Block_TFFTMultiHatch.getInstance(), 1), + 6000, 480); // Ceramic plates GT_Values.RA.addAlloySmelterRecipe( diff --git a/src/main/java/kekztech/MultiFluidHandler.java b/src/main/java/kekztech/MultiFluidHandler.java index 2565ede1dc..f131cfbb0d 100644 --- a/src/main/java/kekztech/MultiFluidHandler.java +++ b/src/main/java/kekztech/MultiFluidHandler.java @@ -12,10 +12,14 @@ public class MultiFluidHandler { public static final int MAX_DISTINCT_FLUIDS = 25; private final List fluids = new ArrayList<>(MAX_DISTINCT_FLUIDS); - private final int capacityPerFluid; + private int capacityPerFluid; private boolean locked = true; + public MultiFluidHandler() { + + } + public MultiFluidHandler(int capacityPerFluid) { this.capacityPerFluid = capacityPerFluid; } @@ -52,15 +56,35 @@ public class MultiFluidHandler { ? fluids.get(slot) : null; } - public NBTTagCompound getAsNBTTag(NBTTagCompound nbt) { + public NBTTagCompound saveNBTData(NBTTagCompound nbt) { + System.out.println("Saving a multi hatch!"); nbt = (nbt == null) ? new NBTTagCompound() : nbt; + + nbt.setInteger("capacityPerFluid", getCapacity()); int c = 0; for(FluidStack f : fluids) { nbt.setTag("" + c, f.writeToNBT(new NBTTagCompound())); + c++; } return nbt; } + public void loadNBTData(NBTTagCompound nbt) { + nbt = (nbt == null) ? new NBTTagCompound() : nbt; + + capacityPerFluid = nbt.getInteger("capacityPerFluid"); + + fluids.clear(); + final NBTTagCompound fluidsTag = (NBTTagCompound) nbt.getTag("fluids"); + for(int i = 0; i < MultiFluidHandler.MAX_DISTINCT_FLUIDS; i++) { + final NBTTagCompound fnbt = (NBTTagCompound) fluidsTag.getTag("" + i); + if(fnbt == null) { + break; + } + fluids.add(FluidStack.loadFluidStackFromNBT(fnbt)); + } + } + public ArrayList getInfoData() { final ArrayList lines = new ArrayList<>(fluids.size()); lines.add(EnumChatFormatting.YELLOW + "Stored Fluids:" + EnumChatFormatting.RESET); diff --git a/src/main/java/tileentities/GTMTE_FluidMultiStorage.java b/src/main/java/tileentities/GTMTE_FluidMultiStorage.java index 051f27047d..ce155c48e6 100644 --- a/src/main/java/tileentities/GTMTE_FluidMultiStorage.java +++ b/src/main/java/tileentities/GTMTE_FluidMultiStorage.java @@ -143,7 +143,6 @@ public class GTMTE_FluidMultiStorage extends GT_MetaTileEntity_MultiBlockBase { } } - // TODO output seems to ignore circuit // Push out fluids if(guiSlotItem != null && guiSlotItem.getUnlocalizedName().equals("gt.integrated_circuit")) { final int config = guiSlotItem.getItemDamage(); @@ -251,157 +250,119 @@ public class GTMTE_FluidMultiStorage extends GT_MetaTileEntity_MultiBlockBase { */ @Override public boolean checkMachine(IGregTechTileEntity thisController, ItemStack guiSlotItem) { - try { - // Figure out the vector for the direction the back face of the controller is facing - final Vector3ic forgeDirection = new Vector3i( - ForgeDirection.getOrientation(thisController.getBackFacing()).offsetX, - ForgeDirection.getOrientation(thisController.getBackFacing()).offsetY, - ForgeDirection.getOrientation(thisController.getBackFacing()).offsetZ - ); - int minCasingAmount = 20; - boolean formationChecklist = true; // if this is still true at the end, machine is good to go :) - float runningCostAcc = 0; - double fluidCapacityAcc = 0; + // Figure out the vector for the direction the back face of the controller is facing + final Vector3ic forgeDirection = new Vector3i( + ForgeDirection.getOrientation(thisController.getBackFacing()).offsetX, + ForgeDirection.getOrientation(thisController.getBackFacing()).offsetY, + ForgeDirection.getOrientation(thisController.getBackFacing()).offsetZ + ); + int minCasingAmount = 20; + boolean formationChecklist = true; // if this is still true at the end, machine is good to go :) + float runningCostAcc = 0; + double fluidCapacityAcc = 0; + + multiHatches.clear(); + + // Front slice + for(int X = -2; X <= 2; X++) { + for(int Y = -2; Y <= 2; Y++) { + if(X == 0 && Y == 0) { + continue; // is controller + } - // Front slice - for(int X = -2; X <= 2; X++) { - for(int Y = -2; Y <= 2; Y++) { - if(X == 0 && Y == 0) { - continue; // is controller - } - - // Get next TE - final Vector3ic offset = rotateOffsetVector(forgeDirection, X, Y, 0); - IGregTechTileEntity currentTE = - thisController.getIGregTechTileEntityOffset(offset.x(), offset.y(), offset.z()); - - // Fluid hatches should touch the storage field. - // Maintenance/Energy hatch can go anywhere - if(X > -2 && X < 2 && Y > -2 && Y < 2) { - if (!super.addMaintenanceToMachineList(currentTE, CASING_TEXTURE_ID) - && !super.addInputToMachineList(currentTE, CASING_TEXTURE_ID) - && !super.addOutputToMachineList(currentTE, CASING_TEXTURE_ID) - && !super.addEnergyInputToMachineList(currentTE, CASING_TEXTURE_ID)) { - - // If it's not a hatch, is it the right casing for this machine? Check block and block meta. - // Also check for multi hatch - if (thisController.getBlockOffset(offset.x(), offset.y(), offset.z()) == CASING) { - // Seems to be valid casing. Decrement counter. - minCasingAmount--; - } else if(thisController.getBlockOffset(offset.x(), offset.y(), offset.z()) == MULTI_HATCH) { - final TE_TFFTMultiHatch mh = - (TE_TFFTMultiHatch) thisController.getWorld().getTileEntity( - thisController.getXCoord() + offset.x(), - thisController.getYCoord() + offset.y(), - thisController.getZCoord() + offset.z()); - multiHatches.add(mh); - } - else { - formationChecklist = false; - } + // Get next TE + final Vector3ic offset = rotateOffsetVector(forgeDirection, X, Y, 0); + IGregTechTileEntity currentTE = + thisController.getIGregTechTileEntityOffset(offset.x(), offset.y(), offset.z()); + + // Fluid hatches should touch the storage field. + // Maintenance/Energy hatch can go anywhere + if(X > -2 && X < 2 && Y > -2 && Y < 2) { + if (!super.addMaintenanceToMachineList(currentTE, CASING_TEXTURE_ID) + && !super.addInputToMachineList(currentTE, CASING_TEXTURE_ID) + && !super.addOutputToMachineList(currentTE, CASING_TEXTURE_ID) + && !super.addEnergyInputToMachineList(currentTE, CASING_TEXTURE_ID)) { + + // If it's not a hatch, is it the right casing for this machine? Check block and block meta. + // Also check for multi hatch + if (thisController.getBlockOffset(offset.x(), offset.y(), offset.z()) == CASING) { + // Seems to be valid casing. Decrement counter. + minCasingAmount--; + } else if(thisController.getBlockOffset(offset.x(), offset.y(), offset.z()) == MULTI_HATCH) { + final TE_TFFTMultiHatch mh = + (TE_TFFTMultiHatch) thisController.getWorld().getTileEntity( + thisController.getXCoord() + offset.x(), + thisController.getYCoord() + offset.y(), + thisController.getZCoord() + offset.z()); + multiHatches.add(mh); } - } else { - if (!super.addMaintenanceToMachineList(currentTE, CASING_TEXTURE_ID) - && !super.addEnergyInputToMachineList(currentTE, CASING_TEXTURE_ID)) { - - // If it's not a hatch, is it the right casing for this machine? Check block and block meta. - if (thisController.getBlockOffset(offset.x(), offset.y(), offset.z()) == CASING) { - // Seems to be valid casing. Decrement counter. - minCasingAmount--; - } else { - formationChecklist = false; - } + else { + formationChecklist = false; } } - } - } - - // Middle three slices - for(int X = -2; X <= 2; X++) { - for(int Y = -2; Y <= 2; Y++) { - for(int Z = -1; Z >= -7; Z--) { - final Vector3ic offset = rotateOffsetVector(forgeDirection, X, Y, Z); - if(X > -2 && X < 2 && Y > -2 && Y < 2) { - if(thisController.getBlockOffset(offset.x(), offset.y(), offset.z()).getUnlocalizedName() - .equals(STORAGE_FIELD1.getUnlocalizedName())) { - runningCostAcc += 0.5f; - fluidCapacityAcc += 500000.0f; - } else if(thisController.getBlockOffset(offset.x(), offset.y(), offset.z()).getUnlocalizedName() - .equals(STORAGE_FIELD2.getUnlocalizedName())) { - runningCostAcc += 1.0f; - fluidCapacityAcc += 4000000.0f; - } else if(thisController.getBlockOffset(offset.x(), offset.y(), offset.z()).getUnlocalizedName() - .equals(STORAGE_FIELD3.getUnlocalizedName())) { - runningCostAcc += 2.0f; - fluidCapacityAcc += 16000000.0f; - } else if(thisController.getBlockOffset(offset.x(), offset.y(), offset.z()).getUnlocalizedName() - .equals(STORAGE_FIELD4.getUnlocalizedName())) { - runningCostAcc += 4.0f; - fluidCapacityAcc += 64000000.0f; - } else { - formationChecklist = false; - } - continue; - } - - // Get next TE - IGregTechTileEntity currentTE = - thisController.getIGregTechTileEntityOffset(offset.x(), offset.y(), offset