diff options
| author | RaitGamerGR <70205464+RaitGamerGR@users.noreply.github.com> | 2023-03-17 20:31:18 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-17 18:31:18 +0100 |
| commit | 6e8b6a853ec50f82cde66be9a212d4649ceafde9 (patch) | |
| tree | 6f41476c6e78580ae4c4db2719670d58a81fedb3 | |
| parent | 8aabd943aba44117f0e04ac8f951345eb488bced (diff) | |
| download | GT5-Unofficial-6e8b6a853ec50f82cde66be9a212d4649ceafde9.tar.gz GT5-Unofficial-6e8b6a853ec50f82cde66be9a212d4649ceafde9.tar.bz2 GT5-Unofficial-6e8b6a853ec50f82cde66be9a212d4649ceafde9.zip | |
Changed Basic and added Advanced UUMatter recipes (#571)
* Changed Basic and added Advanced UUMatter recipes
Changed Matter Fabrication CPU recipes for high tiers. This needed for avoiding Fabrication CPU spam and decrease lags.
* bs+sa
---------
Co-authored-by: Martin Robertz <dream-master@gmx.net>
| -rw-r--r-- | build.gradle | 8 | ||||
| -rw-r--r-- | gradle/wrapper/gradle-wrapper.jar | bin | 61574 -> 61608 bytes | |||
| -rw-r--r-- | gradle/wrapper/gradle-wrapper.properties | 2 | ||||
| -rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMassFabricator.java | 38 |
4 files changed, 38 insertions, 10 deletions
diff --git a/build.gradle b/build.gradle index 927ed20fdb..7b1f6c4507 100644 --- a/build.gradle +++ b/build.gradle @@ -1,4 +1,4 @@ -//version: 1678003329 +//version: 1679040806 /* DO NOT CHANGE THIS FILE! Also, you may replace this file at any time if there is an update available. @@ -695,13 +695,13 @@ ext.java17PatchDependenciesCfg = configurations.create("java17PatchDependencies" } dependencies { - def lwjgl3ifyVersion = '1.1.35' + def lwjgl3ifyVersion = '1.2.2' def asmVersion = '9.4' if (modId != 'lwjgl3ify') { java17Dependencies("com.github.GTNewHorizons:lwjgl3ify:${lwjgl3ifyVersion}") } if (modId != 'hodgepodge') { - java17Dependencies('com.github.GTNewHorizons:Hodgepodge:2.0.40') + java17Dependencies('com.github.GTNewHorizons:Hodgepodge:2.1.0') } java17PatchDependencies('net.minecraft:launchwrapper:1.15') {transitive = false} @@ -1204,7 +1204,7 @@ def addCurseForgeRelation(String type, String name) { // Updating -def buildscriptGradleVersion = "8.0.1" +def buildscriptGradleVersion = "8.0.2" tasks.named('wrapper', Wrapper).configure { gradleVersion = buildscriptGradleVersion diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar Binary files differindex 943f0cbfa7..ccebba7710 100644 --- a/gradle/wrapper/gradle-wrapper.jar +++ b/gradle/wrapper/gradle-wrapper.jar diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index fc10b601f7..bdc9a83b1e 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMassFabricator.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMassFabricator.java index cb4643b088..64a161b227 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMassFabricator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMassFabricator.java @@ -73,9 +73,9 @@ public class GregtechIndustrialMassFabricator { null, null, new FluidStack[] { GT_Values.NF }, - new FluidStack[] { Materials.UUMatter.getFluid(1) }, + new FluidStack[] { Materials.UUMatter.getFluid(16) }, 160 * 20, - 256, + 4096, 0); // Basic UUM @@ -85,12 +85,40 @@ public class GregtechIndustrialMassFabricator { new ItemStack[] { GT_Values.NI }, null, null, - new FluidStack[] { Materials.UUAmplifier.getFluid(1) }, - new FluidStack[] { Materials.UUMatter.getFluid(1) }, + new FluidStack[] { Materials.UUAmplifier.getFluid(16) }, + new FluidStack[] { Materials.UUMatter.getFluid(16) }, 40 * 20, - 256, + 4096, 0); + // Advanced UUM + GTPP_Recipe.GTPP_Recipe_Map.sMatterFab2Recipes.add( + new GTPP_Recipe( + false, + new ItemStack[] { CI.getNumberedCircuit(3) }, + new ItemStack[] { GT_Values.NI }, + null, + null, + new FluidStack[] { GT_Values.NF }, + new FluidStack[] { Materials.UUMatter.getFluid(256) }, + 160 * 20, + 65536, + 0)); + + // Advanced UUM + GTPP_Recipe.GTPP_Recipe_Map.sMatterFab2Recipes.add( + new GTPP_Recipe( + false, + new ItemStack[] { CI.getNumberedCircuit(4) }, + new ItemStack[] { GT_Values.NI }, + null, + null, + new FluidStack[] { Materials.UUAmplifier.getFluid(256) }, + new FluidStack[] { Materials.UUMatter.getFluid(256) }, + 40 * 20, + 65536, + 0)); + GTPP_Recipe.GTPP_Recipe_Map.sMatterFab2Recipes.add(generateUUM_LV); GTPP_Recipe.GTPP_Recipe_Map.sMatterFab2Recipes.add(generateUUMFromUUA_LV); |