diff options
5 files changed, 49 insertions, 65 deletions
diff --git a/build.gradle b/build.gradle index 66fbf65955..9ceb5abe8c 100644 --- a/build.gradle +++ b/build.gradle @@ -1,4 +1,4 @@ -//version: 1669171387 +//version: 1671313514 /* DO NOT CHANGE THIS FILE! Also, you may replace this file at any time if there is an update available. @@ -31,7 +31,7 @@ buildscript { url 'https://maven.minecraftforge.net' } maven { - // GTNH ForgeGradle Fork + // GTNH ForgeGradle and ASM Fork name = "GTNH Maven" url = "http://jenkins.usrv.eu:8081/nexus/content/groups/public/" } @@ -45,7 +45,9 @@ buildscript { } } dependencies { - classpath 'net.minecraftforge.gradle:ForgeGradle:1.2.11' + //Overwrite the current ASM version to fix shading newer than java 8 applicatations. + classpath 'org.ow2.asm:asm-debug-all-custom:5.0.3' + classpath 'net.minecraftforge.gradle:ForgeGradle:1.2.13' } } plugins { @@ -278,7 +280,9 @@ minecraft { runDir = 'run' if (replaceGradleTokenInFile) { - replaceIn replaceGradleTokenInFile + for (f in replaceGradleTokenInFile.split(',')) { + replaceIn f + } if (gradleTokenModId) { replace gradleTokenModId, modId } @@ -330,6 +334,12 @@ repositories { name = "GTNH Maven" url = "http://jenkins.usrv.eu:8081/nexus/content/groups/public/" } + if (usesMixinDebug.toBoolean()) { + maven { + name = "Fabric Maven" + url = "https://maven.fabricmc.net/" + } + } } } @@ -338,10 +348,13 @@ dependencies { annotationProcessor('org.ow2.asm:asm-debug-all:5.0.3') annotationProcessor('com.google.guava:guava:24.1.1-jre') annotationProcessor('com.google.code.gson:gson:2.8.6') - annotationProcessor('com.gtnewhorizon:gtnhmixins:2.1.0:processor') + annotationProcessor('com.gtnewhorizon:gtnhmixins:2.1.3:processor') + if (usesMixinDebug.toBoolean()) { + runtimeOnly('org.jetbrains:intellij-fernflower:1.2.1.16') + } } if (usesMixins.toBoolean() || forceEnableMixins.toBoolean()) { - compile('com.gtnewhorizon:gtnhmixins:2.1.0') + compile('com.gtnewhorizon:gtnhmixins:2.1.3') } } @@ -694,7 +707,7 @@ if (modrinthProjectId.size() != 0 && System.getenv("MODRINTH_TOKEN") != null) { } } if (usesMixins.toBoolean()) { - addModrinthDep("required", "version", "gtnhmixins") + addModrinthDep("required", "project", "gtnhmixins") } tasks.modrinth.dependsOn(build) tasks.publish.dependsOn(tasks.modrinth) diff --git a/dependencies.gradle b/dependencies.gradle index aabf469408..9dd8392b2d 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -1,7 +1,8 @@ // Add your dependencies here dependencies { - shadowImplementation('com.github.GTNewHorizons:AVRcore:master-SNAPSHOT') + shadowImplementation('com.github.GTNewHorizons:AVRcore:1.0.1') + compile('com.github.GTNewHorizons:GT5-Unofficial:5.09.41.145:dev') compile("com.github.GTNewHorizons:ModularUI:1.0.16:dev") {transitive=false} compile('com.github.GTNewHorizons:Yamcl:0.5.84:dev') compile('com.github.GTNewHorizons:NotEnoughItems:2.3.7-GTNH:dev') diff --git a/repositories.gradle b/repositories.gradle index 887a6ff8c8..9d72b53b8e 100644 --- a/repositories.gradle +++ b/repositories.gradle @@ -34,7 +34,4 @@ repositories { } } - maven { - url 'https://jitpack.io' - } } diff --git a/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java b/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java index 23fb49153b..a42fddbfd6 100644 --- a/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java +++ b/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java @@ -4956,7 +4956,7 @@ public class DreamCraftRecipeLoader { GT_OreDictUnificator.get(OrePrefixes.foil, Materials.ElectrumFlux, 64L), GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.Bedrockium, 7L) }, - new FluidStack[] {fluid_0, fluid_1, fluid_2}, + new FluidStack[] {fluid_0, fluid_1}, ItemList.Sensor_UHV.get(1L), crafting_time_in_ticks, crafting_eu_per_tick); @@ -4987,7 +4987,7 @@ public class DreamCraftRecipeLoader { GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Neutronium, 64L), GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.Bedrockium, 8L) }, - new FluidStack[] {fluid_0, fluid_1, fluid_2}, + new FluidStack[] {fluid_0, fluid_1}, ItemList.Field_Generator_UHV.get(1L), crafting_time_in_ticks, crafting_eu_per_tick); @@ -5448,7 +5448,7 @@ public class DreamCraftRecipeLoader { new Object[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.TranscendentMetal, 1L), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.TranscendentMetal, 6L), - ItemList.Gravistar.get(32), + ItemList.Gravistar.get(16L), ItemList.Emitter_UIV.get(4L), new Object[] {OrePrefixes.circuit.get(Materials.Piko), 4}, GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Infinity, 64L), @@ -5691,7 +5691,7 @@ public class DreamCraftRecipeLoader { new Object[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.SpaceTime, 1L), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.SpaceTime, 6L), - ItemList.Gravistar.get(8L), + ItemList.Gravistar.get(32L), ItemList.Emitter_UMV.get(4L), new Object[] {OrePrefixes.circuit.get(Materials.Quantum), 4}, GT_ModHandler.getModItem("miscutils", "itemFineWireHypogen", 64, 0), diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_MetaTileEntity_MultiblockBase_EM.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_MetaTileEntity_MultiblockBase_EM.java index 09c0c19735..ae1f7fbf56 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_MetaTileEntity_MultiblockBase_EM.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_MetaTileEntity_MultiblockBase_EM.java @@ -20,6 +20,7 @@ import com.github.technus.tectech.thing.gui.TecTechUITextures; import com.github.technus.tectech.thing.metaTileEntity.hatch.*; import com.github.technus.tectech.thing.metaTileEntity.multi.base.render.TT_RenderedExtendedFacingTexture; import com.github.technus.tectech.util.TT_Utility; +import com.google.common.collect.Iterables; import com.gtnewhorizon.structurelib.StructureLibAPI; import com.gtnewhorizon.structurelib.alignment.IAlignment; import com.gtnewhorizon.structurelib.alignment.IAlignmentLimits; @@ -2188,56 +2189,28 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM extends GT_MetaTileEnt extraExplosions_EM(); GT_Pollution.addPollution(getBaseMetaTileEntity(), 600000); mInventory[1] = null; - for (MetaTileEntity tTileEntity : mInputBusses) { - tTileEntity.getBaseMetaTileEntity().doExplosion(V[9]); - } - for (MetaTileEntity tTileEntity : mOutputBusses) { - tTileEntity.getBaseMetaTileEntity().doExplosion(V[9]); - } - for (MetaTileEntity tTileEntity : mInputHatches) { - tTileEntity.getBaseMetaTileEntity().doExplosion(V[9]); - } - for (MetaTileEntity tTileEntity : mOutputHatches) { - tTileEntity.getBaseMetaTileEntity().doExplosion(V[9]); - } - for (MetaTileEntity tTileEntity : mDynamoHatches) { - tTileEntity.getBaseMetaTileEntity().doExplosion(V[14]); - } - for (MetaTileEntity tTileEntity : mMufflerHatches) { - tTileEntity.getBaseMetaTileEntity().doExplosion(V[9]); - } - for (MetaTileEntity tTileEntity : mEnergyHatches) { - tTileEntity.getBaseMetaTileEntity().doExplosion(V[14]); - } - for (MetaTileEntity tTileEntity : mMaintenanceHatches) { - tTileEntity.getBaseMetaTileEntity().doExplosion(V[9]); - } - for (MetaTileEntity tTileEntity : eParamHatches) { - tTileEntity.getBaseMetaTileEntity().doExplosion(V[9]); - } - for (MetaTileEntity tTileEntity : eInputHatches) { - tTileEntity.getBaseMetaTileEntity().doExplosion(V[14]); - } - for (MetaTileEntity tTileEntity : eOutputHatches) { - tTileEntity.getBaseMetaTileEntity().doExplosion(V[14]); - } - for (MetaTileEntity tTileEntity : eMufflerHatches) { - tTileEntity.getBaseMetaTileEntity().doExplosion(V[14]); - } - for (MetaTileEntity tTileEntity : eEnergyMulti) { - tTileEntity.getBaseMetaTileEntity().doExplosion(V[14]); - } - for (MetaTileEntity tTileEntity : eUncertainHatches) { - tTileEntity.getBaseMetaTileEntity().doExplosion(V[9]); - } - for (MetaTileEntity tTileEntity : eDynamoMulti) { - tTileEntity.getBaseMetaTileEntity().doExplosion(V[14]); - } - for (MetaTileEntity tTileEntity : eInputData) { - tTileEntity.getBaseMetaTileEntity().doExplosion(V[9]); - } - for (MetaTileEntity tTileEntity : eOutputData) { - tTileEntity.getBaseMetaTileEntity().doExplosion(V[9]); + Iterable<MetaTileEntity> allHatches = Iterables.concat( + mInputBusses, + mOutputBusses, + mInputHatches, + mOutputHatches, + mDynamoHatches, + mMufflerHatches, + mEnergyHatches, + mMaintenanceHatches, + eParamHatches, + eInputHatches, + eOutputHatches, + eMufflerHatches, + eEnergyMulti, + eUncertainHatches, + eDynamoMulti, + eInputData, + eOutputData); + for (MetaTileEntity tTileEntity : allHatches) { + if (tTileEntity != null && tTileEntity.getBaseMetaTileEntity() != null) { + tTileEntity.getBaseMetaTileEntity().doExplosion(V[9]); + } } getBaseMetaTileEntity().doExplosion(V[15]); } |