aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <gtandemmodding@gmail.com>2022-01-26 11:21:01 +1100
committerunknown <gtandemmodding@gmail.com>2022-01-26 11:21:01 +1100
commit3b4e3b33b630e676b44aa8ec16baf7dd11138d5c (patch)
treef084421e82565b34439480c8060df07f1adb5296
parent3d743ff6ab49677321eba06a96aff8f4262b85d9 (diff)
downloadGT5-Unofficial-3b4e3b33b630e676b44aa8ec16baf7dd11138d5c.tar.gz
GT5-Unofficial-3b4e3b33b630e676b44aa8ec16baf7dd11138d5c.tar.bz2
GT5-Unofficial-3b4e3b33b630e676b44aa8ec16baf7dd11138d5c.zip
Add materials, add multis, just look at the diff tbh
-rw-r--r--.gitignore1
-rw-r--r--build.gradle52
-rw-r--r--dependencies.gradle59
-rw-r--r--gradle.properties3
-rw-r--r--libs/GoodGenerator-0.3.4-dev.jarbin0 -> 609811 bytes
-rw-r--r--libs/Thaumcraft-1.7.10-4.2.3.5.deobf.jarbin0 -> 12529589 bytes
-rw-r--r--repositories.gradle29
-rw-r--r--src/main/java/com/elisis/gtnhlanth/GTNHLanthanides.java11
-rw-r--r--src/main/java/com/elisis/gtnhlanth/common/CommonProxy.java2
-rw-r--r--src/main/java/com/elisis/gtnhlanth/common/register/ItemList.java19
-rw-r--r--src/main/java/com/elisis/gtnhlanth/common/register/WerkstoffMaterialPool.java357
-rw-r--r--src/main/java/com/elisis/gtnhlanth/common/tileentity/Digester.java206
-rw-r--r--src/main/java/com/elisis/gtnhlanth/common/tileentity/DissolutionTank.java0
-rw-r--r--src/main/java/com/elisis/gtnhlanth/loader/MetaTileEntity_Loader.java5
-rw-r--r--src/main/java/com/elisis/gtnhlanth/loader/RecipeAdder.java91
-rw-r--r--src/main/java/com/elisis/gtnhlanth/loader/RecipeLoader.java587
-rw-r--r--src/main/java/com/elisis/gtnhlanth/util/DescTextLocalization.java18
17 files changed, 1401 insertions, 39 deletions
diff --git a/.gitignore b/.gitignore
index 75c41f65d5..9221d6448d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,3 +29,4 @@ src/main/resources/mixins.*.json
*.bat
*.DS_Store
!gradlew.bat
+*.bak \ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 00472c8eb0..b647108772 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,9 +1,9 @@
-//version: 8fa7883b6196c1765266f4e6ddf3118d5043aafb
+//version: 1642484596
/*
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/SinTh0r4s/ExampleMod1.7.10/blob/main/build.gradle for updates.
+Please check https://github.com/GTNewHorizons/ExampleMod1.7.10/blob/main/build.gradle for updates.
*/
@@ -88,6 +88,7 @@ checkPropertyExists("containsMixinsAndOrCoreModOnly")
checkPropertyExists("usesShadowedDependencies")
checkPropertyExists("developmentEnvironmentUserName")
+boolean noPublishedSources = project.findProperty("noPublishedSources") ? project.noPublishedSources.toBoolean() : false
String javaSourceDir = "src/main/java/"
String scalaSourceDir = "src/main/scala/"
@@ -151,12 +152,16 @@ configurations.all {
// Fix Jenkins' Git: chmod a file should not be detected as a change and append a '.dirty' to the version
'git config core.fileMode false'.execute()
-// Pulls version from git tag
+
+// Pulls version first from the VERSION env and then git tag
+String identifiedVersion
try {
- version = minecraftVersion + "-" + gitVersion()
+ String versionOverride = System.getenv("VERSION") ?: null
+ identifiedVersion = versionOverride == null ? gitVersion() : versionOverride
+ version = minecraftVersion + "-" + identifiedVersion
}
catch (Exception e) {
- throw new IllegalStateException("This mod must be version controlled by Git AND the repository must provide at least one tag!");
+ throw new IllegalStateException("This mod must be version controlled by Git AND the repository must provide at least one tag, or the VERSION override must be set!");
}
group = modGroup
@@ -223,7 +228,7 @@ dependencies {
annotationProcessor("com.google.code.gson:gson:2.8.6")
annotationProcessor("org.spongepowered:mixin:0.8-SNAPSHOT")
// using 0.8 to workaround a issue in 0.7 which fails mixin application
- compile("org.spongepowered:mixin:0.7.11-SNAPSHOT") {
+ compile("com.github.GTNewHorizons:SpongePoweredMixin:0.7.12-GTNH") {
// Mixin includes a lot of dependencies that are too up-to-date
exclude module: "launchwrapper"
exclude module: "guava"
@@ -231,7 +236,7 @@ dependencies {
exclude module: "commons-io"
exclude module: "log4j-core"
}
- compile("com.github.GTNewHorizons:SpongeMixins:1.3.3:dev")
+ compile("com.github.GTNewHorizons:SpongeMixins:1.5.0")
}
}
@@ -480,7 +485,9 @@ task apiJar(type: Jar) {
}
artifacts {
- archives sourcesJar
+ if(!noPublishedSources) {
+ archives sourcesJar
+ }
archives devJar
if(apiPackage) {
archives apiJar
@@ -491,29 +498,28 @@ artifacts {
publishing {
publications {
maven(MavenPublication) {
- artifact source: jar
- artifact source: sourcesJar, classifier: "src"
- artifact source: devJar, classifier: "dev"
+ artifact source: usesShadowedDependencies.toBoolean() ? shadowJar : jar, classifier: ""
+ if(!noPublishedSources) {
+ artifact source: sourcesJar, classifier: "src"
+ }
+ artifact source: usesShadowedDependencies.toBoolean() ? shadowDevJar : devJar, classifier: "dev"
if (apiPackage) {
artifact source: apiJar, classifier: "api"
}
- groupId = System.getenv("ARTIFACT_GROUP_ID") ?: group
+ groupId = System.getenv("ARTIFACT_GROUP_ID") ?: "com.github.GTNewHorizons"
artifactId = System.getenv("ARTIFACT_ID") ?: project.name
- version = System.getenv("ARTIFACT_VERSION") ?: project.version
+ // Using the identified version, not project.version as it has the prepended 1.7.10
+ version = System.getenv("RELEASE_VERSION") ?: identifiedVersion
}
}
-
+
repositories {
maven {
- String owner = System.getenv("REPOSITORY_OWNER") ?: "Unknown"
- String repositoryName = System.getenv("REPOSITORY_NAME") ?: "Unknown"
- String githubRepositoryUrl = "https://maven.pkg.github.com/$owner/$repositoryName"
- name = "GitHubPackages"
- url = githubRepositoryUrl
+ url = "http://jenkins.usrv.eu:8081/nexus/content/repositories/releases"
credentials {
- username = System.getenv("GITHUB_ACTOR") ?: "NONE"
- password = System.getenv("GITHUB_TOKEN") ?: "NONE"
+ username = System.getenv("MAVEN_USER") ?: "NONE"
+ password = System.getenv("MAVEN_PASSWORD") ?: "NONE"
}
}
}
@@ -537,7 +543,7 @@ if (isNewBuildScriptVersionAvailable(projectDir.toString())) {
}
static URL availableBuildScriptUrl() {
- new URL("https://raw.githubusercontent.com/SinTh0r4s/ExampleMod1.7.10/main/build.gradle")
+ new URL("https://raw.githubusercontent.com/GTNewHorizons/ExampleMod1.7.10/main/build.gradle")
}
boolean performBuildScriptUpdate(String projectDir) {
@@ -579,7 +585,7 @@ configure(updateBuildScript) {
def checkPropertyExists(String propertyName) {
if (project.hasProperty(propertyName) == false) {
- throw new GradleException("This project requires a property \"" + propertyName + "\"! Please add it your \"gradle.properties\". You can find all properties and their description here: https://github.com/SinTh0r4s/ExampleMod1.7.10/blob/main/gradle.properties")
+ throw new GradleException("This project requires a property \"" + propertyName + "\"! Please add it your \"gradle.properties\". You can find all properties and their description here: https://github.com/GTNewHorizons/ExampleMod1.7.10/blob/main/gradle.properties")
}
}
diff --git a/dependencies.gradle b/dependencies.gradle
index 03225221e5..b1229651d8 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -1,14 +1,55 @@
// Add your dependencies here
dependencies {
+
+ compile("com.github.GTNewHorizons:GT5-Unofficial:5.09.40.18:dev")
+ compile("com.github.GTNewHorizons:StructureLib:1.0.14:dev")
+ compile("net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev")
- compile("com.github.GTNewHorizons:GT5-Unofficial:master-SNAPSHOT:dev")
- compile("com.github.GTNewHorizons:bartworks:master-SNAPSHOT:dev")
- compile("com.github.GTNewHorizons:TecTech:master-SNAPSHOT:dev")
- compile("com.github.GTNewHorizons:ThaumicTinkerer:master-SNAPSHOT:dev")
-
- compile("thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev")
- compile("org.joml:joml:1.9.18")
-
- runtime("com.github.GTNewHorizons:Baubles:master-SNAPSHOT:dev")
+ compile("com.github.GTNewHorizons:NotEnoughItems:2.1.22-GTNH:dev")
+ compileOnly("com.github.GTNewHorizons:EnderCore:0.2.6:dev") {
+ transitive = false
+ }
+
+ compile("com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-70-GTNH:dev")
+
+ compile("com.github.GTNewHorizons:bartworks:0.5.34:dev")
+ compileOnly("com.github.GTNewHorizons:GTplusplus:1.7.24:dev") {
+ transitive = false
+ }
+ compileOnly("com.github.GTNewHorizons:AppleCore:3.1.6:dev") {
+ transitive = false
+ }
+ compile("com.github.GTNewHorizons:TecTech:4.10.15:dev")
+ compile("com.github.GTNewHorizons:ForestryMC:4.4.3:dev")
+ compileOnly("com.github.GTNewHorizons:Railcraft:9.13.5:dev") {
+ transitive = false
+ }
+ compileOnly("com.github.GTNewHorizons:EnderIO:2.3.1.27:dev") {
+ transitive = false
+ }
+ compileOnly("com.mod-buildcraft:buildcraft:7.1.23:dev") {
+ transitive = false
+ }
+
+ //compile("com.github.GTNewHorizons:GalacticGregGT5:1.0.7:dev")
+ //compile("com.github.GTNewHorizons:TecTech:4.10.15:dev")
+ //compile("com.github.GTNewHorizons:Galacticraft:3.0.36-GTNH:dev")
+
+ compile("com.github.GTNewHorizons:CodeChickenLib:1.1.5.1:dev")
+ compile("com.github.GTNewHorizons:CodeChickenCore:1.1.3:dev")
+
+ runtime("com.github.GTNewHorizons:Baubles:1.0.1.14:dev")
+ runtime("com.github.GTNewHorizons:Yamcl:0.5.82:dev")
+
+ compileOnly("com.github.GTNewHorizons:ExtraCells2:2.5.4:dev") {
+ transitive = false
+ }
+
+/* compileOnly("com.github.GTNewHorizons:Avaritia:1.22) {
+ setChanging(true)
+ }*/
+ compile files('Thaumcraft-1.7.10-4.2.3.5.deobf.jar')
+ //compile files('ThaumicTinkerer-1.7.10-2.5-4-dev.jar')
+
}
diff --git a/gradle.properties b/gradle.properties
index 5f2b64d81a..da177a8d4c 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -32,6 +32,9 @@ gradleTokenModName = GRADLETOKEN_MODNAME
gradleTokenVersion = GRADLETOKEN_VERSION
gradleTokenGroupName = GRADLETOKEN_GROUPNAME
+systemProp.org.gradle.internal.http.connectionTimeout=180000
+systemProp.org.gradle.internal.http.socketTimeout=180000
+
# In case your mod provides an API for other mods to implement you may declare its package here. Otherwise, you can
# leave this property empty.
# Example value: apiPackage = api + modGroup = com.myname.mymodid -> com.myname.mymodid.api
diff --git a/libs/GoodGenerator-0.3.4-dev.jar b/libs/GoodGenerator-0.3.4-dev.jar
new file mode 100644
index 0000000000..50eb58565f
--- /dev/null
+++ b/libs/GoodGenerator-0.3.4-dev.jar
Binary files differ
diff --git a/libs/Thaumcraft-1.7.10-4.2.3.5.deobf.jar b/libs/Thaumcraft-1.7.10-4.2.3.5.deobf.jar
new file mode 100644
index 0000000000..e11a630ea4
--- /dev/null
+++ b/libs/Thaumcraft-1.7.10-4.2.3.5.deobf.jar
Binary files differ
diff --git a/repositories.gradle b/repositories.gradle
index 8434ee11b3..7dc8d31382 100644
--- a/repositories.gradle
+++ b/repositories.gradle
@@ -1,6 +1,15 @@
// Add any additional repositories for your dependencies here
repositories {
+ jcenter()
+ maven { // EnderIO & EnderCore
+ name = 'tterrag Repo'
+ url = "http://maven.tterrag.com"
+ }
+ maven {
+ name = "CodeChicken"
+ url = "http://chickenbones.net/maven/"
+ }
maven {
name = "sponge"
url = "https://repo.spongepowered.org/repository/maven-public"
@@ -13,10 +22,30 @@ repositories {
artifact()
}
}
+
+ maven {
+ url = "http://jenkins.usrv.eu:8081/nexus/content/groups/public/"
+ }
+
maven {
url "https://cursemaven.com"
}
maven {
url = "https://jitpack.io"
}
+ ivy {
+ name = "gtnh_download_source"
+ artifactPattern("http://downloads.gtnewhorizons.com/Mods_for_Jenkins/[module]-[revision].[ext]")
+ }
+ maven {
+ name = "UsrvDE/GTNH"
+ url = "http://jenkins.usrv.eu:8081/nexus/content/repositories/releases/"
+ }
+ maven {
+ name = "gt"
+ url = "https://gregtech.overminddl1.com/"
+ }
+ maven {
+ url = "http://www.ryanliptak.com/maven/"
+ }
}
diff --git a/src/main/java/com/elisis/gtnhlanth/GTNHLanthanides.java b/src/main/java/com/elisis/gtnhlanth/GTNHLanthanides.java
index 6f22d039e5..5e900fdf55 100644
--- a/src/main/java/com/elisis/gtnhlanth/GTNHLanthanides.java
+++ b/src/main/java/com/elisis/gtnhlanth/GTNHLanthanides.java
@@ -1,7 +1,11 @@
package com.elisis.gtnhlanth;
+import java.util.logging.Logger;
+
import com.elisis.gtnhlanth.common.CommonProxy;
+import com.elisis.gtnhlanth.common.register.ItemList;
import com.elisis.gtnhlanth.common.register.WerkstoffMaterialPool;
+import com.elisis.gtnhlanth.loader.RecipeLoader;
import com.github.bartimaeusnek.bartworks.API.WerkstoffAdderRegistry;
import cpw.mods.fml.common.Mod;
@@ -13,9 +17,13 @@ import cpw.mods.fml.common.event.FMLPreInitializationEvent;
@Mod(modid = Tags.MODID, version = Tags.VERSION, name = Tags.MODNAME,
dependencies = "required-after:IC2; " + "required-after:gregtech; "
+ + "required-after:bartworks; "
+ + "required-after:GoodGenerator; "
)
public class GTNHLanthanides {
+ public static Logger LOG = Logger.getLogger("GTNH:Lanthanides");
+
@Mod.Instance
public static GTNHLanthanides instance;
@@ -25,6 +33,7 @@ public class GTNHLanthanides {
@EventHandler
public static void preInit(FMLPreInitializationEvent e) {
WerkstoffAdderRegistry.addWerkstoffAdder(new WerkstoffMaterialPool());
+ ItemList.register();
proxy.preInit(e);
}
@@ -35,6 +44,8 @@ public class GTNHLanthanides {
@EventHandler
public static void postInit(FMLPostInitializationEvent e) {
+ RecipeLoader.loadGeneral();
+ RecipeLoader.loadLanthanideRecipes();
proxy.postInit(e);
}
diff --git a/src/main/java/com/elisis/gtnhlanth/common/CommonProxy.java b/src/main/java/com/elisis/gtnhlanth/common/CommonProxy.java
index c99a60fd79..a1022cf699 100644
--- a/src/main/java/com/elisis/gtnhlanth/common/CommonProxy.java
+++ b/src/main/java/com/elisis/gtnhlanth/common/CommonProxy.java
@@ -1,7 +1,5 @@
package com.elisis.gtnhlanth.common;
-import java.util.logging.Logger;
-
import cpw.mods.fml.common.event.FMLInitializationEvent;
import cpw.mods.fml.common.event.FMLPostInitializationEvent;
import cpw.mods.fml.common.event.FMLPreInitializationEvent;
diff --git a/src/main/java/com/elisis/gtnhlanth/common/register/ItemList.java b/src/main/java/com/elisis/gtnhlanth/common/register/ItemList.java
new file mode 100644
index 0000000000..9f70c70d78
--- /dev/null
+++ b/src/main/java/com/elisis/gtnhlanth/common/register/ItemList.java
@@ -0,0 +1,19 @@
+package com.elisis.gtnhlanth.common.register;
+
+import com.elisis.gtnhlanth.common.tileentity.Digester;
+
+import net.minecraft.item.ItemStack;
+
+public final class ItemList {
+
+ public static ItemStack DIGESTER;
+
+ public static void register() {
+
+ ItemList.DIGESTER = new Digester(10500, "Digester", "Digester").getStackForm(1L);
+
+ }
+
+
+
+}
diff --git a/src/main/java/com/elisis/gtnhlanth/common/register/WerkstoffMaterialPool.java b/src/main/java/com/elisis/gtnhlanth/common/register/WerkstoffMaterialPool.java
index ec8bb8cbbf..dca342fded 100644
--- a/src/main/java/com/elisis/gtnhlanth/common/register/WerkstoffMaterialPool.java
+++ b/src/main/java/com/elisis/gtnhlanth/common/register/WerkstoffMaterialPool.java
@@ -3,6 +3,7 @@ package com.elisis.gtnhlanth.common.register;
import static com.github.bartimaeusnek.bartworks.util.BW_Util.subscriptNumbers;
import com.github.bartimaeusnek.bartworks.system.material.Werkstoff;
+import com.github.bartimaeusnek.bartworks.system.material.Werkstoff.GenerationFeatures;
import gregtech.api.enums.TextureSet;
@@ -12,6 +13,28 @@ public class WerkstoffMaterialPool implements Runnable {
private static final int offsetID = 11_000;
//Misc.
+ public static final Werkstoff Hafnium = new Werkstoff(
+ new short[] {232, 224, 219},
+ "Hafnium",
+ subscriptNumbers("Hf"),
+ new Werkstoff.Stats(),
+ Werkstoff.Types.COMPOUND,
+ new Werkstoff.GenerationFeatures().disable().onlyDust().addMetalItems().enforceUnification(), //Perhaps use hafnia liquid in elemental hafnium synthesis
+ offsetID,
+ TextureSet.SET_DULL
+ );
+
+ public static final Werkstoff LowPurityHafnium = new Werkstoff(
+ new short[] {240, 223, 208},
+ "Low-Purity Hafnium",
+ subscriptNumbers("??Hf??"),
+ new Werkstoff.Stats(),
+ Werkstoff.Types.COMPOUND,
+ new Werkstoff.GenerationFeatures().disable().onlyDust(), //Perhaps use hafnia liquid in elemental hafnium synthesis
+ offsetID + 1,
+ TextureSet.SET_DULL
+ );
+
public static final Werkstoff Hafnia = new Werkstoff(
new short[] {247, 223, 203},
"Hafnia",
@@ -19,10 +42,122 @@ public class WerkstoffMaterialPool implements Runnable {
new Werkstoff.Stats(),
Werkstoff.Types.COMPOUND,
new Werkstoff.GenerationFeatures().disable().onlyDust(), //Perhaps use hafnia liquid in elemental hafnium synthesis
- offsetID,
+ offsetID + 2,
+ TextureSet.SET_DULL
+ );
+
+ public static final Werkstoff HafniumTetrachloride = new Werkstoff(
+ new short[] {238, 247, 249},
+ "Hafnium Tetrachloride",
+ subscriptNumbers("HfCl4"),
+ new Werkstoff.Stats(),
+ Werkstoff.Types.COMPOUND,
+ new Werkstoff.GenerationFeatures().disable().onlyDust(),
+ offsetID + 3,
TextureSet.SET_DULL
);
+ public static final Werkstoff HafniumTetrachlorideSolution = new Werkstoff(
+ new short[] {238, 247, 249},
+ "Hafnium Tetrachloride Solution",
+ subscriptNumbers("HfCl4"),
+ new Werkstoff.Stats(),
+ Werkstoff.Types.COMPOUND,
+ new Werkstoff.GenerationFeatures().disable().addCells(),
+ offsetID + 4,
+ TextureSet.SET_FLUID
+ );
+
+ public static final Werkstoff HafniumIodide = new Werkstoff(
+ new short[] {216, 60, 1},
+ "Hafnium Iodide",
+ subscriptNumbers("HfI4"),
+ new Werkstoff.Stats(),
+ Werkstoff.Types.COMPOUND,
+ new Werkstoff.GenerationFeatures().disable().onlyDust(),
+ offsetID + 5,
+ TextureSet.SET_DULL
+ );
+
+ public static final Werkstoff HafniumRunoff = new Werkstoff(
+ new short[] {74, 65, 42}, //Literally the statistically ugliest colour
+ "Hafnium Runoff",
+ subscriptNumbers("??????"),
+ new Werkstoff.Stats(),
+ Werkstoff.Types.COMPOUND,
+ new Werkstoff.GenerationFeatures().disable().onlyDust(),
+ offsetID + 6,
+ TextureSet.SET_DULL
+ );
+
+ public static final Werkstoff Zirconium = new Werkstoff(
+ new short[] {225,230,225},
+ "Zirconium",
+ subscriptNumbers("Zr"),
+ new Werkstoff.Stats(),
+ Werkstoff.Types.COMPOUND,
+ new Werkstoff.GenerationFeatures().disable().addMetalItems().enforceUnification(),
+ offsetID + 7,
+ TextureSet.SET_DULL
+
+ );
+
+ public static final Werkstoff Zirconia = new Werkstoff(
+ new short[] {177,152,101},
+ "Zirconia",
+ subscriptNumbers("ZrO2"),
+ new Werkstoff.Stats(),
+ Werkstoff.Types.COMPOUND,
+ new Werkstoff.GenerationFeatures().disable().onlyDust(),
+ offsetID + 8,
+ TextureSet.SET_DULL
+
+ );
+
+ public static final Werkstoff ZirconiumTetrachloride = new Werkstoff(
+ new short[] {179, 164, 151},
+ "Zirconium Tetrachloride",
+ subscriptNumbers("ZrCl4"),
+ new Werkstoff.Stats(),
+ Werkstoff.Types.COMPOUND,
+ new Werkstoff.GenerationFeatures().disable().onlyDust(),
+ offsetID + 9,
+ TextureSet.SET_DULL
+ );
+
+ public static final Werkstoff ZirconiumTetrachlorideSolution = new Werkstoff(
+ new short[] {179, 164, 151},
+ "Zirconium Tetrachloride Solution",
+ subscriptNumbers("ZrCl4"),
+ new Werkstoff.Stats(),
+ Werkstoff.Types.COMPOUND,
+ new Werkstoff.GenerationFeatures().disable().addCells(), //Blast Furnace needs liquid input because it can't do 3 item inputs so have a shitty material
+ offsetID + 10,
+ TextureSet.SET_FLUID
+ );
+
+ public static final Werkstoff HafniaZirconiaBlend = new Werkstoff(
+ new short[] {247, 223, 203},
+ "Hafnia-Zirconia Blend", // Maybe Hafnon??
+ subscriptNumbers("??HfZr??"),
+ new Werkstoff.Stats(),
+ Werkstoff.Types.COMPOUND,
+ new Werkstoff.GenerationFeatures().disable().onlyDust(),
+ offsetID + 11,
+ TextureSet.SET_DULL
+ );
+
+ public static final Werkstoff Iodine = new Werkstoff(
+ new short[] {171, 40, 175},
+ "Iodine",
+ subscriptNumbers("I"),
+ new Werkstoff.Stats(),
+ Werkstoff.Types.COMPOUND,
+ new Werkstoff.GenerationFeatures().disable().addCells().enforceUnification(),
+ offsetID + 12,
+ TextureSet.SET_FLUID
+ );
+
//Lanthanide Line
public static final Werkstoff MuddyRareEarthSolution = new Werkstoff(
@@ -32,7 +167,7 @@ public class WerkstoffMaterialPool implements Runnable {
new Werkstoff.Stats(),
Werkstoff.Types.MIXTURE,
new Werkstoff.GenerationFeatures().disable().addCells(),
- offsetID + 1,
+ offsetID + 14,
TextureSet.SET_FLUID
);
@@ -43,7 +178,7 @@ public class WerkstoffMaterialPool implements Runnable {
new Werkstoff.Stats(),
Werkstoff.Types.MIXTURE,
new Werkstoff.GenerationFeatures().disable().addCells(),
- offsetID + 2,
+ offsetID + 15,
TextureSet.SET_FLUID
);
@@ -54,11 +189,223 @@ public class WerkstoffMaterialPool implements Runnable {
new Werkstoff.Stats(),
Werkstoff.Types.MIXTURE,
new Werkstoff.GenerationFeatures().disable().addCells(),
- offsetID + 3,
+ offsetID + 16,
TextureSet.SET_FLUID
);
-
+ public static final Werkstoff NitratedRareEarthConcentrate = new Werkstoff(
+ new short[] {250, 223, 173},
+ "Nitrated Rare Earth Concentrate",
+ subscriptNumbers("??LaNd??"),
+ new Werkstoff.Stats(),
+ Werkstoff.Types.MIXTURE,
+ new Werkstoff.GenerationFeatures().disable().addCells(),
+ offsetID + 17,
+ TextureSet.SET_FLUID
+ );
+
+ public static final Werkstoff NitricLeachedConcentrate = new Werkstoff(
+ new short[] {244, 202, 22},
+ "Nitric Leached Concentrate",
+ subscriptNumbers("??LaNd??"),
+ new Werkstoff.Stats(),
+ Werkstoff.Types.MIXTURE,
+ new Werkstoff.GenerationFeatures().disable().addCells(),
+ offsetID + 18,
+ TextureSet.SET_FLUID
+ );
+
+ public static final Werkstoff MonaziteSulfate = new Werkstoff(
+ new short[] {152, 118, 84},
+ "Monazite Sulfate",
+ subscriptNumbers("??CeEu??"),
+ new Werkstoff.Stats(),
+ Werkstoff.Types.MIXTURE,
+ new Werkstoff.GenerationFeatures().disable().onlyDust(),
+ offsetID + 19,
+ TextureSet.SET_DULL
+ );
+
+ public static final Werkstoff AcidicMonazitePowder = new Werkstoff(
+ new short[] {50, 23, 77},
+ "Acidic Monazite Powder",
+ subscriptNumbers("????"),
+ new Werkstoff.Stats(),
+ Werkstoff.Types.MIXTURE,
+ new Werkstoff.GenerationFeatures().disable().onlyDust(),
+ offsetID + 20,
+ TextureSet.SET_DULL
+ );
+
+ public static final Werkstoff RareEarthFiltrate = new Werkstoff(
+ new short[] {72, 60, 50},
+ "Rare Earth Filtrate",
+ subscriptNumbers("????"),
+ new Werkstoff.Stats(),
+ Werkstoff.Types.MIXTURE,
+ new Werkstoff.GenerationFeatures().disable().onlyDust(),
+ offsetID + 21,
+ TextureSet.SET_DULL
+ );
+
+ public static final Werkstoff NeutralizedRareEarthFiltrate = new Werkstoff(
+ new short[] {50, 23, 77},
+ "Neutralized Rare Earth Filtrate",
+ subscriptNumbers("????"),
+ new Werkstoff.Stats(),
+ Werkstoff.Types.MIXTURE,
+ new Werkstoff.GenerationFeatures().disable().onlyDust(),
+ offsetID + 22,
+ TextureSet.SET_DULL
+ );
+
+ public static final Werkstoff RareEarthHydroxideConcentrate = new Werkstoff(
+ new short[] {193, 154, 107},
+ "Rare Earth Hydroxide Concentrate",
+ subscriptNumbers("????"),
+ new Werkstoff.Stats(),
+ Werkstoff.Types.MIXTURE,
+ new Werkstoff.GenerationFeatures().disable().onlyDust(),
+ offsetID + 23,
+ TextureSet.SET_DULL
+ );
+
+ public static final Werkstoff DriedRareEarthConcentrate = new Werkstoff(
+ new short[] {250, 214, 165},
+ "Dried Rare Earth Concentrate",
+ subscriptNumbers("????"),
+ new Werkstoff.Stats(),
+ Werkstoff.Types.MIXTURE,
+ new Werkstoff.GenerationFeatures().disable().onlyDust(),
+ offsetID + 24,
+ TextureSet.SET_DULL
+ );
+
+ public static final Werkstoff CeriumDioxide = new Werkstoff(
+ new short[] {255, 255, 255},
+ "Cerium Dioxide",
+ subscriptNumbers("CeO2"),
+ new Werkstoff.Stats(),
+ Werkstoff.Types.MIXTURE,
+ new Werkstoff.GenerationFeatures().disable().onlyDust().enforceUnification(),
+ offsetID + 25,
+ TextureSet.SET_DULL
+ );
+
+ public static final Werkstoff CeriumChloride = new Werkstoff(
+ new short[] {255, 255, 255},
+ "Cerium Chloride",
+ subscriptNumbers("CeCl3"),
+ new Werkstoff.Stats(),
+ Werkstoff.Types.COMPOUND,
+ new Werkstoff.GenerationFeatures().disable().onlyDust(),
+ offsetID + 26,
+ TextureSet.SET_DULL
+ );
+
+ public static final Werkstoff CeriumOxalate = new Werkstoff(
+ new short[] {255, 255, 224},
+ "Cerium Oxalate",
+ subscriptNumbers("Ce2(C2O4)3"),
+ new Werkstoff.Stats(),
+ Werkstoff.Types.COMPOUND,
+ new Werkstoff.GenerationFeatures().disable().onlyDust(),
+ offsetID + 27,
+ TextureSet.SET_DULL
+ );
+
+ public static final Werkstoff CeriumIIIOxide = new Werkstoff(
+ new short[] {255, 255, 102},
+ "Cerium (III) Oxide",
+ subscriptNumbers("Ce2O3"),
+ new Werkstoff.Stats(),
+ Werkstoff.Types.COMPOUND,
+ new Werkstoff.GenerationFeatures().disable().onlyDust(),
+ offsetID + 28,
+ TextureSet.SET_DULL
+ );
+
+ public static final Werkstoff CeriumRichMixture = new Werkstoff(
+ new short[] {244, 164, 96},
+ "Cerium-Rich Mixture",
+ subscriptNumbers("??Ce??"),
+ new Werkstoff.Stats(),
+ Werkstoff.Types.COMPOUND,
+ new Werkstoff.GenerationFeatures().disable().onlyDust(),
+ offsetID + 29,
+ TextureSet.SET_DULL
+ );
+
+ public static final Werkstoff CooledRareEarthConcentrate = new Werkstoff(
+ new short[] {250, 214, 165},
+ "Cooled Rare Earth Concentrate",
+ subscriptNumbers("????"),
+ new Werkstoff.Stats(),
+ Werkstoff.Types.MIXTURE,
+ new Werkstoff.GenerationFeatures().disable().onlyDust(),
+ offsetID + 30,
+ TextureSet.SET_DULL
+ );
+
+ public static final Werkstoff RarerEarthSediment = new Werkstoff(
+ new short[] {250, 214, 165},
+ "Rarer Earth Sediment",
+ subscriptNumbers("????"),
+ new Werkstoff.Stats(),
+ Werkstoff.Types.MIXTURE,
+ new Werkstoff.GenerationFeatures().disable().onlyDust(),
+ offsetID + 31,
+ TextureSet.SET_DULL
+ );
+
+ public static final Werkstoff HeterogenousHalogenicRareEarthMixture = new Werkstoff(
+ new short[] {250, 214, 165},
+ "Heterogenous Halogenic Rare Earth Mixture",
+ subscriptNumbers("????"),
+ new Werkstoff.Stats(),
+ Werkstoff.Types.MIXTURE,
+ new Werkstoff.GenerationFeatures().disable().onlyDust(),
+ offsetID + 32,
+ TextureSet.SET_DULL
+ );
+
+ public static final Werkstoff SaturatedRareEarthMixture = new Werkstoff(
+ new short[] {250, 214, 165},
+ "Saturated Rare Earth Mixture",
+ subscriptNumbers("????"),
+ new Werkstoff.Stats(),
+ Werkstoff.Types.MIXTURE,
+ new Werkstoff.GenerationFeatures().disable().onlyDust(),
+ offsetID + 33,
+ TextureSet.SET_DULL
+ );
+
+ public static final Werkstoff SamaricResidue = new Werkstoff(
+ new short[] {248, 243, 231},
+ "Samaric Residue",
+ subscriptNumbers("??SmGd??"),
+ new Werkstoff.Stats(),
+ Werkstoff.Types.MIXTURE,
+ new Werkstoff.GenerationFeatures().disable().onlyDust(),
+ offsetID + 34,
+ TextureSet.SET_DULL
+ );
+
+ public static final Werkstoff MonaziteResidue = new Werkstoff(
+ new short[] {64, 69, 62},
+ subscriptNumbers("??ZrHfTh??"),
+ new Werkstoff.Stats(),
+ Werkstoff.Types.MIXTURE,
+ new Werkstoff.GenerationFeatures().disable().onlyDust(),
+ offsetID + 35,
+ TextureSet.SET_DULL
+ );
+
+
+
+
+
+
@Override
public void run() {
diff --git a/src/main/java/com/elisis/gtnhlanth/common/tileentity/Digester.java b/src/main/java/com/elisis/gtnhlanth/common/tileentity/Digester.java
new file mode 100644
index 0000000000..655408550c
--- /dev/null
+++ b/src/main/java/com/elisis/gtnhlanth/common/tileentity/Digester.java
@@ -0,0 +1,206 @@
+package com.elisis.gtnhlanth.common.tileentity;
+
+import static com.elisis.gtnhlanth.util.DescTextLocalization.BLUEPRINT_INFO;
+import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock;
+import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofChain;
+import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose;
+import static gregtech.api.util.GT_StructureUtility.ofCoil;
+import static gregtech.api.util.GT_StructureUtility.ofHatchAdder;
+
+import java.util.ArrayList;
+
+import org.lwjgl.input.Keyboard;
+
+import com.elisis.gtnhlanth.loader.RecipeAdder;
+import com.elisis.gtnhlanth.util.DescTextLocalization;
+import com.github.technus.tectech.thing.metaTileEntity.multi.base.GT_GUIContainer_MultiMachineEM;
+import com.github.technus.tectech.thing.metaTileEntity.multi.base.GT_MetaTileEntity_MultiblockBase_EM;
+import com.gtnewhorizon.structurelib.alignment.constructable.IConstructable;
+import com.gtnewhorizon.structurelib.structure.IStructureDefinition;
+import com.gtnewhorizon.structurelib.structure.StructureDefinition;
+
+import gregtech.api.GregTech_API;
+import gregtech.api.enums.HeatingCoilLevel;
+import gregtech.api.enums.Textures;
+import gregtech.api.interfaces.IIconContainer;
+import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
+import g