From b86d0c043aac8ed59d804a2e6e60ff09a9ec1f93 Mon Sep 17 00:00:00 2001 From: SkyyWasTaken Date: Sun, 12 May 2024 19:37:14 -0400 Subject: [PATCH 1/3] Updated build pipeline --- build.gradle | 83 ++++++++++++------------ gradle/wrapper/gradle-wrapper.properties | 2 +- 2 files changed, 44 insertions(+), 41 deletions(-) diff --git a/build.gradle b/build.gradle index adfb232..da686b7 100644 --- a/build.gradle +++ b/build.gradle @@ -1,13 +1,13 @@ buildscript { repositories { - jcenter() - maven { url = "http://files.minecraftforge.net/maven" } + maven { url = "https://maven.minecraftforge.net" } + mavenCentral() } dependencies { - classpath 'net.minecraftforge.gradle:ForgeGradle:2.3-SNAPSHOT' + classpath 'net.minecraftforge.gradle:ForgeGradle:4.+' } } -apply plugin: 'net.minecraftforge.gradle.forge' +apply plugin: 'net.minecraftforge.gradle' //Only edit below this line, the above code adds and enables the necessary things for Forge to be setup. @@ -15,59 +15,62 @@ version = "2.3.4" group = "atm.bloodworkxgaming.oeintegration" // http://maven.apache.org/guides/mini/guide-naming-conventions.html archivesBaseName = "oeintegration" -sourceCompatibility = targetCompatibility = "1.8" // Need this here so eclipse task generates correctly. -compileJava { - sourceCompatibility = targetCompatibility = "1.8" -} +sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = '1.8' minecraft { - version = "1.12.2-14.23.4.2759" - runDir = "run" - // the mappings can be changed at any time, and must be in the following format. // snapshot_YYYYMMDD snapshot are built nightly. // stable_# stables are built at the discretion of the MCP team. // Use non-default mappings at your own risk. they may not always work. // simply re-run your setup task after changing the mappings to update your workspace. - mappings = "snapshot_20180710" + mappings channel: 'snapshot', version: '20171003-1.12' // makeObfSourceJar = false // an Srg named sources jar is made by default. uncomment this to disable. -} + runs { + client { + workingDirectory project.file('run') + // Recommended logging data for a userdev environment + property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP' -repositories { - maven { // tic, jei - url "http://dvs1.progwml6.com/files/maven" - } - maven { // crt - url "http://maven.blamejared.com" + // Recommended logging level for the console + property 'forge.logging.console.level', 'debug' + } + + server { + + // Recommended logging data for a userdev environment + property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP' + + // Recommended logging level for the console + property 'forge.logging.console.level', 'debug' + } } } dependencies { - // deobfCompile ('CraftTweaker2:CraftTweaker2-MC1120-Main:1.12-4.0.+') {exclude group: 'org.ow2.asm'} - deobfCompile ('io.sommers:packmode:1.12.2-1.2.0-SNAPSHOT.8') - deobfCompile "mezz.jei:jei_1.12.2:4.9.1.175" - deobfCompile "slimeknights.mantle:Mantle:1.12-1.3.2.25" - deobfCompile ("slimeknights:TConstruct:1.12.2-2.9.1.70") { - exclude group: 'mezz.jei' - } + // Specify the version of Minecraft to use, If this is any group other then 'net.minecraft' it is assumed + // that the dep is a ForgeGradle 'patcher' dependency. And it's patches will be applied. + // The userdev artifact is a special name and will get all sorts of transformations applied to it. + minecraft "net.minecraftforge:forge:1.12.2-14.23.5.2859" + implementation fg.deobf('io.sommers:packmode:1.12.2-1.2.0-SNAPSHOT.8') + implementation fg.deobf("mezz.jei:jei_1.12.2:4.9.1.175") + implementation fg.deobf("slimeknights.mantle:Mantle:1.12-1.3.2.25") + implementation fg.deobf("curse.maven:tconstruct-74072:2563033") + implementation fg.deobf("curse.maven:oreexcavation-250898:2897369") } -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 - expand 'version':project.version, 'mcversion':project.minecraft.version +repositories { + maven { // tic, jei + url "http://dvs1.progwml6.com/files/maven" } - - // copy everything else except the mcmod.info - from(sourceSets.main.resources.srcDirs) { - exclude 'mcmod.info' + maven { // crt + url "http://maven.blamejared.com" + } + maven { + url "https://cursemaven.com" + content { + includeGroup "curse.maven" + } } } \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 95da9f9..e4e30b1 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.14-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.3-all.zip From 5b34fb5fb47bb6fe33a709a831e9e8e26860ffe0 Mon Sep 17 00:00:00 2001 From: SkyyWasTaken Date: Sun, 12 May 2024 19:38:12 -0400 Subject: [PATCH 2/3] Made excavation no longer a treasure enchant --- .../oeintegration/Enchantments/ExcavationEnchantment.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/atm/bloodworkxgaming/oeintegration/Enchantments/ExcavationEnchantment.java b/src/main/java/atm/bloodworkxgaming/oeintegration/Enchantments/ExcavationEnchantment.java index cd460c6..86e2739 100644 --- a/src/main/java/atm/bloodworkxgaming/oeintegration/Enchantments/ExcavationEnchantment.java +++ b/src/main/java/atm/bloodworkxgaming/oeintegration/Enchantments/ExcavationEnchantment.java @@ -61,6 +61,6 @@ protected boolean canApplyTogether(Enchantment ench) { @Override public boolean isTreasureEnchantment() { - return true; + return false; } } From 37070b46c3576428b47d162556c5287beae6d115 Mon Sep 17 00:00:00 2001 From: SkyyWasTaken Date: Thu, 16 May 2024 19:31:28 -0400 Subject: [PATCH 3/3] Made treasure status configurable --- .../oeintegration/Enchantments/ExcavationEnchantment.java | 2 +- .../java/atm/bloodworkxgaming/oeintegration/MainConfig.java | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/atm/bloodworkxgaming/oeintegration/Enchantments/ExcavationEnchantment.java b/src/main/java/atm/bloodworkxgaming/oeintegration/Enchantments/ExcavationEnchantment.java index 86e2739..6f72f8b 100644 --- a/src/main/java/atm/bloodworkxgaming/oeintegration/Enchantments/ExcavationEnchantment.java +++ b/src/main/java/atm/bloodworkxgaming/oeintegration/Enchantments/ExcavationEnchantment.java @@ -61,6 +61,6 @@ protected boolean canApplyTogether(Enchantment ench) { @Override public boolean isTreasureEnchantment() { - return false; + return MainConfig.isTreasureEnchantment; } } diff --git a/src/main/java/atm/bloodworkxgaming/oeintegration/MainConfig.java b/src/main/java/atm/bloodworkxgaming/oeintegration/MainConfig.java index e4b67c0..c1ffb01 100644 --- a/src/main/java/atm/bloodworkxgaming/oeintegration/MainConfig.java +++ b/src/main/java/atm/bloodworkxgaming/oeintegration/MainConfig.java @@ -55,6 +55,9 @@ public class MainConfig { @Config.Comment("The max level of enchantment needed to full power of the tool.") public static int maxEnchantmentLevel = 5; + @Config.Comment("true classifies the enchantment as a treasure enchantment") + public static boolean isTreasureEnchantment = true; + @Mod.EventBusSubscriber static class ConfigurationHolder { @SubscribeEvent