aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGlease <4586901+Glease@users.noreply.github.com>2023-04-02 00:02:47 +0800
committerGitHub <noreply@github.com>2023-04-01 18:02:47 +0200
commit6b77557e0e87cf5afd9ebd3985323ff1249e615c (patch)
tree36474042ef39f863aedc007eab81a9b09cc7aa78
parent655cc902d3df19a1ac2bfaa38cc928ed629d0171 (diff)
downloadGT5-Unofficial-6b77557e0e87cf5afd9ebd3985323ff1249e615c.tar.gz
GT5-Unofficial-6b77557e0e87cf5afd9ebd3985323ff1249e615c.tar.bz2
GT5-Unofficial-6b77557e0e87cf5afd9ebd3985323ff1249e615c.zip
Recipe Adder v2 (#1770)
* add everything * fixes * migrate plasma forge recipes * syntax update * make chances array length differ a fatal error * time constants + long eut overload * migrate extruder recipes * migrate electromagnetic separator recipes * migrate wiremill recipes * migrate forming press recipes * migrate bender recipes * add doc to clarify the three itemInputs * migrate alloy smelter recipes * migrate arc furnace recipes * added ModIDs enum * sort ModIDs * migrate autoclave recipes * migrated some assembler recipes * split a bit more assembler recipes * migrate canner recipes * migrate brewing recipes * ic2 mod check in canner recipes * use some loops to reduce the amount of recipes to migrate * add requested helper methods * migrate vacuum freezer recipes * migrate thermal centrifuge recipes * format smelter recipes only, doesn't go through normal GT recipe * migrated slicer recipes * migrated sifter recipes * Use proper enum now * remove more constants * cleaning cutting recipes before migration * remove tons of dead commented recipes * migrate pyrolyse recipes * use ModIDs enum more * migrate printer recipes * add a less confusing way to specify value of specialItem * migrate pulverizer recipes * less confusing special item specification * even more ModIDs enum usage * fix auto * import confusing Minecraft enum value with Minecraft client object * migrated blast furnace recipes * migrated Centrifuge recipes * migrated assembler recipes * migrated implosion compressor recipes * migrated extractor recipes * migrated mixer recipes * remove useless code * mgrate universal chemical recipes * refactor chemical recipes * migrate single block only chem reactor recipes * migrate chem reactor recipes * reworked circuit assembler recipes before migrating them * migrated circuit assembler recipes * fix merge conflict for assembler recipes * remove leftover of the merge conflicts * fix weird translation glitch * example of assembly line recipe using RA2 * bugfixes for assline * remove specialValue usage in blast furnace recipes * fix more bugs * add nooptimize to where it make sense * add recipe descriptions * Materials.Superconductor -> Materials.SuperconductorUHV * remove useless Object creations * remove explicit long casts * migrate assemblyline recipes * migrate chemical bath recipes * migrate compressor recipes * move smelting recipe where it belongs * migrated cutting machine recipes * migrated fermenter recipes (unhide alcohol) * remove explicit long casts * migrate fluid canner recipes * migrate fluid heater recipes * migrated fusion recipes * migrated lathe recipes * migrated laser engraver recipes * migrated packager recipes * migrated forge hammer recipes * migrated TPM recipes * exit early and reduced indents * migrated fluid extractor recipes * migrated fluid solidifier recipes * migrated electrolyzer recipes * migrated crop processing recipes * migrated default polymerization recipes * migrate distillery recipes * migrate matter amplifier recipes * add metadata identifier for fusion ignition threshold * migrate fuel recipes * update bs (cherry picked from commit c2d931c9b6caa0376e9d50591894cd849021104d) * spotless (cherry picked from commit 1060f5357fb95e28bfae1f052025f55dabc21a0f) * guard against null itemstacks * wrong translation * fix empty arrays being accessed * add 0 duration and 0 EU/t for fuel recipes * fix typo in matter amplifier recipes * spotless apply --------- Co-authored-by: boubou19 <miisterunknown@gmail.com> Co-authored-by: Martin Robertz <dream-master@gmx.net>
-rw-r--r--build.gradle67
-rw-r--r--docs/RecipeBuilder.md60
-rw-r--r--docs/ResourcePacks_Guide.md (renamed from ResourcePacks_Guide.md)0
-rw-r--r--gradle/wrapper/gradle-wrapper.jarbin61574 -> 61608 bytes
-rw-r--r--gradle/wrapper/gradle-wrapper.properties2
-rw-r--r--src/main/java/gregtech/GT_Mod.java17
-rw-r--r--src/main/java/gregtech/api/GregTech_API.java4
-rw-r--r--src/main/java/gregtech/api/enums/GT_Values.java4
-rw-r--r--src/main/java/gregtech/api/enums/Materials.java8
-rw-r--r--src/main/java/gregtech/api/enums/ModIDs.java84
-rw-r--r--src/main/java/gregtech/api/enums/SoundResource.java48
-rw-r--r--src/main/java/gregtech/api/interfaces/IGT_RecipeMap.java64
-rw-r--r--src/main/java/gregtech/api/interfaces/internal/IGT_RecipeAdder.java3
-rw-r--r--src/main/java/gregtech/api/items/GT_MetaGenerated_Item.java4
-rw-r--r--src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Cable.java9
-rw-r--r--src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine_GT_Recipe.java6
-rw-r--r--src/main/java/gregtech/api/util/GT_BaseCrop.java4
-rw-r--r--src/main/java/gregtech/api/util/GT_ModReference.java29
-rw-r--r--src/main/java/gregtech/api/util/GT_Recipe.java601
-rw-r--r--src/main/java/gregtech/api/util/GT_RecipeBuilder.java713
-rw-r--r--src/main/java/gregtech/api/util/GT_RecipeConstants.java258
-rw-r--r--src/main/java/gregtech/api/util/GT_RecipeMapUtil.java196
-rw-r--r--src/main/java/gregtech/api/util/GT_Utility.java83
-rw-r--r--src/main/java/gregtech/common/GT_Client.java4
-rw-r--r--src/main/java/gregtech/common/GT_Proxy.java121
-rw-r--r--src/main/java/gregtech/common/GT_RecipeAdder.java27
-rw-r--r--src/main/java/gregtech/common/blocks/GT_Block_Metal.java5
-rw-r--r--src/main/java/gregtech/common/blocks/GT_Block_Ores_Abstract.java5
-rw-r--r--src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java4
-rw-r--r--src/main/java/gregtech/common/items/ItemComb.java93
-rw-r--r--src/main/java/gregtech/common/items/ItemDrop.java8
-rw-r--r--src/main/java/gregtech/common/items/ItemPropolis.java6
-rw-r--r--src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_MagicalEnergyAbsorber.java5
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Disassembler.java10
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Scanner.java28
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PyrolyseOven.java7
-rw-r--r--src/main/java/gregtech/common/tools/GT_Tool_Scoop.java6
-rw-r--r--src/main/java/gregtech/loaders/materialprocessing/ProcessingModSupport.java30
-rw-r--r--src/main/java/gregtech/loaders/misc/GT_Achievements.java5
-rw-r--r--src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java506
-rw-r--r--src/main/java/gregtech/loaders/misc/GT_Bees.java30
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingCrafting.java4
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingSlab.java5
-rw-r--r--src/main/java/gregtech/loaders/postload/GT_CraftingRecipeLoader.java310
-rw-r--r--src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java33
-rw-r--r--src/main/java/gregtech/loaders/postload/GT_PostLoad.java63
-rw-r--r--src/main/java/gregtech/loaders/postload/chains/GT_NaniteChain.java40
-rw-r--r--src/main/java/gregtech/loaders/postload/chains/GT_PCBFactoryRecipes.java9
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/AlloySmelterRecipes.java80
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/ArcFurnaceRecipes.java623
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/AssemblerRecipes.java9167
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/AssemblyLineRecipes.java1307
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/AutoclaveRecipes.java299
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/BenderRecipes.java418
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/BlastFurnaceRecipes.java1133
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/BreweryRecipes.java719
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/CannerRecipes.java89
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/CentrifugeRecipes.java1740
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/ChemicalBathRecipes.java974
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/ChemicalRecipes.java8436
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/CircuitAssemblerRecipes.java538
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/CompressorRecipes.java174
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/CropProcessingRecipes.java135
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/CuttingRecipes.java432
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/DistilleryRecipes.java1009
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/ElectrolyzerRecipes.java587
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/ElectromagneticSeparatorRecipes.java16
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/ExtractorRecipes.java138
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/ExtruderRecipes.java23
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/FermenterRecipes.java401
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/FluidCannerRecipes.java79
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/FluidExtractorRecipes.java775
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/FluidHeaterRecipes.java91
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/FluidSolidifierRecipes.java751
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/ForgeHammerRecipes.java161
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/FormingPressRecipes.java258
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/FuelRecipes.java91
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/FusionReactorRecipes.java433
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/ImplosionCompressorRecipes.java72
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/LaserEngraverRecipes.java62
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/LatheRecipes.java34
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/MatterAmplifierRecipes.java14
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/MixerRecipes.java2953
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/NEIHiding.java30
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/OreDictUnification.java6
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/PackagerRecipes.java52
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/PlasmaForgeRecipes.java46
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/PrinterRecipes.java60
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/Pulverizer.java801
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/PyrolyseRecipes.java181
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/SifterRecipes.java39
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/SlicerRecipes.java43
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/SmelterRecipes.java20
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/ThaumcraftRecipes.java1887
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/ThermalCentrifugeRecipes.java21
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/TranscendentPlasmaMixerRecipes.java108
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/VacuumFreezerRecipes.java503
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/WiremillRecipes.java183
-rw-r--r--src/main/java/gregtech/loaders/preload/GT_Loader_ItemData.java4
-rw-r--r--src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java60
-rw-r--r--src/main/java/gregtech/loaders/preload/GT_Loader_OreDictionary.java52
-rw-r--r--src/main/java/gregtech/loaders/preload/GT_PreLoad.java25
-rw-r--r--src/main/java/gregtech/nei/IMCForNEI.java5
-rw-r--r--src/main/java/gregtech/nei/dumper/GregTechIDDumper.java5
104 files changed, 20420 insertions, 21551 deletions
diff --git a/build.gradle b/build.gradle
index 927ed20fdb..055dcee435 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,4 +1,4 @@
-//version: 1678003329
+//version: 1680120787
/*
DO NOT CHANGE THIS FILE!
Also, you may replace this file at any time if there is an update available.
@@ -65,7 +65,7 @@ plugins {
id 'org.jetbrains.kotlin.jvm' version '1.8.0' apply false
id 'org.jetbrains.kotlin.kapt' version '1.8.0' apply false
id 'com.google.devtools.ksp' version '1.8.0-1.0.9' apply false
- id 'org.ajoberstar.grgit' version '4.1.1' // 4.1.1 is the last jvm8 supporting version ,unused, available for addon.gradle
+ id 'org.ajoberstar.grgit' version '4.1.1' // 4.1.1 is the last jvm8 supporting version, unused, available for addon.gradle
id 'com.github.johnrengelman.shadow' version '7.1.2' apply false
id 'com.palantir.git-version' version '0.13.0' apply false // 0.13.0 is the last jvm8 supporting version
id 'de.undercouch.download' version '5.3.0'
@@ -73,7 +73,7 @@ plugins {
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
- id 'com.gtnewhorizons.retrofuturagradle' version '1.2.3'
+ id 'com.gtnewhorizons.retrofuturagradle' version '1.2.4'
}
boolean settingsupdated = verifySettingsGradle()
settingsupdated = verifyGitAttributes() || settingsupdated
@@ -160,6 +160,14 @@ java {
}
}
+tasks.withType(JavaCompile).configureEach {
+ options.encoding = "UTF-8"
+}
+
+tasks.withType(ScalaCompile).configureEach {
+ options.encoding = "UTF-8"
+}
+
pluginManager.withPlugin('org.jetbrains.kotlin.jvm') {
// If Kotlin is enabled in the project
kotlin {
@@ -397,8 +405,6 @@ minecraft {
extraRunJvmArguments.add("-ea:${modGroup}")
if (usesMixins.toBoolean() || forceEnableMixins.toBoolean()) {
- extraTweakClasses.add("org.sponge