From e4136f547ddbf8f2ad7c497ef2920d461bfc1366 Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Tue, 6 Aug 2019 23:42:25 +0100 Subject: [PATCH] Fix version not being set in the mod.json + some clean up --- build.gradle | 25 +++++++++++-------------- src/main/resources/fabric.mod.json | 2 +- src/main/resources/mcmod.info | 25 ------------------------- src/main/resources/techreborn_at.cfg | 13 ------------- 4 files changed, 12 insertions(+), 53 deletions(-) delete mode 100644 src/main/resources/mcmod.info delete mode 100644 src/main/resources/techreborn_at.cfg diff --git a/build.gradle b/build.gradle index 54911b893..050269725 100644 --- a/build.gradle +++ b/build.gradle @@ -101,29 +101,26 @@ dependencies { modCompile (rcVersion) } - include rcVersion + //TODO enable this again at somepoint + //include rcVersion compile 'org.checkerframework:checker-qual:2.10.0' compileOnly "com.google.code.findbugs:jsr305:+" } -processResources{ - inputs.property 'version', project.version - inputs.property 'mcversion', '1.14' +processResources { + inputs.property "version", project.version - from(sourceSets.main.resources.srcDirs) { - include 'META_INF/mods.toml' - expand 'version':project.version, 'mcversion': '1.14' - } + from(sourceSets.main.resources.srcDirs) { + include "fabric.mod.json" + expand "version": project.version + } - from(sourceSets.main.resources.srcDirs) { - exclude 'META_INF/mods.toml' - } - - rename '(.+_at.cfg)', 'META-INF/$1' + from(sourceSets.main.resources.srcDirs) { + exclude "fabric.mod.json" + } } - jar { exclude "**/*.psd" classifier = 'universal' diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 39c02660d..7ab86e95f 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -23,7 +23,7 @@ "techreborn.rei.ReiPlugin" ] }, - "requires": { + "depends": { "fabricloader": ">=0.4.0", "fabric": "*", "reborncore": "*" diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info deleted file mode 100644 index 3d612d79d..000000000 --- a/src/main/resources/mcmod.info +++ /dev/null @@ -1,25 +0,0 @@ -[ - { - "modid": "techreborn", - "name": "Tech Reborn", - "description": "Tech Reborn is a completely standalone tech mod including tools and machines to gather resources, process materials, and progress through the mod. http://www.techreborn.ovh/", - "version": "$version", - "mcversion": "$mcversion", - "url": "https://github.com/TechReborn/TechReborn", - "updateUrl": "", - "authorList": [ - "modmuss50", - "Gigabit101", - "Prospector", - "drcrazy" - ], - "credits": "Thanks to these contributors: TheMattaBase, Mj11jM, Mazdallier, tntrololol, joflashstudios, lclc98, Lordmau5, mezz, Thog, and Dimmerworld", - "logoFile": "logo.png", - "screenshots": [ - ], - "parent": "", - "dependencies": [ - "reborncore" - ] - } -] diff --git a/src/main/resources/techreborn_at.cfg b/src/main/resources/techreborn_at.cfg deleted file mode 100644 index 725e299bd..000000000 --- a/src/main/resources/techreborn_at.cfg +++ /dev/null @@ -1,13 +0,0 @@ -public net.minecraft.client.gui.recipebook.GuiRecipeBook field_193022_s # recipeBookPage -public net.minecraft.client.gui.recipebook.GuiRecipeBook field_191915_z # ghostRecipe -public net.minecraft.client.gui.recipebook.GuiRecipeBook field_193960_m # toggleRecipesBtn - -public net.minecraft.client.gui.recipebook.GuiRecipeBook field_191904_o # width -public net.minecraft.client.gui.recipebook.GuiRecipeBook field_191905_p # height -public net.minecraft.client.gui.recipebook.GuiRecipeBook field_191903_n # xOffset - -public net.minecraft.client.gui.inventory.GuiContainer field_147003_i # guiLeft -public net.minecraft.client.gui.inventory.GuiContainer field_147009_r # guiTop - -#RebornCore uses this, so I added it here make setting up a dev env easier, shoudlnt halm to much -public net.minecraft.client.renderer.BlockFluidRenderer func_178269_a(Lnet/minecraft/world/IBlockAccess;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/block/material/Material;)F # getFluidHeight \ No newline at end of file