diff options
author | Raven Szewczyk <git@kubasz.xyz> | 2022-06-12 11:38:54 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-06-12 12:38:54 +0200 |
commit | 1cbf1083f829c02be13d9b7d376713639a10a3f7 (patch) | |
tree | 22687c99ecae032b5c967bb2723c1a01523b0943 | |
parent | 55fe05ad0cb8748f33b6698759e4f6966406a4e0 (diff) | |
download | GT5-Unofficial-1cbf1083f829c02be13d9b7d376713639a10a3f7.tar.gz GT5-Unofficial-1cbf1083f829c02be13d9b7d376713639a10a3f7.tar.bz2 GT5-Unofficial-1cbf1083f829c02be13d9b7d376713639a10a3f7.zip |
Fix missing methods for the MTE precursor (#211)
* Fix missing methods for the MTE precursor
* Update dependencies
-rw-r--r-- | build.gradle | 50 | ||||
-rw-r--r-- | dependencies.gradle | 8 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/tileentities/base/TileEntityBase.java | 25 |
3 files changed, 54 insertions, 29 deletions
diff --git a/build.gradle b/build.gradle index c8cf37cd1f..c09bee22f3 100644 --- a/build.gradle +++ b/build.gradle @@ -1,4 +1,4 @@ -//version: 1644894948 +//version: 1652851397 /* DO NOT CHANGE THIS FILE! @@ -6,12 +6,11 @@ Also, you may replace this file at any time if there is an update available. Please check https://github.com/GTNewHorizons/ExampleMod1.7.10/blob/main/build.gradle for updates. */ -import org.gradle.internal.logging.text.StyledTextOutput -import org.gradle.internal.logging.text.StyledTextOutputFactory -import org.gradle.internal.logging.text.StyledTextOutput.Style import com.github.jengelman.gradle.plugins.shadow.tasks.ConfigureShadowRelocation import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar +import org.gradle.internal.logging.text.StyledTextOutput.Style +import org.gradle.internal.logging.text.StyledTextOutputFactory import java.util.concurrent.TimeUnit @@ -45,13 +44,14 @@ plugins { id 'eclipse' id 'scala' id 'maven-publish' - id 'org.jetbrains.kotlin.jvm' version '1.5.30' apply false - id 'org.jetbrains.kotlin.kapt' version '1.5.30' apply false + id 'org.jetbrains.kotlin.jvm' version '1.5.30' apply false + id 'org.jetbrains.kotlin.kapt' version '1.5.30' apply false + id 'com.google.devtools.ksp' version '1.5.30-1.0.0' apply false id 'org.ajoberstar.grgit' version '4.1.1' id 'com.github.johnrengelman.shadow' version '4.0.4' - id 'com.palantir.git-version' version '0.13.0' apply false + id 'com.palantir.git-version' version '0.13.0' apply false id 'de.undercouch.download' version '5.0.1' - id 'com.github.gmazzo.buildconfig' version '3.0.3' apply false + id 'com.github.gmazzo.buildconfig' version '3.0.3' apply false } if (project.file('.git/HEAD').isFile()) { @@ -104,6 +104,7 @@ checkPropertyExists("usesShadowedDependencies") checkPropertyExists("developmentEnvironmentUserName") boolean noPublishedSources = project.findProperty("noPublishedSources") ? project.noPublishedSources.toBoolean() : false +boolean usesMixinDebug = project.findProperty('usesMixinDebug') ?: project.usesMixins.toBoolean() String javaSourceDir = "src/main/java/" String scalaSourceDir = "src/main/scala/" @@ -214,13 +215,17 @@ else { def arguments = [] def jvmArguments = [] -if(usesMixins.toBoolean()) { +if (usesMixins.toBoolean()) { arguments += [ - "--tweakClass org.spongepowered.asm.launch.MixinTweaker" - ] - jvmArguments += [ - "-Dmixin.debug.countInjections=true", "-Dmixin.debug.verbose=true", "-Dmixin.debug.export=true" + "--tweakClass org.spongepowered.asm.launch.MixinTweaker" ] + if (usesMixinDebug.toBoolean()) { + jvmArguments += [ + "-Dmixin.debug.countInjections=true", + "-Dmixin.debug.verbose=true", + "-Dmixin.debug.export=true" + ] + } } minecraft { @@ -312,18 +317,23 @@ def refMap = "${tasks.compileJava.temporaryDir}" + File.separator + mixingConfig def mixinSrg = "${tasks.reobf.temporaryDir}" + File.separator + "mixins.srg" task generateAssets { - if(usesMixins.toBoolean()) { - getFile("/src/main/resources/mixins." + modId + ".json").text = """{ + if (usesMixins.toBoolean()) { + def mixinConfigFile = getFile("/src/main/resources/mixins." + modId + ".json"); + if (!mixinConfigFile.exists()) { + mixinConfigFile.text = """{ "required": true, "minVersion": "0.7.11", "package": "${modGroup}.${mixinsPackage}", "plugin": "${modGroup}.${mixinPlugin}", "refmap": "${mixingConfigRefMap}", "target": "@env(DEFAULT)", - "compatibilityLevel": "JAVA_8" + "compatibilityLevel": "JAVA_8", + "mixins": [], + "client": [], + "server": [] } - """ + } } } @@ -462,7 +472,7 @@ def getManifestAttributes() { } task sourcesJar(type: Jar) { - from (sourceSets.main.allJava) + from (sourceSets.main.allSource) from (file("$projectDir/LICENSE")) getArchiveClassifier().set('sources') } @@ -517,7 +527,7 @@ task devJar(type: Jar) { } task apiJar(type: Jar) { - from (sourceSets.main.allJava) { + from (sourceSets.main.allSource) { include modGroup.toString().replaceAll("\\.", "/") + "/" + apiPackage.toString().replaceAll("\\.", "/") + '/**' } @@ -559,7 +569,7 @@ publishing { artifact source: shadowJar, classifier: "" } if(!noPublishedSources) { - artifact source: sourcesJar, classifier: "src" + artifact source: sourcesJar, classifier: "sources" } artifact source: usesShadowedDependencies.toBoolean() ? shadowDevJar : devJar, classifier: "dev" if (apiPackage) { diff --git a/dependencies.gradle b/dependencies.gradle index 6a3de4e0ee..85c7e88dab 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -1,7 +1,7 @@ dependencies { - compile('com.github.GTNewHorizons:GT5-Unofficial:5.09.40.47:dev') - compile('com.github.GTNewHorizons:StructureLib:1.0.15:dev') - compile('com.github.GTNewHorizons:NotEnoughItems:2.2.12-GTNH:dev') + compile('com.github.GTNewHorizons:GT5-Unofficial:5.09.40.49:dev') + compile('com.github.GTNewHorizons:StructureLib:1.0.16:dev') + compile('com.github.GTNewHorizons:NotEnoughItems:2.2.15-GTNH:dev') compile('com.github.GTNewHorizons:CodeChickenCore:1.1.4:dev') compile('com.github.GTNewHorizons:CodeChickenLib:1.1.5.3:dev') compile('net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev') @@ -9,7 +9,7 @@ dependencies { compile('curse.maven:cofh-core-69162:2388751') compile('curse.maven:advsolar-362768:2885953') - compileOnly('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-77-GTNH:dev') {transitive=false} + compileOnly('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-85-GTNH:dev') {transitive=false} compileOnly('com.github.GTNewHorizons:Baubles:1.0.1.14:dev') {transitive=false} compileOnly('com.github.GTNewHorizons:ForestryMC:4.4.6:dev') {transitive=false} compileOnly('com.github.GTNewHorizons:Railcraft:9.13.6:dev') {transitive=false} diff --git a/src/main/java/gtPlusPlus/core/tileentities/base/TileEntityBase.java b/src/main/java/gtPlusPlus/core/tileentities/base/TileEntityBase.java index dba96c6ebc..5b67a318be 100644 --- a/src/main/java/gtPlusPlus/core/tileentities/base/TileEntityBase.java +++ b/src/main/java/gtPlusPlus/core/tileentities/base/TileEntityBase.java @@ -13,6 +13,7 @@ import gregtech.api.util.GT_CoverBehavior; import gregtech.api.util.GT_LanguageManager; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Utility; +import gregtech.api.util.ISerializableObject; import net.minecraft.block.Block; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; @@ -866,16 +867,30 @@ public class TileEntityBase extends TileEntity implements ILazyCoverable, IGregT @Override public void setCoverIDAtSide(byte aSide, int aID) { - if (aSide >= 0 && aSide < 6) { - mCoverSides[aSide] = aID; - mCoverData[aSide] = 0; - mCoverBehaviors[aSide] = GregTech_API.getCoverBehavior(aID); + if (setCoverIDAtSideNoUpdate(aSide, aID)) { issueCoverUpdate(aSide); issueBlockUpdate(); } } - @Override + @Override + public boolean setCoverIDAtSideNoUpdate(byte aSide, int aID) { + if (aSide >= 0 && aSide < 6) { + mCoverSides[aSide] = aID; + mCoverData[aSide] = 0; + mCoverBehaviors[aSide] = GregTech_API.getCoverBehavior(aID); + return true; + } + return false; + } + + @Override + public void setCoverIdAndDataAtSide(byte aSide, int aId, ISerializableObject aData) { + setCoverIDAtSide(aSide, aId); + setCoverDataAtSide(aSide, aData); + } + + @Override public void setCoverItemAtSide(byte aSide, ItemStack aCover) { GregTech_API.getCoverBehavior(aCover).placeCover(aSide, aCover, this); } |