From 820ca984d2dea005a126ef585661503f8cc992f5 Mon Sep 17 00:00:00 2001 From: kekzdealer Date: Wed, 9 Oct 2019 02:43:07 +0200 Subject: improved T.F.F.T code; Prepared for MultiHatch --- .classpath | 5 +- .directory | 6 + .gitignore | 58 +- .gradle/2.0/taskArtifacts/cache.properties | 2 +- .project | 34 +- LICENSE | 42 +- README.md | 6 +- config/CodeChickenLib.cfg | 2 +- config/GregTech/WorldGeneration.cfg | 20 + config/IC2.ini | 336 +++---- config/Ztones.cfg | 58 ++ config/devtips.cfg | 52 +- config/forge.cfg | 114 +-- config/forgeChunkLoading.cfg | 94 +- config/splash.properties | 2 +- gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 51017 bytes gradlew.bat | 180 ++-- libs/CodeChickenCore-1.7.10-1.0.7.47-dev.jar | Bin 0 -> 143543 bytes libs/CodeChickenLib-1.7.10-1.1.3.140-dev.jar | Bin 0 -> 310211 bytes libs/NotEnoughItems-1.7.10-1.0.5.120-dev.jar | Bin 0 -> 506974 bytes libs/Ztones-1.7.10-2.2.2-deobf.jar | Bin 0 -> 557656 bytes libs/gregtech-5.09.32-dev.jar | Bin 0 -> 17028484 bytes ...dustrialcraft-2-2.2.828a-experimental-deobf.jar | Bin 0 -> 5495479 bytes libs/joml-1.9.18.jar | Bin 0 -> 678796 bytes logs/2019-07-04-1.log.gz | Bin 1579 -> 2959 bytes logs/2019-07-04-2.log.gz | Bin 2992 -> 2983 bytes logs/2019-07-04-3.log.gz | Bin 2959 -> 2342 bytes logs/2019-07-04-4.log.gz | Bin 0 -> 1871 bytes logs/2019-07-04-5.log.gz | Bin 0 -> 777 bytes logs/2019-07-04-6.log.gz | Bin 0 -> 690 bytes logs/2019-07-04-7.log.gz | Bin 0 -> 774 bytes logs/2019-07-25-1.log.gz | Bin 0 -> 2108 bytes logs/2019-07-30-1.log.gz | Bin 0 -> 1629 bytes logs/2019-07-30-2.log.gz | Bin 0 -> 890 bytes logs/2019-10-02-1.log.gz | Bin 0 -> 764 bytes logs/2019-10-08-1.log.gz | Bin 0 -> 669 bytes logs/2019-10-08-2.log.gz | Bin 0 -> 669 bytes logs/2019-10-08-3.log.gz | Bin 0 -> 684 bytes logs/2019-10-08-4.log.gz | Bin 0 -> 719 bytes logs/2019-10-08-5.log.gz | Bin 0 -> 681 bytes logs/2019-10-08-6.log.gz | Bin 0 -> 684 bytes logs/2019-10-08-7.log.gz | Bin 0 -> 985 bytes logs/2019-10-09-1.log.gz | Bin 0 -> 2256 bytes .../CodeChickenLib-1.7.10-1.1.3.140-universal.jar | Bin 0 -> 314810 bytes mods/devtips-1.1.jar | Bin 0 -> 7584 bytes mods/ic2/EJML-core-0.26.jar | Bin 0 -> 341614 bytes options.txt | 20 +- saves/NEI/local/New World/NEI.cfg | 5 +- saves/NEI/local/New World/NEI.dat | Bin 87 -> 78 bytes saves/New World/DIM-1/data/villages.dat | Bin 56 -> 56 bytes saves/New World/DIM1/data/villages.dat | Bin 56 -> 56 bytes .../New World/NEI/players/kekzdealer@gmail.com.dat | 0 saves/New World/data/Mineshaft.dat | Bin 3904 -> 0 bytes saves/New World/data/Stronghold.dat | Bin 2663 -> 0 bytes saves/New World/data/villages.dat | Bin 56 -> 56 bytes saves/New World/level.dat | Bin 14761 -> 14603 bytes saves/New World/level.dat_mcr | Bin 13631 -> 13883 bytes saves/New World/level.dat_old | Bin 14762 -> 14601 bytes .../ddc68fe4-0789-360b-a837-3dcbb936da65.dat | Bin 875 -> 0 bytes .../fd8b4f31-35bd-474b-8add-e80df8a4a95f.dat | Bin 663 -> 0 bytes saves/New World/region/r.-1.0.mca | Bin 24576 -> 655360 bytes saves/New World/region/r.0.-1.mca | Bin 1708032 -> 0 bytes saves/New World/region/r.0.0.mca | Bin 2461696 -> 69632 bytes saves/New World/session.lock | Bin 8 -> 8 bytes .../ddc68fe4-0789-360b-a837-3dcbb936da65.json | 1 - .../fd8b4f31-35bd-474b-8add-e80df8a4a95f.json | 1 - src/main/java/blocks/Block_GDCUnit.java | 60 +- src/main/java/blocks/Block_TFFTCasing.java | 60 +- .../java/blocks/Block_TFFTStorageFieldBlockT1.java | 64 +- .../java/blocks/Block_TFFTStorageFieldBlockT2.java | 60 +- .../java/blocks/Block_TFFTStorageFieldBlockT3.java | 60 +- .../java/blocks/Block_TFFTStorageFieldBlockT4.java | 60 +- src/main/java/blocks/Block_YSZUnit.java | 60 +- .../container/Container_ModularNuclearReactor.java | 140 +-- .../GUIContainer_ModularNuclearReactor.java | 106 +- src/main/java/items/ErrorItem.java | 93 +- .../java/items/MetaItem_CraftingComponent.java | 206 ++-- src/main/java/items/MetaItem_ReactorComponent.java | 280 +++--- src/main/java/kekztech/GTMultiController.java | 610 ++++++------ src/main/java/kekztech/GTRecipe.java | 208 ++-- src/main/java/kekztech/Items.java | 96 +- src/main/java/kekztech/KekzCore.java | 688 +++++++------ src/main/java/kekztech/MultiFluidHandler.java | 138 +++ src/main/java/reactor/ButtonSlot.java | 28 +- src/main/java/reactor/items/CoolantCell.java | 52 +- src/main/java/reactor/items/FuelRod.java | 228 ++--- src/main/java/reactor/items/HeatExchanger.java | 120 +-- src/main/java/reactor/items/HeatVent.java | 100 +- src/main/java/reactor/items/NeutronReflector.java | 52 +- .../java/tileentities/GTMTE_FluidMultiStorage.java | 1021 ++++++++++---------- .../tileentities/GTMTE_ModularNuclearReactor.java | 380 ++++---- .../java/tileentities/GTMTE_SOFuelCellMK1.java | 656 ++++++------- .../java/tileentities/GTMTE_SOFuelCellMK2.java | 656 ++++++------- src/main/java/tileentities/TFFTMultiHatch.java | 138 +++ src/main/java/util/Util.java | 102 +- src/main/java/util/Vector3i.java | 64 +- src/main/java/util/Vector3ic.java | 16 +- src/main/resources/assets/kekztech/lang/en_US.lang | 166 ++-- .../textures/blocks/TFFTStorageFieldBlock1.png | Bin 1036 -> 1332 bytes .../textures/blocks/TFFTStorageFieldBlock2.png | Bin 1037 -> 1334 bytes .../textures/blocks/TFFTStorageFieldBlock3.png | Bin 1038 -> 1334 bytes .../textures/blocks/TFFTStorageFieldBlock4.png | Bin 1340 -> 1669 bytes .../assets/kekztech/textures/items/DemonCore.png | Bin 0 -> 1927 bytes .../textures/items/PlutoniumGalliumDust.png | Bin 0 -> 253 bytes .../kekztech/textures/items/RawDemonCore.png | Bin 0 -> 776 bytes .../kekztech/textures/items/uraniumFuelRod.png | Bin 441 -> 0 bytes usernamecache.json | 3 +- 107 files changed, 4075 insertions(+), 3734 deletions(-) create mode 100644 .directory create mode 100644 config/Ztones.cfg create mode 100644 gradle/wrapper/gradle-wrapper.jar create mode 100644 libs/CodeChickenCore-1.7.10-1.0.7.47-dev.jar create mode 100644 libs/CodeChickenLib-1.7.10-1.1.3.140-dev.jar create mode 100644 libs/NotEnoughItems-1.7.10-1.0.5.120-dev.jar create mode 100644 libs/Ztones-1.7.10-2.2.2-deobf.jar create mode 100644 libs/gregtech-5.09.32-dev.jar create mode 100644 libs/industrialcraft-2-2.2.828a-experimental-deobf.jar create mode 100644 libs/joml-1.9.18.jar create mode 100644 logs/2019-07-04-4.log.gz create mode 100644 logs/2019-07-04-5.log.gz create mode 100644 logs/2019-07-04-6.log.gz create mode 100644 logs/2019-07-04-7.log.gz create mode 100644 logs/2019-07-25-1.log.gz create mode 100644 logs/2019-07-30-1.log.gz create mode 100644 logs/2019-07-30-2.log.gz create mode 100644 logs/2019-10-02-1.log.gz create mode 100644 logs/2019-10-08-1.log.gz create mode 100644 logs/2019-10-08-2.log.gz create mode 100644 logs/2019-10-08-3.log.gz create mode 100644 logs/2019-10-08-4.log.gz create mode 100644 logs/2019-10-08-5.log.gz create mode 100644 logs/2019-10-08-6.log.gz create mode 100644 logs/2019-10-08-7.log.gz create mode 100644 logs/2019-10-09-1.log.gz create mode 100644 mods/1.7.10/CodeChickenLib-1.7.10-1.1.3.140-universal.jar create mode 100644 mods/devtips-1.1.jar create mode 100644 mods/ic2/EJML-core-0.26.jar delete mode 100644 saves/New World/NEI/players/kekzdealer@gmail.com.dat delete mode 100644 saves/New World/data/Mineshaft.dat delete mode 100644 saves/New World/data/Stronghold.dat delete mode 100644 saves/New World/playerdata/ddc68fe4-0789-360b-a837-3dcbb936da65.dat delete mode 100644 saves/New World/playerdata/fd8b4f31-35bd-474b-8add-e80df8a4a95f.dat delete mode 100644 saves/New World/region/r.0.-1.mca delete mode 100644 saves/New World/stats/ddc68fe4-0789-360b-a837-3dcbb936da65.json delete mode 100644 saves/New World/stats/fd8b4f31-35bd-474b-8add-e80df8a4a95f.json create mode 100644 src/main/java/kekztech/MultiFluidHandler.java create mode 100644 src/main/java/tileentities/TFFTMultiHatch.java create mode 100644 src/main/resources/assets/kekztech/textures/items/DemonCore.png create mode 100644 src/main/resources/assets/kekztech/textures/items/PlutoniumGalliumDust.png create mode 100644 src/main/resources/assets/kekztech/textures/items/RawDemonCore.png delete mode 100644 src/main/resources/assets/kekztech/textures/items/uraniumFuelRod.png diff --git a/.classpath b/.classpath index 956388a675..93ee7b3fb3 100644 --- a/.classpath +++ b/.classpath @@ -3,11 +3,12 @@ - - + + + diff --git a/.directory b/.directory new file mode 100644 index 0000000000..5edbbd9d93 --- /dev/null +++ b/.directory @@ -0,0 +1,6 @@ +[Dolphin] +Timestamp=2019,10,7,18,33,15 +Version=4 + +[Settings] +HiddenFilesShown=true diff --git a/.gitignore b/.gitignore index 25baf5c841..09ea9d44f3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,29 +1,29 @@ -# Compiled class file -*.class - -# Log file -*.log - -# BlueJ files -*.ctxt - -# Mobile Tools for Java (J2ME) -.mtj.tmp/ - -# Package Files # -*.jar -*.war -*.nar -*.ear -*.zip -*.tar.gz -*.rar - -# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml -hs_err_pid* -/bin/ -/build/ -/crash-reports/ -/saves/ -/screenshots/ - +# Compiled class file +*.class + +# Log file +*.log + +# BlueJ files +*.ctxt + +# Mobile Tools for Java (J2ME) +.mtj.tmp/ + +# Package Files # +#*.jar +*.war +*.nar +*.ear +*.zip +*.tar.gz +*.rar + +# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml +hs_err_pid* +/bin/ +/build/ +/crash-reports/ +/saves/ +/screenshots/ + diff --git a/.gradle/2.0/taskArtifacts/cache.properties b/.gradle/2.0/taskArtifacts/cache.properties index 0a27f00048..68737acfa2 100644 --- a/.gradle/2.0/taskArtifacts/cache.properties +++ b/.gradle/2.0/taskArtifacts/cache.properties @@ -1 +1 @@ -#Sun Jun 09 22:52:57 CEST 2019 +#Sun Jun 09 22:52:57 CEST 2019 diff --git a/.project b/.project index 98eb3f4ded..b83d47ff64 100644 --- a/.project +++ b/.project @@ -1,17 +1,17 @@ - - - kekztech - - - - - - org.eclipse.jdt.core.javabuilder - - - - - - org.eclipse.jdt.core.javanature - - + + + kekztech + + + + + + org.eclipse.jdt.core.javabuilder + + + + + + org.eclipse.jdt.core.javanature + + diff --git a/LICENSE b/LICENSE index 8b23445f4a..cbd9e607af 100644 --- a/LICENSE +++ b/LICENSE @@ -1,21 +1,21 @@ -MIT License - -Copyright (c) 2019 - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. +MIT License + +Copyright (c) 2019 + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/README.md b/README.md index ef85099a4a..da244a66c2 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,3 @@ -# KekzTech -A Minecraft mod for the 1.7.10 modpack GTNH. -No compatibility outside GTNH guaranteed. +# KekzTech +A Minecraft mod for the 1.7.10 modpack GTNH. +No compatibility outside GTNH guaranteed. diff --git a/config/CodeChickenLib.cfg b/config/CodeChickenLib.cfg index 94d4c170a5..947513c59e 100644 --- a/config/CodeChickenLib.cfg +++ b/config/CodeChickenLib.cfg @@ -3,6 +3,6 @@ dump_asm=true #Path to directory holding packaged.srg, fields.csv and methods.csv for mcp remapping -mappingDir=C:\Users\Kekzdealer\.gradle\caches\minecraft\net\minecraftforge\forge\1.7.10-10.13.4.1614-1.7.10\unpacked\conf +mappingDir=/home/kekzdealer/.gradle/caches/minecraft/net/minecraftforge/forge/1.7.10-10.13.4.1614-1.7.10/unpacked/conf textify=true diff --git a/config/GregTech/WorldGeneration.cfg b/config/GregTech/WorldGeneration.cfg index 9f8d5e493a..37781d6de8 100644 --- a/config/GregTech/WorldGeneration.cfg +++ b/config/GregTech/WorldGeneration.cfg @@ -2331,6 +2331,26 @@ worldgen { B:Overworld_true=true } + diamond { + B:Overworld_true=true + } + + naquadah { + B:Overworld_false=false + } + + coal { + B:Overworld_true=true + } + + uranium { + B:Overworld_true=true + } + + soapstone { + B:Overworld_true=true + } + } small { diff --git a/config/IC2.ini b/config/IC2.ini index c526d786f2..e90cb15b5d 100644 --- a/config/IC2.ini +++ b/config/IC2.ini @@ -1,168 +1,168 @@ -; ic2 general config -; created Jul 4, 2019 5:21:42 PM -;--- - -[worldgen] -; Enable generation of rubber trees in the world. -rubberTree = true -; Enable generation of copper in the world. -copperOre = true -; Enable generation of tin in the world. -tinOre = true -; Enable generation of uranium in the world. -uraniumOre = true -; Enable generation of Lead in the world. -leadOre = true -; Factor scaling the IC2 ore generation quantity. -oreDensityFactor = 1.0 - -[protection] -; Enable logging of players when they remove a machine using a wrench. -wrenchLogging = true -; Maximum Explosion power of a nuke, where TNT is 4. -nukeExplosionPowerLimit = 60 -; Maximum explosion power of a nuclear reactor, where TNT is 4. -reactorExplosionPowerLimit = 45 -; Enable the nuke -enableNuke = true - -[balance] -; Maximum battery tier usable by the miner. -; 1 = batteries, 2 = lead batteries, 3 = energy crystals, 4 = lapotron crystals -minerDischargeTier = 1 -; Increase the energy use by the player's inventory weight when going through a teleporter. -teleporterUseInventoryWeight = true -; Ratio of energy retained inside energy storage block Items when wrenched. -; 0 (nothing) ... 1 (100%), default 0.8 (80 %) -energyRetainedInStorageBlockDrops = 0.8 -; Factor to scale the UU-Matter production energy requirement. -uuEnergyFactor = 1.0 -; Disable the vanilla ender chest, removing existing ones from the world as well. -disableEnderChest = false -; Comma separated list of blocks and items which should not be turned into scrap by the recycler. -; Format: [@metadata], metadata * matches any. -; Ore dictionary entries can be specified with OreDict: as the name. -recyclerBlacklist = minecraft:glass_pane, minecraft:stick, minecraft:snowball, minecraft:snow_layer, minecraft:snow, IC2:blockScaffold -; Whitelist for blocks/items allowed to be recycled. -; The whitelist will be used instead of the blacklist approach if it's non-empty, disallowing everything else. -; The format is the same as the blacklist. -recyclerWhitelist = -; Allow to pick blocks up using just a pickaxe instead of needing a wrench. -ignoreWrenchRequirement = false - -; Base energy generation factors - increase for higher energy yield. -[balance / energy / generator] -generator = 1.0 -geothermal = 1.0 -; Deprecated, because of Kinetic Watermill -water = 1.0 -solar = 1.0 -; Deprecated, because of Kinetic Windmill -wind = 1.0 -nuclear = 1.0 -semiFluidOil = 1.0 -semiFluidFuel = 1.0 -semiFluidBiomass = 1.0 -semiFluidBioethanol = 1.0 -semiFluidBiogas = 1.0 -Stirling = 1.0 -Kinetic = 1.0 -radioisotope = 1.0 - -; Base heat generation factors - increase for higher heat yield. -[balance / energy / heatgenerator] -semiFluidOil = 1.0 -semiFluidFuel = 1.0 -semiFluidBiomass = 1.0 -semiFluidBioethanol = 1.0 -semiFluidBiogas = 1.0 -solid = 1.0 -radioisotope = 1.0 -electric = 1.0 - -; Base kinetic generation factors - increase for higher kinetic energy yield. -[balance / energy / kineticgenerator] -water = 1.0 -wind = 1.0 -manual = 1.0 -steam = 1.0 -electric = 1.0 - -; Basically the amount of hU the conversion of one mB of Liquid takes/gives -[balance / energy / fluidconversion] -; Lava -> PahoehoeLava -heatExchangerLava = 1.0 -; Hot Coolant <-> Cold Coolant -heatExchangerHotCoolant = 1.0 -; Hot Water <- Water -heatExchangerWater = 1.0 - -; Base Coolant conversion rate for FluidReactors. -[balance / energy / FluidReactor] -outputModifier = 1.0 - -; Balace Value for Turbine Livetime in sec. Default 86400sec = 24h -[balance / SteamKineticGenerator] -rotorlivetime = 86400 - -; Balace Values for calcification default 100.000mB Water -> to failure -[balance / steamgenerator / calcification] -maxcalcification = 100000 - -; Balance Values for Fermenter -[balance / fermenter] -need_amount_biomass_per_run = 10 -output_amount_biogas_per_run = 200 -hU_per_run = 8000 -biomass_per_fertilizier = 500 - -; Additional initial uu values, a value of 1 equals cobblestone. -; Recipes may cause the final value be lower than the one specified here. -; Format: [@metadata] = -[balance / uu-values / predefined] -IC2:itemOreIridium = 12000 - -[recipes] -; To modify recipes or add custom recipes, copy the corresponding .ini file to -; "minecraft/config/ic2" and modify it. -; -; Disable IC2 crafting recipes with the specified output, comma separated list. -; Recipes in the additional section below aren't affected. -; Format: [@metadata], e.g. minecraft:bucket to disable IC2's bucket recipe from tin. -disable = -; Purge crafting recipes with the specified output, including vanilla and mod ones, comma separated list. -; Recipes in the additional section below aren't affected. -; Format: [@metadata], e.g. minecraft:tnt to disable crafting tnt. -purge = -; Enable crafting of IC2 coins, otherwise they have to be spawned in and are thus limited. -allowCoinCrafting = true -; Allow only IC2 circuits to be used in IC2's recipes. -requireIc2Circuits = false -; Adjust smelting recipes to always output IC2 items if available. -smeltToIc2Items = false -; Ignore invalid recipes. -ignoreInvalidRecipes = false - -[misc] -; Enable IC2's custom sound system. -enableIc2Audio = true -; Maximum number of active audio sources, only change it if you know what you're doing. -maxAudioSourceCount = 32 -; Enable hiding of secret recipes in CraftGuide/NEI. -hideSecretRecipes = true -; Enable activation of the quantum leggings' speed boost when sprinting instead of holding the boost key. -quantumSpeedOnSprint = true -; Enable burning of scrap in a generator. -allowBurningScrap = true -; Comma separated list with ores the miner should harvest. -; Format: [@metadata], e.g. minecraft:torch, minecraft:chest -; The metadata * will match any, e.g. minecraft:log@*. -; Ore dictionary entries can be specified with OreDict: as the name. -additionalValuableOres = -; Use the new highly experimental current + voltage energy net model with energy loss. -; Only set this to true if you know what you are doing. -useLinearTransferModel = false -; Potion ID of radiation potion. -; Do not change this after you created a world... -radiationPotionID = 24 - +; ic2 general config +; created Oct 9, 2019 2:31:48 AM +;--- + +[worldgen] +; Enable generation of rubber trees in the world. +rubberTree = true +; Enable generation of copper in the world. +copperOre = true +; Enable generation of tin in the world. +tinOre = true +; Enable generation of uranium in the world. +uraniumOre = true +; Enable generation of Lead in the world. +leadOre = true +; Factor scaling the IC2 ore generation quantity. +oreDensityFactor = 1.0 + +[protection] +; Enable logging of players when they remove a machine using a wrench. +wrenchLogging = true +; Maximum Explosion power of a nuke, where TNT is 4. +nukeExplosionPowerLimit = 60 +; Maximum explosion power of a nuclear reactor, where TNT is 4. +reactorExplosionPowerLimit = 45 +; Enable the nuke +enableNuke = true + +[balance] +; Maximum battery tier usable by the miner. +; 1 = batteries, 2 = lead batteries, 3 = energy crystals, 4 = lapotron crystals +minerDischargeTier = 1 +; Increase the energy use by the player's inventory weight when going through a teleporter. +teleporterUseInventoryWeight = true +; Ratio of energy retained inside energy storage block Items when wrenched. +; 0 (nothing) ... 1 (100%), default 0.8 (80 %) +energyRetainedInStorageBlockDrops = 0.8 +; Factor to scale the UU-Matter production energy requirement. +uuEnergyFactor = 1.0 +; Disable the vanilla ender chest, removing existing ones from the world as well. +disableEnderChest = false +; Comma separated list of blocks and items which should not be turned into scrap by the recycler. +; Format: [@metadata], metadata * matches any. +; Ore dictionary entries can be specified with OreDict: as the name. +recyclerBlacklist = minecraft:glass_pane, minecraft:stick, minecraft:snowball, minecraft:snow_layer, minecraft:snow, IC2:blockScaffold +; Whitelist for blocks/items allowed to be recycled. +; The whitelist will be used instead of the blacklist approach if it's non-empty, disallowing everything else. +; The format is the same as the blacklist. +recyclerWhitelist = +; Allow to pick blocks up using just a pickaxe instead of needing a wrench. +ignoreWrenchRequirement = false + +; Base energy generation factors - increase for higher energy yield. +[balance / energy / generator] +generator = 1.0 +geothermal = 1.0 +; Deprecated, because of Kinetic Watermill +water = 1.0 +solar = 1.0 +; Deprecated, because of Kinetic Windmill +wind = 1.0 +nuclear = 1.0 +semiFluidOil = 1.0 +semiFluidFuel = 1.0 +semiFluidBiomass = 1.0 +semiFluidBioethanol = 1.0 +semiFluidBiogas = 1.0 +Stirling = 1.0 +Kinetic = 1.0 +radioisotope = 1.0 + +; Base heat generation factors - increase for higher heat yield. +[balance / energy / heatgenerator] +semiFluidOil = 1.0 +semiFluidFuel = 1.0 +semiFluidBiomass = 1.0 +semiFluidBioethanol = 1.0 +semiFluidBiogas = 1.0 +solid = 1.0 +radioisotope = 1.0 +electric = 1.0 + +; Base kinetic generation factors - increase for higher kinetic energy yield. +[balance / energy / kineticgenerator] +water = 1.0 +wind = 1.0 +manual = 1.0 +steam = 1.0 +electric = 1.0 + +; Basically the amount of hU the conversion of one mB of Liquid takes/gives +[balance / energy / fluidconversion] +; Lava -> PahoehoeLava +heatExchangerLava = 1.0 +; Hot Coolant <-> Cold Coolant +heatExchangerHotCoolant = 1.0 +; Hot Water <- Water +heatExchangerWater = 1.0 + +; Base Coolant conversion rate for FluidReactors. +[balance / energy / FluidReactor] +outputModifier = 1.0 + +; Balace Value for Turbine Livetime in sec. Default 86400sec = 24h +[balance / SteamKineticGenerator] +rotorlivetime = 86400 + +; Balace Values for calcification default 100.000mB Water -> to failure +[balance / steamgenerator / calcification] +maxcalcification = 100000 + +; Balance Values for Fermenter +[balance / fermenter] +need_amount_biomass_per_run = 10 +output_amount_biogas_per_run = 200 +hU_per_run = 8000 +biomass_per_fertilizier = 500 + +; Additional initial uu values, a value of 1 equals cobblestone. +; Recipes may cause the final value be lower than the one specified here. +; Format: [@metadata] = +[balance / uu-values / predefined] +IC2:itemOreIridium = 12000 + +[recipes] +; To modify recipes or add custom recipes, copy the corresponding .ini file to +; "minecraft/config/ic2" and modify it. +; +; Disable IC2 crafting recipes with the specified output, comma separated list. +; Recipes in the additional section below aren't affected. +; Format: [@metadata], e.g. minecraft:bucket to disable IC2's bucket recipe from tin. +disable = +; Purge crafting recipes with the specified output, including vanilla and mod ones, comma separated list. +; Recipes in the additional section below aren't affected. +; Format: [@metadata], e.g. minecraft:tnt to disable crafting tnt. +purge = +; Enable crafting of IC2 coins, otherwise they have to be spawned in and are thus limited. +allowCoinCrafting = true +; Allow only IC2 circuits to be used in IC2's recipes. +requireIc2Circuits = false +; Adjust smelting recipes to always output IC2 items if available. +smeltToIc2Items = false +; Ignore invalid recipes. +ignoreInvalidRecipes = false + +[misc] +; Enable IC2's custom sound system. +enableIc2Audio = true +; Maximum number of active audio sources, only change it if you know what you're doing. +maxAudioSourceCount = 32 +; Enable hiding of secret recipes in CraftGuide/NEI. +hideSecretRecipes = true +; Enable activation of the quantum leggings' speed boost when sprinting instead of holding the boost key. +quantumSpeedOnSprint = true +; Enable burning of scrap in a generator. +allowBurningScrap = true +; Comma separated list with ores the miner should harvest. +; Format: [@metadata], e.g. minecraft:torch, minecraft:chest +; The metadata * will match any, e.g. minecraft:log@*. +; Ore dictionary entries can be specified with OreDict: as the name. +additionalValuableOres = +; Use the new highly experimental current + voltage energy net model with energy loss. +; Only set this to true if you know what you are doing. +useLinearTransferModel = false +; Potion ID of radiation potion. +; Do not change this after you created a world... +radiationPotionID = 24 + diff --git a/config/Ztones.cfg b/config/Ztones.cfg new file mode 100644 index 0000000000..b3d51e2cf4 --- /dev/null +++ b/config/Ztones.cfg @@ -0,0 +1,58 @@ +# Configuration file + +blocks { + B:enableAgon=true + B:enableAzur=true + B:enableBitt=true + B:enableCray=true + B:enableFort=true + B:enableGlac=true + B:enableIszm=true + B:enableJelt=true + B:enableKorp=true + B:enableKryp=true + B:enableLair=true + B:enableLave=true + B:enableMint=true + B:enableMyst=true + B:enableReds=true + B:enableReed=true + B:enableRoen=true + B:enableSols=true + B:enableSync=true + B:enableTank=true + B:enableTest=false + B:enableVect=true + B:enableVena=true + B:enableZane=true + B:enableZech=true + B:enableZest=true + B:enableZeta=true + B:enableZion=true + B:enableZkul=true + B:enableZoea=true + B:enableZome=true + B:enableZone=true + B:enableZorg=true + B:enableZyth=true +} + + +items { + B:" Mini Charcoal"=true + B:"Diamond Zane"=true + B:"MSG Pill"=true + B:"Mini Coal"=true + B:Ofanix=true + B:"Splat Axe"=true + B:"Terrain Eater"=true + B:"Totem Tool"=true +} + + +tweaks { + # Enables dungeon chest loot [default: true] + B:enableChestGen=true +} + + diff --git a/config/devtips.cfg b/config/devtips.cfg index 8a2453363f..7a42a20e8f 100644 --- a/config/devtips.cfg +++ b/config/devtips.cfg @@ -1,26 +1,26 @@ -# Configuration file - -general { - # If set to false, tooltips will be shown without pressing Ctrl. [default: true] - B:requiresCtrl=true - - # If set to false, tooltips will be shown without going into Advanced Info mode (F3 + H). [default: true] - B:"requiresF3+H"=false - - # If set to true, item and block class names of items and blocks will be shown in the tooltip. Only useful for programmers. [default: true] - B:showClassNames=true - - # If set to true, FluidRegistry names of fluids and fluid containers will be shown in the tooltip. [default: true] - B:showFluidRegistryNames=true - - # If set to true, GameRegistry names of items and blocks will be shown in the tooltip. [default: true] - B:showGameRegistryNames=true - - # If set to true, OreDictionary entries of items and blocks will be shown in the tooltip. [default: true] - B:showOreDictNames=true - - # Set this to false to disable the 'Press Ctrl for more info' message [default: true] - B:showShortMessage=true -} - - +# Configuration file + +general { + # If set to false, tooltips will be shown without pressing Ctrl. [default: true] + B:requiresCtrl=true + + # If set to false, tooltips will be shown without going into Advanced Info mode (F3 + H). [default: true] + B:"requiresF3+H"=false + + # If set to true, item and block class names of items and blocks will be shown in the tooltip. Only useful for programmers. [default: true] + B:showClassNames=true + + # If set to true, FluidRegistry names of fluids and fluid containers will be shown in the tooltip. [default: true] + B:showFluidRegistryNames=true + + # If set to true, GameRegistry names of items and blocks will be shown in the tooltip. [default: true] + B:showGameRegistryNames=true + + # If set to true, OreDictionary entries of items and blocks will be shown in the tooltip. [default: true] + B:showOreDictNames=true + + # Set this to false to disable the 'Press Ctrl for more info' message [default: true] + B:showShortMessage=true +} + + diff --git a/config/forge.cfg b/config/forge.cfg index 976d1345d1..08d08b30c4 100644 --- a/config/forge.cfg +++ b/config/forge.cfg @@ -1,57 +1,57 @@ -# Configuration file - -general { - # Set to true to disable Forge's version check mechanics. Forge queries a small json file on our server for version information. For more details see the ForgeVersion class in our github. - B:disableVersionCheck=false - - # Controls the number threshold at which Packet51 is preferred over Packet52, default and minimum 64, maximum 1024 - I:clumpingThreshold=64 - - # Set to true to enable the post initialization sorting of crafting recipes using Forge's sorter. May cause desyncing on conflicting recipies. MUST RESTART MINECRAFT IF CHANGED FROM THE CONFIG GUI. - B:sortRecipies=true - - # Set this to true to remove any Entity that throws an error in its update method instead of closing the server and reporting a crash log. BE WARNED THIS COULD SCREW UP EVERYTHING USE SPARINGLY WE ARE NOT RESPONSIBLE FOR DAMAGES. - B:removeErroringEntities=false - - # Set this to true to remove any TileEntity that throws an error in its update method instead of closing the server and reporting a crash log. BE WARNED THIS COULD SCREW UP EVERYTHING USE SPARINGLY WE ARE NOT RESPONSIBLE FOR DAMAGES. - B:removeErroringTileEntities=false - - # Set this to true to check the entire entity's collision bounding box for ladders instead of just the block they are in. Causes noticable differences in mechanics so default is vanilla behavior. Default: false - B:fullBoundingBoxLadders=false - - # Control the range of sky blending for colored skies in biomes. - I:biomeSkyBlendRange < - 2 - 4 - 6 - 8 - 10 - 12 - 14 - 16 - 18 - 20 - 22 - 24 - 26 - 28 - 30 - 32 - 34 - > - - # Base zombie summoning spawn chance. Allows changing the bonus zombie summoning mechanic. - D:zombieBaseSummonChance=0.1 - - # Chance that a zombie (or subclass) is a baby. Allows changing the zombie spawning mechanic. - D:zombieBabyChance=0.05 - - # The spawn fuzz when a player respawns in the world, this is controlable by WorldType, this config option is for the default overworld. - I:defaultSpawnFuzz=20 - - # If the overworld has ANY spawn fuzz at all. If not, the spawn will always be the exact same location. - B:spawnHasFuzz=true - B:enableGlobalConfig=false -} - - +# Configuration file + +general { + # Set to true to disable Forge's version check mechanics. Forge queries a small json file on our server for version information. For more details see the ForgeVersion class in our github. + B:disableVersionCheck=false + + # Controls the number threshold at which Packet51 is preferred over Packet52, default and minimum 64, maximum 1024 + I:clumpingThreshold=64 + + # Set to true to enable the post initialization sorting of crafting recipes using Forge's sorter. May cause desyncing on conflicting recipies. MUST RESTART MINECRAFT IF CHANGED FROM THE CONFIG GUI. + B:sortRecipies=true + + # Set this to true to remove any Entity that throws an error in its update method instead of closing the server and reporting a crash log. BE WARNED THIS COULD SCREW UP EVERYTHING USE SPARINGLY WE ARE NOT RESPONSIBLE FOR DAMAGES. + B:removeErroringEntities=false + + # Set this to true to remove any TileEntity that throws an error in its update method instead of closing the server and reporting a crash log. BE WARNED THIS COULD SCREW UP EVERYTHING USE SPARINGLY WE ARE NOT RESPONSIBLE FOR DAMAGES. + B:removeErroringTileEntities=false + + # Set this to true to check the entire entity's collision bounding box for ladders instead of just the block they are in. Causes noticable differences in mechanics so default is vanilla behavior. Default: false + B:fullBoundingBoxLadders=false + + # Control the range of sky blending for colored skies in biomes. + I:biomeSkyBlendRange < + 2 + 4 + 6 + 8 + 10 + 12 + 14 + 16 + 18 + 20 + 22 + 24 + 26 + 28 + 30 + 32 + 34 + > + + # Base zombie summoning spawn chance. Allows changing the bonus zombie summoning mechanic. + D:zombieBaseSummonChance=0.1 + + # Chance that a zombie (or subclass) is a baby. Allows changing the zombie spawning mechanic. + D:zombieBabyChance=0.05 + + # The spawn fuzz when a player respawns in the world, this is controlable by WorldType, this config option is for the default overworld. + I:defaultSpawnFuzz=20 + + # If the overworld has ANY spawn fuzz at all. If not, the spawn will always be the exact same location. + B:spawnHasFuzz=true + B:enableGlobalConfig=false +} + + diff --git a/config/forgeChunkLoading.cfg b/config/forgeChunkLoading.cfg index 3051bdffab..a9ac68a0d9 100644 --- a/config/forgeChunkLoading.cfg +++ b/config/forgeChunkLoading.cfg @@ -1,47 +1,47 @@ -# Configuration file - -########################################################################################################## -# Forge -#--------------------------------------------------------------------------------------------------------# -# Sample mod specific control section. -# Copy this section and rename the with the modid for the mod you wish to override. -# A value of zero in either entry effectively disables any chunkloading capabilities -# for that mod -########################################################################################################## - -Forge { - # Maximum chunks per ticket for the mod. - I:maximumChunksPerTicket=25 - - # Maximum ticket count for the mod. Zero disables chunkloading capabilities. - I:maximumTicketCount=200 -} - - -########################################################################################################## -# defaults -#--------------------------------------------------------------------------------------------------------# -# Default configuration for forge chunk loading control -########################################################################################################## - -defaults { - # Are mod overrides enabled? - B:enabled=true - - # The default maximum number of chunks a mod can force, per ticket, - # for a mod without an override. This is the maximum number of chunks a single ticket can force. - I:maximumChunksPerTicket=25 - - # The default maximum ticket count for a mod which does not have an override - # in this file. This is the number of chunk loading requests a mod is allowed to make. - I:maximumTicketCount=200 - - # The number of tickets a player can be assigned instead of a mod. This is shared across all mods and it is up to the mods to use it. - I:playerTicketCount=500 - - # Unloaded chunks can first be kept in a dormant cache for quicker - # loading times. Specify the size (in chunks) of that cache here - I:dormantChunkCacheSize=0 -} - - +# Configuration file + +########################################################################################################## +# Forge +#--------------------------------------------------------------------------------------------------------# +# Sample mod specific control section. +# Copy this section and rename the with the modid for the mod you wish to override. +# A value of zero in either entry effectively disables any chunkloading capabilities +# for that mod +########################################################################################################## + +Forge { + # Maximum chunks per ticket for the mod. + I:maximumChunksPerTicket=25 + + # Maximum ticket count for the mod. Zero disables chunkloading capabilities. + I:maximumTicketCount=200 +} + + +########################################################################################################## +# defaults +#--------------------------------------------------------------------------------------------------------# +# Default configuration for forge chunk loading control +########################################################################################################## + +defaults { + # Are mod overrides enabled? + B:enabled=true + + # The default maximum number of chunks a mod can force, per ticket, + # for a mod without an override. This is the maximum number of chunks a single ticket can force. + I:maximumChunksPerTicket=25 + + # The default maximum ticket count for a mod which does not have an override + # in this file. This is the number of chunk loading requests a mod is allowed to make. + I:maximumTicketCount=200 + + # The number of tickets a player can be assigned instead of a mod. This is shared across all mods and it is up to the mods to use it. + I:playerTicketCount=500 + + # Unloaded chunks can first be kept in a dormant cache for quicker + # loading times. Specify the size (in chunks) of that cache here + I:dormantChunkCacheSize=0 +} + + diff --git a/config/splash.properties b/config/splash.properties index da46ee8ee0..2eb0cd4034 100644 --- a/config/splash.properties +++ b/config/splash.properties @@ -1,5 +1,5 @@ #Splash screen properties -#Thu Jul 04 17:21:32 CEST 2019 +#Wed Oct 09 02:31:39 CEST 2019 logoTexture=textures/gui/title/mojang.png background=0xFFFFFF font=0x0 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000..b761216703 Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradlew.bat b/gradlew.bat index 8a0b282aa6..aec99730b4 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -1,90 +1,90 @@ -@if "%DEBUG%" == "" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS= - -set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto init - -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto init - -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:init -@rem Get command-line arguments, handling Windowz variants - -if not "%OS%" == "Windows_NT" goto win9xME_args -if "%@eval[2+2]" == "4" goto 4NT_args - -:win9xME_args -@rem Slurp the command line arguments. -set CMD_LINE_ARGS= -set _SKIP=2 - -:win9xME_args_slurp -if "x%~1" == "x" goto execute - -set CMD_LINE_ARGS=%* -goto execute - -:4NT_args -@rem Get arguments from the 4NT Shell from JP Software -set CMD_LINE_ARGS=%$ - -:execute -@rem Setup the command line - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% - -:end -@rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windowz variants + +if not "%OS%" == "Windows_NT" goto win9xME_args +if "%@eval[2+2]" == "4" goto 4NT_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* +goto execute + +:4NT_args +@rem Get arguments from the 4NT Shell from JP Software +set CMD_LINE_ARGS=%$ + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/libs/CodeChickenCore-1.7.10-1.0.7.47-dev.jar b/libs/CodeChickenCore-1.7.10-1.0.7.47-dev.jar new file mode 100644 index 0000000000..c7ecc2a5d1 Binary files /dev/null and b/libs/CodeChickenCore-1.7.10-1.0.7.47-dev.jar differ diff --git a/libs/CodeChickenLib-1.7.10-1.1.3.140-dev.jar b/libs/CodeChickenLib-1.7.10-1.1.3.140-dev.jar new file mode 100644 index 0000000000..2470ca73d9 Binary files /dev/null and b/libs/CodeChickenLib-1.7.10-1.1.3.140-dev.jar differ diff --git a/libs/NotEnoughItems-1.7.10-1.0.5.120-dev.jar b/libs/NotEnoughItems-1.7.10-1.0.5.120-dev.jar new file mode 100644 index 0000000000..0bb0483e3b Binary files /dev/null and b/libs/NotEnoughItems-1.7.10-1.0.5.120-dev.jar differ diff --git a/libs/Ztones-1.7.10-2.2.2-deobf.jar b/libs/Ztones-1.7.10-2.2.2-deobf.jar new file mode 100644 index 0000000000..daee8dfc48 Binary files /dev/null and b/libs/Ztones-1.7.10-2.2.2-deobf.jar differ diff --git a/libs/gregtech-5.09.32-dev.jar b/libs/gregtech-5.09.32-dev.jar new file mode 100644 index 0000000000..44c5cd845f Binary files /dev/null and b/libs/gregtech-5.09.32-dev.jar differ diff --git a/libs/industrialcraft-2-2.2.828a-experimental-deobf.jar b/libs/industrialcraft-2-2.2.828a-experimental-deobf.jar new file mode 100644 index 0000000000..30728e2a3f Binary files /dev/null and b/libs/industrialcraft-2-2.2.828a-experimental-deobf.jar differ diff --git a/libs/joml-1.9.18.jar b/libs/joml-1.9.18.jar new file mode 100644 index 0000000000..22161aa47b Binary files /dev/null and b/libs/joml-1.9.18.jar differ diff --git a/logs/2019-07-04-1.log.gz b/logs/2019-07-04-1.log.gz index ff74864d3f..ff6924de7b 100644 Binary files a/logs/2019-07-04-1.log.gz and b/logs/2019-07-04-1.log.gz differ diff --git a/logs/2019-07-04-2.log.gz b/logs/2019-07-04-2.log.gz index 4a4d9a17aa..b31a662fcb 100644 Binary files a/logs/2019-07-04-2.log.gz and b/logs/2019-07-04-2.log.gz differ diff --git a/logs/2019-07-04-3.log.gz b/logs/2019-07-04-3.log.gz index ff6924de7b..e02204d078 100644 Binary files a/logs/2019-07-04-3.log.gz and b/logs/2019-07-04-3.log.gz differ diff --git a/logs/2019-07-04-4.log.gz b/logs/2019-07-04-4.log.gz new file mode 100644 index 0000000000..ee99d99d76 Binary files /dev/null and b/logs/2019-07-04-4.log.gz differ diff --git a/logs/2019-07-04-5.log.gz b/logs/2019-07-04-5.log.gz new file mode 100644 index 0000000000..e20fd8beb8 Binary files /dev/null and b/logs/2019-07-04-5.log.gz differ diff --git a/logs/2019-07-04-6.log.gz b/logs/2019-07-04-6.log.gz new file mode 100644 index 0000000000..00594b280b Binary files /dev/null and b/logs/2019-07-04-6.log.gz differ diff --git a/logs/2019-07-04-7.log.gz b/logs/2019-07-04-7.log.gz new file mode 100644 index 0000000000..560b311c5f Binary files /dev/null and b/logs/2019-07-04-7.log.gz differ diff --git a/logs/2019-07-25-1.log.gz b/logs/2019-07-25-1.log.gz new file mode 100644 index 0000000000..b00e1e4d4b Binary files /dev/null and b/logs/2019-07-25-1.log.gz differ diff --git a/logs/2019-07-30-1.log.gz b/logs/2019-07-30-1.log.gz new file mode 100644 index 0000000000..5245354be9 Binary files /dev/null and b/logs/2019-07-30-1.log.gz differ diff --git a/logs/2019-07-30-2.log.gz b/logs/2019-07-30-2.log.gz new file mode 100644 index 0000000000..eac305e091 Binary files /dev/null and b/logs/2019-07-30-2.log.gz differ diff --git a/logs/2019-10-02-1.log.gz b/logs/2019-10-02-1.log.gz new file mode 100644 index 0000000000..a9aa9b9d21 Binary files /dev/null and b/logs/2019-10-02-1.log.gz differ diff --git a/logs/2019-10-08-1.log.gz b/logs/2019-10-08-1.log.gz new file mode 100644 index 0000000000..b235f35517 Binary files /dev/null and b/logs/2019-10-08-1.log.gz differ diff --git a/logs/2019-10-08-2.log.gz b/logs/2019-10-08-2.log.gz new file mode 100644 index 0000000000..67d8e615f8 Binary files /dev/null and b/logs/2019-10-08-2.log.gz differ diff --git a/logs/2019-10-08-3.log.gz b/logs/2019-10-08-3.log.gz new file mode 100644 index 0000000000..efb5e3da17 Binary files /dev/null and b/logs/2019-10-08-3.log.gz differ diff --git a/logs/2019-10-08-4.log.gz b/logs/2019-10-08-4.log.gz new file mode 100644 index 0000000000..7fe6f88451 Binary files /dev/null and b/logs/2019-10-08-4.log.gz differ diff --git a/logs/2019-10-08-5.log.gz b/logs/2019-10-08-5.log.gz new file mode 100644 index 0000000000..e0a895c030 Binary files /dev/null and b/logs/2019-10-08-5.log.gz differ diff --git a/logs/2019-10-08-6.log.gz b/logs/2019-10-08-6.log.gz new file mode 100644 index 0000000000..b16e824b37 Binary files /dev/null and b/logs/2019-10-08-6.log.gz differ diff --git a/logs/2019-10-08-7.log.gz b/logs/2019-10-08-7.log.gz new file mode 100644 index 0000000000..07bcb00d89 Binary files /dev/null and b/logs/2019-10-08-7.log.gz differ diff --git a/logs/2019-10-09-1.log.gz b/logs/2019-10-09-1.log.gz new file mode 100644 index 0000000000..e0df02e6e3 Binary files /dev/null and b/logs/2019-10-09-1.log.gz differ diff --git a/mods/1.7.10/CodeChickenLib-1.7.10-1.1.3.140-universal.jar b/mods/1.7.10/CodeChickenLib-1.7.10-1.1.3.140-universal.jar new file mode 100644 index 0000000000..9aa3d80afd Binary files /dev/null and b/mods/1.7.10/CodeChickenLib-1.7.10-1.1.3.140-universal.jar differ diff --git a/mods/devtips-1.1.jar b/mods/devtips-1.1.jar new file mode 100644 index 0000000000..a5e373537b Binary files /dev/null and b/mods/devtips-1.1.jar differ diff --git a/mods/ic2/EJML-core-0.26.jar b/mods/ic2/EJML-core-0.26.jar new file mode 100644 index 0000000000..8f1fe755e6 Binary files /dev/null and b/mods/ic2/EJML-core-0.26.jar differ diff --git a/options.txt b/options.txt index 8c305b8fca..5bc5167523 100644 --- a/options.txt +++ b/options.txt @@ -14,7 +14,7 @@ fboEnable:true difficulty:2 fancyGraphics:true ao:2 -clouds:true +clouds:false resourcePacks:[] lastServer: lang:en_US @@ -90,12 +90,12 @@ key_Boost Key:0 key_Mode Switch Key:0 key_Side Inventory Key:0 key_Hub Expand Key:0 -soundCategory_master:0.0 -soundCategory_music:1.0 -soundCategory_record:1.0 -soundCategory_weather:1.0 -soundCategory_block:1.0 -soundCategory_hostile:1.0 -soundCategory_neutral:1.0 -soundCategory_player:1.0 -soundCategory_ambient:1.0 +soundCategory_master:0.25496688 +soundCategory_music:0.0 +soundCategory_record:0.0 +soundCategory_weather:0.0 +soundCategory_block:0.40140846 +soundCategory_hostile:0.0 +soundCategory_neutral:0.0 +soundCategory_player:0.28169015 +soundCategory_ambient:0.18309858 diff --git a/saves/NEI/local/New World/NEI.cfg b/saves/NEI/local/New World/NEI.cfg index 438b6fa3be..6e4acab17e 100644 --- a/saves/NEI/local/New World/NEI.cfg +++ b/saves/NEI/local/New World/NEI.cfg @@ -2,7 +2,4 @@ #Most of these options can be changed ingame. #Deleting any element will restore it to it's default value -inventory -{ - cheatmode=2 -} +inventory.cheatmode=2 diff --git a/saves/NEI/local/New World/NEI.dat b/saves/NEI/local/New World/NEI.dat index 6df1570cf9..74f929fd42 100644 Binary files a/saves/NEI/local/New World/NEI.dat and b/saves/NEI/local/New World/NEI.dat differ diff --git a/saves/New World/DIM-1/data/villages.dat b/saves/New World/DIM-1/data/villages.dat index 6eea9045b7..bbfef5a15b 100644 Binary files a/saves/New World/DIM-1/data/villages.dat and b/saves/New World/DIM-1/data/villages.dat differ diff --git a/saves/New World/DIM1/data/villages.dat b/saves/New World/DIM1/data/villages.dat index 6eea9045b7..bbfef5a15b 100644 Binary files a/saves/New World/DIM1/data/villages.dat and b/saves/New World/DIM1/data/villages.dat differ diff --git a/saves/New World/NEI/players/kekzdealer@gmail.com.dat b/saves/New World/NEI/players/kekzdealer@gmail.com.dat deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/saves/New World/data/Mineshaft.dat b/saves/New World/data/Mineshaft.dat deleted file mode 100644 index 32b69a406a..0000000000 Binary files a/saves/New World/data/Mineshaft.dat and /dev/null differ diff --git a/saves/New World/data/Stronghold.dat b/saves/New World/data/Stronghold.dat deleted file mode 100644 index ce80a0542c..0000000000 Binary files a/saves/New World/data/Stronghold.dat and /dev/null differ diff --git a/saves/New World/data/villages.dat b/saves/New World/data/villages.dat index 6eea9045b7..bbfef5a15b 100644 Binary files a/saves/New World/data/villages.dat and b/saves/New World/data/villages.dat differ diff --git a/saves/New World/level.dat b/saves/New World/level.dat index e926db4bfc..8e4ac4e060 100644 Binary files a/saves/New World/level.dat and b/saves/New World/level.dat differ diff --git a/saves/New World/level.dat_mcr b/saves/New World/level.dat_mcr index 8ded46d4c4..18145f40ad 100644 Binary files a/saves/New World/level.dat_mcr and b/saves/New World/level.dat_mcr differ diff --git a/saves/New World/level.dat_old b/saves/New World/level.dat_old index 7d023fc227..ddc26c0537 100644 Binary files a/saves/New World/level.dat_old and b/saves/New World/level.dat_old differ diff --git a/saves/New World/playerdata/ddc68fe4-0789-360b-a837-3dcbb936da65.dat b/saves/New World/playerdata/ddc68fe4-0789-360b-a837-3dcbb936da65.dat deleted file mode 100644 index cf38536515..0000000000 Binary files a/saves/New World/playerdata/ddc68fe4-0789-360b-a837-3dcbb936da65.dat and /dev/null differ diff --git a/saves/New World/playerdata/fd8b4f31-35bd-474b-8add-e80df8a4a95f.dat b/saves/New World/playerdata/fd8b4f31-35bd-474b-8add-e80df8a4a95f.dat deleted file mode 100644 index 7714b0a0b2..0000000000 Binary files a/saves/New World/playerdata/fd8b4f31-35bd-474b-8add-e80df8a4a95f.dat and /dev/null differ diff --git a/saves/New World/region/r.-1.0.mca b/saves/New World/region/r.-1.0.mca index c5ebecdb55..98be9c18aa 100644 Binary files a/saves/New World/region/r.-1.0.mca and b/saves/New World/region/r.-1.0.mca differ diff --git a/saves/New World/region/r.0.-1.mca b/saves/New World/region/r.0.-1.mca deleted file mode 100644 index ebb611446b..0000000000 Binary files a/saves/New World/region/r.0.-1.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 index bec47d6928..2550b88006 100644 Binary files a/saves/New World/region/r.0.0.mca and b/saves/New World/region/r.0.0.mca differ diff --git a/saves/New World/session.lock b/saves/New World/session.lock index 0f0c879b8d..6ffc6e410a 100644 Binary files a/saves/New World/session.lock and b/saves/New World/session.lock differ diff --git a/saves/New World/stats/ddc68fe4-0789-360b-a837-3dcbb936da65.json b/saves/New World/stats/ddc68fe4-0789-360b-a837-3dcbb936da65.json deleted file mode 100644 index ffa43e08a2..0000000000 --- a/saves/New World/stats/ddc68fe4-0789-360b-a837-3dcbb936da65.json +++ /dev/null @@ -1 +0,0 @@ -{"stat.walkOneCm":618295,"achievement.openInventory":523,"stat.leaveGame":1,"stat.useItem.31":1,"stat.flyOneCm":309726,"stat.drop":2,"stat.jump":756,"stat.useItem.95":233,"stat.useItem.323":8,"stat.playOneMinute":1107325,"stat.climbOneCm":6270,"achievement.buildWorkBench":1,"stat.useItem.3":47,"achievement.mineWood":1,"achievement.exploreAllBiomes":{"value":0,"progress":["Swampland"]},"stat.useItem.58":2} \ No newline at end of file diff --git a/saves/New World/stats/fd8b4f31-35bd-474b-8add-e80df8a4a95f.json b/saves/New World/stats/fd8b4f31-35bd-474b-8add-e80df8a4a95f.json deleted file mode 100644 index 3374979e71..0000000000 --- a/saves/New World/stats/fd8b4f31-35bd-474b-8add-e80df8a4a95f.json +++ /dev/null @@ -1 +0,0 @@ -{"stat.useItem.54":2,"stat.walkOneCm":12515,"stat.drop":1,"stat.jump":6,"stat.playOneMinute":262803,"achievement.openInventory":56,"achievement.exploreAllBiomes":{"value":0,"progress":["Swampland"]}} \ No newline at end of file diff --git a/src/main/java/blocks/Block_GDCUnit.java b/src/main/java/blocks/Block_GDCUnit.java index d11681b1d6..ed778b5e8d 100644 --- a/src/main/java/blocks/Block_GDCUnit.java +++ b/src/main/java/blocks/Block_GDCUnit.java @@ -1,29 +1,31 @@ -package blocks; - -import cpw.mods.fml.common.registry.GameRegistry; -import kekztech.KekzCore; -import net.minecraft.block.Block; -import net.minecraft.block.material.Material; -import net.minecraft.creativetab.CreativeTabs; - -public class Block_GDCUnit extends Block { - - private static Block_GDCUnit instance = new Block_GDCUnit(); - - private Block_GDCUnit() { - // I am a singleton - super(Material.iron); - } - - public static Block_GDCUnit getInstance() { - return instance; - } - - public void registerBlock() { - final String blockName = "kekztech_gdcceramicelectrolyteunit_block"; - super.setBlockName(blockName); - super.setCreativeTab(CreativeTabs.tabMisc); - super.setBlockTextureName(KekzCore.MODID + ":" + "GDCCeramicElectrolyteUnit"); - GameRegistry.registerBlock(getInstance(), blockName); - } -} +package blocks; + +import cpw.mods.fml.common.registry.GameRegistry; +import kekztech.KekzCore; +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; +import net.minecraft.creativetab.CreativeTabs; + +public class Block_GDCUnit extends Block { + + private static Block_GDCUnit instance = new Block_GDCUnit(); + + private Block_GDCUnit() { + // I am a singleton + super(Material.iron); + } + + public static Block_GDCUnit getInstance() { + return instance; + } + + public void registerBlock() { + final String blockName = "kekztech_gdcceramicelectrolyteunit_block"; + super.setBlockName(blockName); + super.setCreativeTab(CreativeTabs.tabMisc); + super.setBlockTextureName(KekzCore.MODID + ":" + "GDCCeramicElectrolyteUnit"); + super.setHardness(5.0f); + super.setResistance(6.0f); + GameRegistry.registerBlock(getInstance(), blockName); + } +} diff --git a/src/main/java/blocks/Block_TFFTCasing.java b/src/main/java/blocks/Block_TFFTCasing.java index eb47860418..f2011a8bae 100644 --- a/src/main/java/blocks/Block_TFFTCasing.java +++ b/src/main/java/blocks/Block_TFFTCasing.java @@ -1,29 +1,31 @@ -package blocks; - -import cpw.mods.fml.common.registry.GameRegistry; -import kekztech.KekzCore; -import net.minecraft.block.Block; -import net.minecraft.block.material.Material; -import net.minecraft.creativetab.CreativeTabs; - -public class Block_TFFTCasing extends Block { - - private static Block_TFFTCasing instance = new Block_TFFTCasing(); - - private Block_TFFTCasing() { - // I am a singleton - super(Material.iron); - } - - public static Block_TFFTCasing getInstance() { - return instance; - } - - public void registerBlock() { - final String blockName = "kekztech_tfftcasing_block"; - super.setBlockName(blockName); - super.setCreativeTab(CreativeTabs.tabMisc); - super.setBlockTextureName(KekzCore.MODID + ":" + "TFFTCasing"); - GameRegistry.registerBlock(getInstance(), blockName); - } -} +package blocks; + +import cpw.mods.fml.common.registry.GameRegistry; +import kekztech.KekzCore; +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; +import net.minecraft.creativetab.CreativeTabs; + +public class Block_TFFTCasing extends Block { + + private static Block_TFFTCasing instance = new Block_TFFTCasing(); + + private Block_TFFTCasing() { + // I am a singleton + super(Material.iron); + } + + public static Block_TFFTCasing getInstance() { + return instance; + } + + public void registerBlock() { + final String blockName = "kekztech_tfftcasing_block"; + super.setBlockName(blockName); + super.setCreativeTab(CreativeTabs.tabMisc); + super.setBlockTextureName(KekzCore.MODID + ":" + "TFFTCasing"); + super.setHardness(5.0f); + super.setResistance(6.0f); + GameRegistry.registerBlock(getInstance(), blockName); + } +} diff --git a/src/main/java/blocks/Block_TFFTStorageFieldBlockT1.java b/src/main/java/blocks/Block_TFFTStorageFieldBlockT1.java index 9a94f06121..28d23eec73 100644 --- a/src/main/java/blocks/Block_TFFTStorageFieldBlockT1.java +++ b/src/main/java/blocks/Block_TFFTStorageFieldBlockT1.java @@ -1,31 +1,33 @@ -package blocks; - -import cpw.mods.fml.common.registry.GameRegistry; -import kekztech.KekzCore; -import net.minecraft.block.Block; -import net.minecraft.block.material.Material; -import net.minecraft.creativetab.CreativeTabs; - -public class Block_TFFTStorageFieldBlockT1 extends Block { - - private static Block_TFFTStorageFieldBlockT1 instance = new Block_TFFTStorageFieldBlockT1(); - - private Block_TFFTStorageFieldBlockT1() { - // I am a singleton - super(Material.iron); - } - - public static Block_TFFTStorageFieldBlockT1 getInstance() { - return instance; - } - - public void registerBlock()