aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--build.gradle10
-rw-r--r--dependencies.gradle13
-rw-r--r--repositories.gradle20
-rw-r--r--src/main/java/common/recipeLoaders/Unpackager.java167
4 files changed, 103 insertions, 107 deletions
diff --git a/build.gradle b/build.gradle
index 6243482331..78ed8d44f0 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,4 +1,4 @@
-//version: 1683056771
+//version: 1683563728
/*
DO NOT CHANGE THIS FILE!
Also, you may replace this file at any time if there is an update available.
@@ -72,7 +72,7 @@ plugins {
id 'com.gtnewhorizons.retrofuturagradle' version '1.3.7'
}
-print("You might want to check out './gradlew :faq' if your build fails.")
+print("You might want to check out './gradlew :faq' if your build fails.\n")
boolean settingsupdated = verifySettingsGradle()
settingsupdated = verifyGitAttributes() || settingsupdated
@@ -222,6 +222,8 @@ if (enableModernJavaSyntax.toBoolean()) {
dependencies {
annotationProcessor 'com.github.bsideup.jabel:jabel-javac-plugin:1.0.0'
+ // workaround for https://github.com/bsideup/jabel/issues/174
+ annotationProcessor 'net.java.dev.jna:jna-platform:5.13.0'
compileOnly('com.github.bsideup.jabel:jabel-javac-plugin:1.0.0') {
transitive = false // We only care about the 1 annotation class
}
@@ -1264,7 +1266,9 @@ tasks.register('faq') {
print("If your build fails to fetch dependencies, they might have been deleted and replaced by newer " +
"versions.\nCheck if the versions you try to fetch are still on the distributing sites.\n" +
"The links can be found in repositories.gradle and build.gradle:repositories, " +
- "not build.gradle:buildscript.repositories - this one is for gradle plugin metadata.")
+ "not build.gradle:buildscript.repositories - this one is for gradle plugin metadata.\n\n" +
+ "If your build fails to recognize the syntax of new Java versions, enable Jabel in your " +
+ "gradle.properties. See how it's done in GTNH ExampleMod/gradle.properties.")
}
}
diff --git a/dependencies.gradle b/dependencies.gradle
index d12f950e7d..b2b3064df8 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -1,14 +1,9 @@
// Add your dependencies here
dependencies {
- compile 'com.github.GTNewHorizons:GT5-Unofficial:5.09.43.12:dev'
- compile 'com.github.GTNewHorizons:TecTech:5.2.5:dev'
- compile 'com.github.GTNewHorizons:bartworks:0.7.3:dev'
- compile 'com.github.GTNewHorizons:StructureLib:1.2.7:dev'
- compile 'com.github.GTNewHorizons:ThaumicTinkerer:2.7.0:dev'
+ api('com.github.GTNewHorizons:GT5-Unofficial:5.09.43.24:dev')
+ api('com.github.GTNewHorizons:bartworks:0.7.6:dev')
+ api('com.github.GTNewHorizons:ThaumicTinkerer:2.7.0:dev')
- compile 'thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev'
- compileOnly 'org.joml:joml:1.10.2'
-
- runtimeOnly 'com.github.GTNewHorizons:Baubles:1.0.1.16:dev'
+ compileOnly('org.joml:joml:1.10.2')
}
diff --git a/repositories.gradle b/repositories.gradle
index 6d164c8f44..c227b16ec2 100644
--- a/repositories.gradle
+++ b/repositories.gradle
@@ -1,24 +1,4 @@
// Add any additional repositories for your dependencies here
repositories {
- maven {
- name = 'GTNH Maven'
- url = 'http://jenkins.usrv.eu:8081/nexus/content/groups/public/'
- allowInsecureProtocol
- }
- maven {
- name = 'ic2'
- url = 'https://maven.ic2.player.to/'
- url ='https://maven2.ic2.player.to/'
- metadataSources {
- mavenPom()
- artifact()
- }
- }
- maven {
- url 'https://cursemaven.com'
- content {
- includeGroup 'curse.maven'
- }
- }
}
diff --git a/src/main/java/common/recipeLoaders/Unpackager.java b/src/main/java/common/recipeLoaders/Unpackager.java
index f1f6a71963..35a0fe9571 100644
--- a/src/main/java/common/recipeLoaders/Unpackager.java
+++ b/src/main/java/common/recipeLoaders/Unpackager.java
@@ -18,64 +18,73 @@ public class Unpackager implements Runnable {
// TFFT Recycling
{
- GT_Values.RA.stdBuilder()
- .itemInputs(
- new ItemStack(Blocks.tfftStorageField, 1, 1),
- GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.CrudeSteel, 1))
- .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plate, Materials.CrudeSteel, 6)).noFluidInputs()
- .noFluidOutputs().duration(5 * SECONDS).eut(TierEU.RECIPE_HV).addTo(sUnboxinatorRecipes);
-
- GT_Values.RA.stdBuilder()
- .itemInputs(new ItemStack(Blocks.tfftStorageField, 1, 2), ItemList.Casing_Tank_1.get(1))
- .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plate, Materials.EnergeticSilver, 6))
+ GT_Values.RA.stdBuilder().itemInputs(new ItemStack(Blocks.tfftStorageField, 1, 1))
+ .itemOutputs(
+ GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.CrudeSteel, 1),
+ GT_OreDictUnificator.get(OrePrefixes.plate, Materials.CrudeSteel, 6))
.noFluidInputs().noFluidOutputs().duration(5 * SECONDS).eut(TierEU.RECIPE_HV)
.addTo(sUnboxinatorRecipes);
- GT_Values.RA.stdBuilder()
- .itemInputs(new ItemStack(Blocks.tfftStorageField, 1, 3), ItemList.Casing_Tank_3.get(1))
- .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plate, Materials.VividAlloy, 6)).noFluidInputs()
- .noFluidOutputs().duration(5 * SECONDS).eut(TierEU.RECIPE_HV).addTo(sUnboxinatorRecipes);
+ GT_Values.RA.stdBuilder().itemInputs(new ItemStack(Blocks.tfftStorageField, 1, 2))
+ .itemOutputs(
+ ItemList.Casing_Tank_1.get(1),
+ GT_OreDictUnificator.get(OrePrefixes.plate, Materials.EnergeticSilver, 6))
+ .noFluidInputs().noFluidOutputs().duration(5 * SECONDS).eut(TierEU.RECIPE_HV)
+ .addTo(sUnboxinatorRecipes);
- GT_Values.RA.stdBuilder()
- .itemInputs(new ItemStack(Blocks.tfftStorageField, 1, 4), ItemList.Casing_Tank_5.get(1))
- .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Enderium, 6)).noFluidInputs()
- .noFluidOutputs().duration(5 * SECONDS).eut(TierEU.RECIPE_HV).addTo(sUnboxinatorRecipes);
+ GT_Values.RA.stdBuilder().itemInputs(new ItemStack(Blocks.tfftStorageField, 1, 3))
+ .itemOutputs(
+ ItemList.Casing_Tank_3.get(1),
+ GT_OreDictUnificator.get(OrePrefixes.plate, Materials.VividAlloy, 6))
+ .noFluidInputs().noFluidOutputs().duration(5 * SECONDS).eut(TierEU.RECIPE_HV)
+ .addTo(sUnboxinatorRecipes);
- GT_Values.RA.stdBuilder()
- .itemInputs(new ItemStack(Blocks.tfftStorageField, 1, 5), ItemList.Casing_Tank_7.get(1))
- .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plate, Materials.CrystallineAlloy, 6))
+ GT_Values.RA.stdBuilder().itemInputs(new ItemStack(Blocks.tfftStorageField, 1, 4))
+ .itemOutputs(
+ ItemList.Casing_Tank_5.get(1),
+ GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Enderium, 6))
.noFluidInputs().noFluidOutputs().duration(5 * SECONDS).eut(TierEU.RECIPE_HV)
.addTo(sUnboxinatorRecipes);
- GT_Values.RA.stdBuilder()
- .itemInputs(new ItemStack(Blocks.tfftStorageField, 1, 6), ItemList.Casing_Tank_7.get(4))
+ GT_Values.RA.stdBuilder().itemInputs(new ItemStack(Blocks.tfftStorageField, 1, 5))
.itemOutputs(
+ ItemList.Casing_Tank_7.get(1),
+ GT_OreDictUnificator.get(OrePrefixes.plate, Materials.CrystallineAlloy, 6))
+ .noFluidInputs().noFluidOutputs().duration(5 * SECONDS).eut(TierEU.RECIPE_HV)
+ .addTo(sUnboxinatorRecipes);
+
+ GT_Values.RA.stdBuilder().itemInputs(new ItemStack(Blocks.tfftStorageField, 1, 6))
+ .itemOutputs(
+ ItemList.Casing_Tank_7.get(4),
GT_OreDictUnificator.get(OrePrefixes.plateQuadruple, Materials.CrystallinePinkSlime, 6))
.noFluidInputs().noFluidOutputs().duration(5 * SECONDS).eut(TierEU.RECIPE_HV)
.addTo(sUnboxinatorRecipes);
- GT_Values.RA.stdBuilder()
- .itemInputs(new ItemStack(Blocks.tfftStorageField, 1, 7), ItemList.Casing_Tank_10.get(16))
- .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plateQuadruple, Materials.MelodicAlloy, 6))
+ GT_Values.RA.stdBuilder().itemInputs(new ItemStack(Blocks.tfftStorageField, 1, 7))
+ .itemOutputs(
+ ItemList.Casing_Tank_10.get(16),
+ GT_OreDictUnificator.get(OrePrefixes.plateQuadruple, Materials.MelodicAlloy, 6))
.noFluidInputs().noFluidOutputs().duration(5 * SECONDS).eut(TierEU.RECIPE_HV)
.addTo(sUnboxinatorRecipes);
- GT_Values.RA.stdBuilder()
- .itemInputs(new ItemStack(Blocks.tfftStorageField, 1, 8), ItemList.Quantum_Tank_IV.get(1))
- .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.StellarAlloy, 12))
+ GT_Values.RA.stdBuilder().itemInputs(new ItemStack(Blocks.tfftStorageField, 1, 8))
+ .itemOutputs(
+ ItemList.Quantum_Tank_IV.get(1),
+ GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.StellarAlloy, 12))
.noFluidInputs().noFluidOutputs().duration(5 * SECONDS).eut(TierEU.RECIPE_HV)
.addTo(sUnboxinatorRecipes);
- GT_Values.RA.stdBuilder()
- .itemInputs(new ItemStack(Blocks.tfftStorageField, 1, 9), ItemList.Quantum_Tank_IV.get(4))
+ GT_Values.RA.stdBuilder().itemInputs(new ItemStack(Blocks.tfftStorageField, 1, 9))
.itemOutputs(
+ ItemList.Quantum_Tank_IV.get(4),
GT_OreDictUnificator.get(OrePrefixes.plateDense, MaterialsUEVplus.TranscendentMetal, 12))
.noFluidInputs().noFluidOutputs().duration(5 * SECONDS).eut(TierEU.RECIPE_HV)
.addTo(sUnboxinatorRecipes);
- GT_Values.RA.stdBuilder()
- .itemInputs(new ItemStack(Blocks.tfftStorageField, 1, 10), ItemList.Quantum_Tank_IV.get(16))
- .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plateDense, MaterialsUEVplus.SpaceTime, 12))
+ GT_Values.RA.stdBuilder().itemInputs(new ItemStack(Blocks.tfftStorageField, 1, 10))
+ .itemOutputs(
+ ItemList.Quantum_Tank_IV.get(16),
+ GT_OreDictUnificator.get(OrePrefixes.plateDense, MaterialsUEVplus.SpaceTime, 12))
.noFluidInputs().noFluidOutputs().duration(5 * SECONDS).eut(TierEU.RECIPE_HV)
.addTo(sUnboxinatorRecipes);
@@ -84,58 +93,66 @@ public class Unpackager implements Runnable {
// Capacitor recycling
{
- GT_Values.RA.stdBuilder()
- .itemInputs(
- new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 7),
- GT_ModHandler.getIC2Item("lapotronCrystal", 1L, 26))
- .itemOutputs(new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 6)).noFluidInputs().noFluidOutputs()
- .duration(60 * SECONDS).eut(TierEU.RECIPE_LV).addTo(sUnboxinatorRecipes);
-
- GT_Values.RA.stdBuilder()
- .itemInputs(
- new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 1),
- ItemList.Energy_LapotronicOrb.get(1L))
- .itemOutputs(new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 6)).noFluidInputs().noFluidOutputs()
- .duration(60 * SECONDS).eut(TierEU.RECIPE_LV).addTo(sUnboxinatorRecipes);
-
- GT_Values.RA.stdBuilder()
- .itemInputs(
- new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 2),
- ItemList.Energy_LapotronicOrb2.get(1L))
- .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Osmiridium, 24)).noFluidInputs()
- .noFluidOutputs().duration(60 * SECONDS).eut(TierEU.RECIPE_LV).addTo(sUnboxinatorRecipes);
-
- GT_Values.RA.stdBuilder()
- .itemInputs(new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 3), ItemList.Energy_Module.get(1L))
- .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.screw, Materials.NaquadahAlloy, 24))
+ GT_Values.RA.stdBuilder().itemInputs(new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 7))
+ .itemOutputs(
+ GT_ModHandler.getIC2Item("lapotronCrystal", 1L, 26),
+ new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 6))
.noFluidInputs().noFluidOutputs().duration(60 * SECONDS).eut(TierEU.RECIPE_LV)
.addTo(sUnboxinatorRecipes);
- GT_Values.RA.stdBuilder()
- .itemInputs(new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 4), ItemList.Energy_Cluster.get(1L))
- .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Neutronium, 24)).noFluidInputs()
- .noFluidOutputs().duration(60 * SECONDS).eut(TierEU.RECIPE_LV).addTo(sUnboxinatorRecipes);
+ GT_Values.RA.stdBuilder().itemInputs(new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 1))
+ .itemOutputs(
+ ItemList.Energy_LapotronicOrb.get(1L),
+ new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 6))
+ .noFluidInputs().noFluidOutputs().duration(60 * SECONDS).eut(TierEU.RECIPE_LV)
+ .addTo(sUnboxinatorRecipes);
- GT_Values.RA.stdBuilder()
- .itemInputs(new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 5), ItemList.ZPM3.get(1L))
- .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.screw, Materials.CosmicNeutronium, 24))
+ GT_Values.RA.stdBuilder().itemInputs(new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 2))
+ .itemOutputs(
+ ItemList.Energy_LapotronicOrb2.get(1L),
+ GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Osmiridium, 24))
+ .noFluidInputs().noFluidOutputs().duration(60 * SECONDS).eut(TierEU.RECIPE_LV)
+ .addTo(sUnboxinatorRecipes);
+
+ GT_Values.RA.stdBuilder().itemInputs(new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 3))
+ .itemOutputs(
+ ItemList.Energy_Module.get(1L),
+ GT_OreDictUnificator.get(OrePrefixes.screw, Materials.NaquadahAlloy, 24))
+ .noFluidInputs().noFluidOutputs().duration(60 * SECONDS).eut(TierEU.RECIPE_LV)
+ .addTo(sUnboxinatorRecipes);
+
+ GT_Values.RA.stdBuilder().itemInputs(new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 4))
+ .itemOutputs(
+ ItemList.Energy_Cluster.get(1L),
+ GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Neutronium, 24))
.noFluidInputs().noFluidOutputs().duration(60 * SECONDS).eut(TierEU.RECIPE_LV)
.addTo(sUnboxinatorRecipes);
- GT_Values.RA.stdBuilder()
- .itemInputs(new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 8), ItemList.ZPM4.get(1L))
- .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Infinity, 24)).noFluidInputs()
- .noFluidOutputs().duration(60 * SECONDS).eut(TierEU.RECIPE_LV).addTo(sUnboxinatorRecipes);
+ GT_Values.RA.stdBuilder().itemInputs(new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 5))
+ .itemOutputs(
+ ItemList.ZPM3.get(1L),
+ GT_OreDictUnificator.get(OrePrefixes.screw, Materials.CosmicNeutronium, 24))
+ .noFluidInputs().noFluidOutputs().duration(60 * SECONDS).eut(TierEU.RECIPE_LV)
+ .addTo(sUnboxinatorRecipes);
- GT_Values.RA.stdBuilder()
- .itemInputs(new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 9), ItemList.ZPM5.get(1L))
- .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.screw, MaterialsUEVplus.TranscendentMetal, 24))
+ GT_Values.RA.stdBuilder().itemInputs(new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 8))
+ .itemOutputs(
+ ItemList.ZPM4.get(1L),
+ GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Infinity, 24))
.noFluidInputs().noFluidOutputs().duration(60 * SECONDS).eut(TierEU.RECIPE_LV)
.addTo(sUnboxinatorRecipes);
- GT_Values.RA.stdBuilder()
- .itemInputs(new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 10), ItemList.ZPM6.get(1L))
- .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.screw, MaterialsUEVplus.SpaceTime, 24))
+ GT_Values.RA.stdBuilder().itemInputs(new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 9))
+ .itemOutputs(
+ ItemList.ZPM5.get(1L),
+ GT_OreDictUnificator.get(OrePrefixes.screw, MaterialsUEVplus.TranscendentMetal, 24))
+ .noFluidInputs().noFluidOutputs().duration(60 * SECONDS).eut(TierEU.RECIPE_LV)
+ .addTo(sUnboxinatorRecipes);
+
+ GT_Values.RA.stdBuilder().itemInputs(new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 10))
+ .itemOutputs(
+ ItemList.ZPM6.get(1L),
+ GT_OreDictUnificator.get(OrePrefixes.screw, MaterialsUEVplus.SpaceTime, 24))
.noFluidInputs().noFluidOutputs().duration(60 * SECONDS).eut(TierEU.RECIPE_LV)
.addTo(sUnboxinatorRecipes);
generated by cgit (git 2.46.0) at 2025-03-09 23:36:57 +0000