From 4e4a770bdfa4a301fc7373bbc637f22809905c15 Mon Sep 17 00:00:00 2001 From: Timo Ley Date: Fri, 7 Apr 2023 23:34:49 +0200 Subject: [PATCH] chore: it builds --- build.gradle | 136 +++++++++--------- gradle/wrapper/gradle-wrapper.properties | 2 +- project.properties | 1 - .../api/item/IBreathableArmor.java | 35 +++++ 4 files changed, 103 insertions(+), 71 deletions(-) create mode 100644 src/main/java/micdoodle8/mods/galacticraft/api/item/IBreathableArmor.java diff --git a/build.gradle b/build.gradle index a1f30ac..b69a215 100644 --- a/build.gradle +++ b/build.gradle @@ -3,7 +3,7 @@ buildscript { mavenCentral() maven { name = "forge" - url = "http://files.minecraftforge.net/maven" + url = "https://files.minecraftforge.net/maven" } maven { name = "sonatype" @@ -11,22 +11,55 @@ buildscript { } } dependencies { - classpath 'net.minecraftforge.gradle:ForgeGradle:1.2-SNAPSHOT' + classpath ('com.anatawa12.forge:ForgeGradle:1.2-1.0.+') { + changing = true + } } } repositories { + maven { + url = "https://maven.tilera.xyz/" + } maven { name = "ChickenBones" url = "http://chickenbones.net/maven" } + maven { + name = "ic2" + url = "http://maven.ic2.player.to/" + metadataSources { + artifact() + } + } + maven { + url = "https://maven.thorfusion.com/artifactory/central/" + metadataSources { + artifact() + } + } + maven { + url = "https://s3.tilera.xyz/cdn/minecraft/libs/" + metadataSources { + artifact() + } + } + ivy { + url "https://ci.rs485.network/job/LogisticsPipes-0.9-mc17-bc7" + layout "pattern", { + artifact "[revision]/artifact/build/libs/[artifact]-0.9.3.[revision](-[classifier]).[ext]" + } + metadataSources { + artifact() + } + } } apply plugin: 'forge' apply plugin: 'curseforge' -sourceCompatibility = 1.7 -targetCompatibility = 1.7 +sourceCompatibility = 1.8 +targetCompatibility = 1.8 // define the properties file ext.configFile = file "project.properties" @@ -52,80 +85,45 @@ minecraft { runDir = "run" } -new File(config.libs_dir).mkdirs() -def getLibrary(filename) { - def f = new File(config.libs_dir + filename) - if (!f.exists()) { - new URL(config.apisource_url + filename).withInputStream{ i -> f.withOutputStream{ it << i }} - } - dependencies { - compile files(config.libs_dir + filename) - } -} - dependencies { - compile 'codechicken:CodeChickenCore:1.7.10-1.0.7.47:dev' - compile 'codechicken:NotEnoughItems:1.7.10-1.0.5.120:dev' - compile 'codechicken:CodeChickenLib:1.7.10-1.1.3.140:dev' + implementation 'codechicken:CodeChickenCore:1.7.10-1.0.7.47:dev' + implementation 'codechicken:NotEnoughItems:1.7.10-1.0.5.120:dev' + implementation 'codechicken:CodeChickenLib:1.7.10-1.1.3.140:dev' + implementation "codechicken:ForgeMultipart:1.7.10-1.2.0.347:dev" + implementation "universalelectricity:universalelectricity:5.1.0:deobf" + implementation 'net.industrial-craft:industrialcraft-2:2.2.826-experimental:api' + implementation 'thaumcraft:Thaumcraft:1.7.10-4.2.3.5:deobf' + implementation 'logisticspipes:logisticspipes:128:dev' + implementation 'appeng:appliedenergistics2:rv3-beta-23:dev' + implementation 'mekanism:Mekanism:1.7.10-9.13.1:deobf' + implementation 'buildcraft:buildcraft:7.1.25:dev' + implementation 'cofh:CoFHCore:[1.7.10]3.1.4-329:dev' + implementation 'cofh:ThermalFoundation:[1.7.10]1.2.6-118:dev' + implementation 'cofh:ThermalExpansion:[1.7.10]4.1.5-248:dev' + implementation 'ender:EnderCore:1.7.10-0.2.0.39_beta:dev' + implementation 'ender:EnderIO:1.7.10-2.3.0.429_beta:dev' + implementation 'chisel:Chisel:2.9.5.11:deobf' + implementation 'mods:ExtraCells:1.7.10-2.3.14b197:deobf' + implementation 'mods:MineFactoryReloaded:[1.7.10]2.8.0-104:dev' + implementation 'mods:Numina:0.4.1.106' + implementation 'mods:PlayerAPI:1.7.10-1.4' + implementation 'mods:RenderPlayerAPI:1.7.10-1.4' + implementation 'mods:SmartRender:1.7.10-2.1' + implementation 'mods:forestry_1.7.10:4.2.16.64' + implementation 'mods:Railcraft_1.7.10:9.12.2.0' + implementation 'mods:BluePower:1.7.10-0.2.962:universal' + implementation 'mods:QmunityLib:1.7.10-0.1.114:universal' + implementation 'mods:MrTJPCore:1.1.0.31:universal' + implementation 'mods:ProjectRed:1.7.10-4.7.0pre8.92:Base' } - - -/* -repositories { - maven { - name = "ic2" - url = "http://maven.ic2.player.to/" - } -} - -dependencies { - compile 'net.industrial-craft:industrialcraft-2:2.2.826-experimental:api' -} - - -*/ - - -//getLibrary("CoFHCore-[1.7.10]3.0.3-303-dev.jar") -////getLibrary("industrialcraft-2-2.2.765-experimental-api.jar") -//getLibrary("ThermalExpansion-[1.7.10]4.0.3B1-218-dev.jar") -//getLibrary("GalacticraftCore-Dev-1.7-3.0.12.168.jar") -//getLibrary("Railcraft_1.7.10-9.7.0.0-dev.jar") // delete outdated CoFH API from this jar to run in dev environment -//getLibrary("MineFactoryReloaded-[1.7.10]2.8.0-104-dev.jar") -//getLibrary("forestry_1.7.10-3.6.3.20-api.jar") -//getLibrary("Thaumcraft-deobf-1.7.10-4.2.3.5.jar") -//getLibrary("SmartRender-1.7.10-2.1.jar") // this version is ok to build with, but to run in dev environment, download the SmartMoving zip and use the version from that -//getLibrary("RenderPlayerAPI-1.7.10-1.4.jar") -////getLibrary("appliedenergistics2-rv2-stable-10-dev.jar") -//getLibrary("ExtraCells-deobf-1.7.10-2.3.2b158.jar") // This one may have to be downloaded manually -//getLibrary("buildcraft-7.0.21-dev.jar") -//getLibrary("BluePower-1.7.10-0.2.962-universal.jar") -//getLibrary("EnderIO-1.7.10-2.2.8.381-dev.jar") // May need to delete Mekanism API from this jar to run in dev environment -//getLibrary("Mekanism-1.7.10-8.1.7.252.jar") -//getLibrary("MrTJPCore-1.1.0.31-universal.jar") -//getLibrary("ProjectRed-1.7.10-4.7.0pre8.92-Base.jar") -////getLibrary("Chisel2-2.5.0.43-deobf.jar") -////getLibrary("Chisel-2.9.0.3-deobf.jar") -//getLibrary("compactmachines-1.7.10-1.20-dev.jar") // This is for the personal shrinking device module; needs to be built from source. - processResources { - // this will ensure that this task is redone when the versions change. inputs.property "version", project.version inputs.property "mcversion", project.minecraft.version - // replace stuff in mcmod.info, nothing else - from(sourceSets.main.resources.srcDirs) { - include 'mcmod.info' - - // replace version and mcversion + filesMatching('mcmod.info') { expand 'version':project.version, 'mcversion':project.minecraft.version } - - // copy everything else, thats not the mcmod.info - from(sourceSets.main.resources.srcDirs) { - exclude 'mcmod.info' - } } jar { diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 2cc942d..3e7f9bb 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.0-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.1-bin.zip diff --git a/project.properties b/project.properties index 98d18a5..c193d27 100644 --- a/project.properties +++ b/project.properties @@ -4,4 +4,3 @@ minecraft_version=1.7.10 group_id=net.machinemuse mod_id=ModularPowersuits libs_dir=libs/ -apisource_url=http://machinemuse.minecraftforge.net/ diff --git a/src/main/java/micdoodle8/mods/galacticraft/api/item/IBreathableArmor.java b/src/main/java/micdoodle8/mods/galacticraft/api/item/IBreathableArmor.java new file mode 100644 index 0000000..14afe7b --- /dev/null +++ b/src/main/java/micdoodle8/mods/galacticraft/api/item/IBreathableArmor.java @@ -0,0 +1,35 @@ +package micdoodle8.mods.galacticraft.api.item; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; + +/** + * Implement into Armor items + */ +public interface IBreathableArmor +{ + public enum EnumGearType + { + HELMET, + GEAR, + TANK1, + TANK2 + } + + /** + * @param gearType The gear type to be handled + * @return true if the passed gear type should be handled by this armor item + */ + public boolean handleGearType(EnumGearType gearType); + + /** + * Determines if armor item is currently valid for breathing + * + * @param helmetInSlot The armor itemstack + * @param playerWearing The player wearing the armor + * @param type The oxygen gear type @see EnumGearType + * @return true if this armor item is valid for the provided oxygen gear + * type + */ + public boolean canBreathe(ItemStack helmetInSlot, EntityPlayer playerWearing, EnumGearType type); +} \ No newline at end of file