aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Robertz <dream-master@gmx.net>2022-10-09 12:12:31 +0200
committerGitHub <noreply@github.com>2022-10-09 12:12:31 +0200
commitf7ffab4b1f0ef45dd4852b26965367f2c559ca0a (patch)
tree2e94fcd7517921328eebb51abe506f99b9a10dd5
parent7f193e090a535bf026e92f17a676f78d7771277f (diff)
parent145e13b90195d9d58f5629fb1c2d1c90b9a5b1b1 (diff)
downloadGT5-Unofficial-f7ffab4b1f0ef45dd4852b26965367f2c559ca0a.tar.gz
GT5-Unofficial-f7ffab4b1f0ef45dd4852b26965367f2c559ca0a.tar.bz2
GT5-Unofficial-f7ffab4b1f0ef45dd4852b26965367f2c559ca0a.zip
Merge pull request #44 from GTNewHorizons/fix/lsc-division-zero
Fix division by zero error
-rw-r--r--.gitattributes44
-rw-r--r--LICENSE42
-rw-r--r--README.md22
-rw-r--r--build.gradle561
-rw-r--r--gradlew.bat200
-rw-r--r--settings.gradle10
-rw-r--r--src/main/java/client/ClientProxy.java4
-rw-r--r--src/main/java/client/GTTexture.java3
-rw-r--r--src/main/java/client/gui/GUIContainer_ModularNuclearReactor.java86
-rw-r--r--src/main/java/client/gui/Gui_ItemProxyEndpoint.java72
-rw-r--r--src/main/java/client/gui/Gui_ItemProxySource.java71
-rw-r--r--src/main/java/client/renderer/ConduitRenderer.java135
-rw-r--r--src/main/java/client/renderer/TESR_BeamTransmitter.java9
-rw-r--r--src/main/java/client/renderer/TESR_SECapacitor.java5
-rw-r--r--src/main/java/client/renderer/TESR_SETether.java6
-rw-r--r--src/main/java/common/Blocks.java193
-rw-r--r--src/main/java/common/CommonProxy.java1
-rw-r--r--src/main/java/common/Recipes.java1479
-rw-r--r--src/main/java/common/Researches.java20
-rw-r--r--src/main/java/common/TileEntities.java19
-rw-r--r--src/main/java/common/blocks/BaseGTUpdateableBlock.java3
-rw-r--r--src/main/java/common/blocks/Block_BeamTransmitter.java8
-rw-r--r--src/main/java/common/blocks/Block_ControlRod.java36
-rw-r--r--src/main/java/common/blocks/Block_GDCUnit.java56
-rw-r--r--src/main/java/common/blocks/Block_IchorJar.java397
-rw-r--r--src/main/java/common/blocks/Block_ItemProxyCable.java92
-rw-r--r--src/main/java/common/blocks/Block_ItemProxyEndpoint.java92
-rw-r--r--src/main/java/common/blocks/Block_ItemProxySource.java88
-rw-r--r--src/main/java/common/blocks/Block_LapotronicEnergyUnit.java187
-rw-r--r--src/main/java/common/blocks/Block_LargeHexPlate.java17
-rw-r--r--src/main/java/common/blocks/Block_ReactorChamber_OFF.java37
-rw-r--r--src/main/java/common/blocks/Block_ReactorChamber_ON.java45
-rw-r--r--src/main/java/common/blocks/Block_SpaceElevator.java8
-rw-r--r--src/main/java/common/blocks/Block_SpaceElevatorTether.java9
-rw-r--r--src/main/java/common/blocks/Block_TFFTCasing.java56
-rw-r--r--src/main/java/common/blocks/Block_TFFTMultiHatch.java72
-rw-r--r--src/main/java/common/blocks/Block_TFFTStorageFieldBlockT1.java75
-rw-r--r--src/main/java/common/blocks/Block_TFFTStorageFieldBlockT2.java74
-rw-r--r--src/main/java/common/blocks/Block_TFFTStorageFieldBlockT3.java74
-rw-r--r--src/main/java/common/blocks/Block_TFFTStorageFieldBlockT4.java74
-rw-r--r--src/main/java/common/blocks/Block_TFFTStorageFieldBlockT5.java54
-rw-r--r--src/main/java/common/blocks/Block_ThaumiumReinforcedJar.java439
-rw-r--r--src/main/java/common/blocks/Block_YSZUnit.java56
-rw-r--r--src/main/java/common/container/Container_ItemProxyEndpoint.java86
-rw-r--r--src/main/java/common/container/Container_ItemProxySource.java111
-rw-r--r--src/main/java/common/container/Container_ModularNuclearReactor.java154
-rw-r--r--src/main/java/common/itemBlocks/IB_IchorJar.java11
-rw-r--r--src/main/java/common/itemBlocks/IB_ItemProxyCable.java19
-rw-r--r--src/main/java/common/itemBlocks/IB_ItemProxyEndpoint.java23
-rw-r--r--src/main/java/common/itemBlocks/IB_ItemProxySource.java25
-rw-r--r--src/main/java/common/itemBlocks/IB_LapotronicEnergyUnit.java98
-rw-r--r--src/main/java/common/itemBlocks/IB_SpaceElevator.java7
-rw-r--r--src/main/java/common/itemBlocks/IB_SpaceElevatorCapacitor.java3
-rw-r--r--src/main/java/common/itemBlocks/IB_TFFTMultiHatch.java44
-rw-r--r--src/main/java/common/itemBlocks/IB_TFFTStorageFieldBlockT1.java26
-rw-r--r--src/main/java/common/itemBlocks/IB_TFFTStorageFieldBlockT2.java26
-rw-r--r--src/main/java/common/itemBlocks/IB_TFFTStorageFieldBlockT3.java26
-rw-r--r--src/main/java/common/itemBlocks/IB_TFFTStorageFieldBlockT4.java26
-rw-r--r--src/main/java/common/itemBlocks/IB_TFFTStorageFieldBlockT5.java28
-rw-r--r--src/main/java/common/itemBlocks/IB_ThaumiumReinforcedJar.java4
-rw-r--r--src/main/java/common/items/ErrorItem.java70
-rw-r--r--src/main/java/common/items/MetaItem_CraftingComponent.java174
-rw-r--r--src/main/java/common/items/MetaItem_ReactorComponent.java212
-rw-r--r--src/main/java/common/reactorItem/AbstractReactorItem.java5
-rw-r--r--src/main/java/common/reactorItem/ReactorItem.java4
-rw-r--r--src/main/java/common/tileentities/GTMTE_FluidMultiStorage.java1017
-rw-r--r--src/main/java/common/tileentities/GTMTE_LapotronicSuperCapacitor.java588
-rw-r--r--src/main/java/common/tileentities/GTMTE_ModularNuclearReactor.java494
-rw-r--r--src/main/java/common/tileentities/GTMTE_SOFuelCellMK1.java326
-rw-r--r--src/main/java/common/tileentities/GTMTE_SOFuelCellMK2.java323
-rw-r--r--src/main/java/common/tileentities/GTMTE_SpaceElevator.java112
-rw-r--r--src/main/java/common/tileentities/GTMTE_TFFTMultiHatch.java48
-rw-r--r--src/main/java/common/tileentities/TE_IchorJar.java8
-rw-r--r--src/main/java/common/tileentities/TE_IchorVoidJar.java8
-rw-r--r--src/main/java/common/tileentities/TE_ItemProxyCable.java257
-rw-r--r--src/main/java/common/tileentities/TE_ItemProxyEndpoint.java330
-rw-r--r--src/main/java/common/tileentities/TE_ItemProxySource.java198
-rw-r--r--src/main/java/common/tileentities/TE_TFFTMultiHatch.java200
-rw-r--r--src/main/java/common/tileentities/TE_ThaumiumReinforcedJar.java8
-rw-r--r--src/main/java/common/tileentities/TE_ThaumiumReinforcedVoidJar.java8
-rw-r--r--src/main/java/kekztech/GuiHandler.java55
-rw-r--r--src/main/java/kekztech/Items.java166
-rw-r--r--src/main/java/kekztech/KekzCore.java80
-rw-r--r--src/main/java/kekztech/MultiFluidHandler.java800
-rw-r--r--src/main/java/kekztech/ServerProxy.java4
-rw-r--r--src/main/java/reactor/ButtonSlot.java25
-rw-r--r--src/main/java/reactor/Reactor.java1
-rw-r--r--src/main/java/reactor/items/CoolantCell.java25
-rw-r--r--src/main/java/reactor/items/FuelRod.java153
-rw-r--r--src/main/java/reactor/items/HeatExchanger.java37
-rw-r--r--src/main/java/reactor/items/HeatVent.java86
-rw-r--r--src/main/java/reactor/items/NeutronReflector.java25
-rw-r--r--src/main/java/util/Util.java78
-rw-r--r--src/main/java/util/Vector3i.java62
-rw-r--r--src/main/java/util/Vector3ic.java18
95 files changed, 6218 insertions, 5535 deletions
diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000000..fd2792b6cb
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,44 @@
+* text eol=lf
+
+*.[jJ][aA][rR] binary
+
+*.[pP][nN][gG] binary
+*.[jJ][pP][gG] binary
+*.[jJ][pP][eE][gG] binary
+*.[gG][iI][fF] binary
+*.[tT][iI][fF] binary
+*.[tT][iI][fF][fF] binary
+*.[iI][cC][oO] binary
+*.[sS][vV][gG] text
+*.[eE][pP][sS] binary
+*.[xX][cC][fF] binary
+
+*.[kK][aA][rR] binary
+*.[mM]4[aA] binary
+*.[mM][iI][dD] binary
+*.[mM][iI][dD][iI] binary
+*.[mM][pP]3 binary
+*.[oO][gG][gG] binary
+*.[rR][aA] binary
+
+*.7[zZ] binary
+*.[gG][zZ] binary
+*.[tT][aA][rR] binary
+*.[tT][gG][zZ] binary
+*.[zZ][iI][pP] binary
+
+*.[tT][cC][nN] binary
+*.[sS][oO] binary
+*.[dD][lL][lL] binary
+*.[dD][yY][lL][iI][bB] binary
+*.[pP][sS][dD] binary
+*.[tT][tT][fF] binary
+*.[oO][tT][fF] binary
+
+*.[pP][aA][tT][cC][hH] -text
+
+*.[bB][aA][tT] text eol=crlf
+*.[cC][mM][dD] text eol=crlf
+*.[pP][sS]1 text eol=crlf
+
+*[aA][uU][tT][oO][gG][eE][nN][eE][rR][aA][tT][eE][dD]* binary
diff --git a/LICENSE b/LICENSE
index cbd9e607af..8b23445f4a 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 30afc81d46..d800cb789c 100644
--- a/README.md
+++ b/README.md
@@ -1,11 +1,11 @@
-# KekzTech
-A Minecraft mod for the 1.7.10 modpack GTNH.
-No compatibility outside GTNH guaranteed.
-
-My mod adds Solid Oxide Fuel Cells to turn gas fuels into electricity and steam, a multi tank that can store up to 25 different fluids in one structure, and a nuclear reactor in the future.
-
-Solid Oxide Fuel Cell MK1 and MK2:
-![picture of Solid Oxied Fuel Cells, tier 1 and 2](https://github.com/GTNewHorizons/KekzTech/blob/master/screenshots/SOFC_Display.jpeg?raw=true)
-
-Multi Tank:
-![picture of multi tank](https://github.com/GTNewHorizons/KekzTech/blob/master/screenshots/TFFT_Display.jpeg?raw=true)
+# KekzTech
+A Minecraft mod for the 1.7.10 modpack GTNH.
+No compatibility outside GTNH guaranteed.
+
+My mod adds Solid Oxide Fuel Cells to turn gas fuels into electricity and steam, a multi tank that can store up to 25 different fluids in one structure, and a nuclear reactor in the future.
+
+Solid Oxide Fuel Cell MK1 and MK2:
+![picture of Solid Oxied Fuel Cells, tier 1 and 2](https://github.com/GTNewHorizons/KekzTech/blob/master/screenshots/SOFC_Display.jpeg?raw=true)
+
+Multi Tank:
+![picture of multi tank](https://github.com/GTNewHorizons/KekzTech/blob/master/screenshots/TFFT_Display.jpeg?raw=true)
diff --git a/build.gradle b/build.gradle
index c09bee22f3..b961a5e176 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,26 +1,41 @@
-//version: 1652851397
+//version: 1664372158
/*
-DO NOT CHANGE THIS FILE!
-
-Also, you may replace this file at any time if there is an update available.
-Please check https://github.com/GTNewHorizons/ExampleMod1.7.10/blob/main/build.gradle for updates.
-*/
+ DO NOT CHANGE THIS FILE!
+ Also, you may replace this file at any time if there is an update available.
+ Please check https://github.com/GTNewHorizons/ExampleMod1.7.10/blob/main/build.gradle for updates.
+ */
import com.github.jengelman.gradle.plugins.shadow.tasks.ConfigureShadowRelocation
import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
+import com.matthewprenger.cursegradle.CurseArtifact
+import com.matthewprenger.cursegradle.CurseRelation
+import com.modrinth.minotaur.dependencies.ModDependency
+import com.modrinth.minotaur.dependencies.VersionDependency
import org.gradle.internal.logging.text.StyledTextOutput.Style
import org.gradle.internal.logging.text.StyledTextOutputFactory
+import java.nio.file.Files
+import java.nio.file.Paths
import java.util.concurrent.TimeUnit
+import java.util.zip.ZipEntry
+import java.util.zip.ZipInputStream
+import java.util.zip.ZipOutputStream
buildscript {
repositories {
+ mavenCentral()
+
maven {
name 'forge'
url 'https://maven.minecraftforge.net'
}
maven {
+ // GTNH ForgeGradle Fork
+ name = "GTNH Maven"
+ url = "http://jenkins.usrv.eu:8081/nexus/content/groups/public/"
+ }
+ maven {
name 'sonatype'
url 'https://oss.sonatype.org/content/repositories/snapshots/'
}
@@ -28,31 +43,39 @@ buildscript {
name 'Scala CI dependencies'
url 'https://repo1.maven.org/maven2/'
}
- maven {
- name 'jitpack'
- url 'https://jitpack.io'
- }
}
dependencies {
- classpath 'com.github.GTNewHorizons:ForgeGradle:1.2.7'
+ classpath 'net.minecraftforge.gradle:ForgeGradle:1.2.9'
}
}
-
plugins {
id 'java-library'
id 'idea'
id 'eclipse'
id 'scala'
id 'maven-publish'
- id 'org.jetbrains.kotlin.jvm' version '1.5.30' apply false
- id 'org.jetbrains.kotlin.kapt' version '1.5.30' apply false
- id 'com.google.devtools.ksp' version '1.5.30-1.0.0' apply false
- id 'org.ajoberstar.grgit' version '4.1.1'
+ id 'org.jetbrains.kotlin.jvm' version '1.5.30' apply false
+ id 'org.jetbrains.kotlin.kapt' version '1.5.30' apply false
+ id 'com.google.devtools.ksp' version '1.5.30-1.0.0' apply false
+ id 'org.ajoberstar.grgit' version '4.1.1'
id 'com.github.johnrengelman.shadow' version '4.0.4'
- id 'com.palantir.git-version' version '0.13.0' apply false
- id 'de.undercouch.download' version '5.0.1'
- id 'com.github.gmazzo.buildconfig' version '3.0.3' apply false
+ id 'com.palantir.git-version' version '0.13.0' apply false
+ id 'de.undercouch.download' version '5.0.1'
+ id 'com.github.gmazzo.buildconfig' version '3.0.3' apply false
+ id 'com.diffplug.spotless' version '6.7.2' apply false
+ id 'com.modrinth.minotaur' version '2.+' apply false
+ id 'com.matthewprenger.cursegradle' version '1.4.0' apply false
}
+boolean sett