From bfb373f85f26bc5731f7311d5fcfe81b86a10b5d Mon Sep 17 00:00:00 2001 From: Jason Spangler Date: Mon, 20 Jan 2020 15:29:10 -0600 Subject: [PATCH] Library update --- build.gradle | 5 +++-- build.properties | 4 ++-- dependencies.gradle | 2 +- .../com/wumple/pantography/recipe/TranscribeMapRecipe.java | 6 ++---- src/main/resources/META-INF/mods.toml | 2 +- update.json | 5 +++-- version.properties | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/build.gradle b/build.gradle index 8660a03..ad2618d 100755 --- a/build.gradle +++ b/build.gradle @@ -379,7 +379,6 @@ jar { jar.finalizedBy('reobfJar') - artifacts { archives jar } @@ -532,6 +531,8 @@ task reviewSignJar(type: Exec) { commandLine "" + System.getenv('JAVA_HOME') + "/bin/jarsigner", "-verify", "-verbose", "-keystore", project.findProperty('keyStore'), jar.archivePath } +// LexManos says use this instead of finalizedBy when using jar signing: +signJar.dependsOn('reobfJar') // -------------------------------------------------------------------------- // Misc @@ -551,7 +552,7 @@ tasks.superClean.dependsOn clean // triggers for above functionality build { - dependsOn 'signJar' +// dependsOn 'signJar' dependsOn 'saveBuildNumber' } diff --git a/build.properties b/build.properties index 166d144..9bcf9e7 100755 --- a/build.properties +++ b/build.properties @@ -13,11 +13,11 @@ mc_mappings_version="20200104-1.14.3" forge_version="28.1.115" forge_loader_version="28" mc_version="1.14.4" -version="3.1.0" +version="3.2.0" /// For @Mod, etc. //dependencies="required-after:wumpleutil@[3.0,);after:megamap" -dependencies="required-after:wumpleutil@[3.1,)" +dependencies="required-after:wumpleutil@[3.2,)" basegroup="com.wumple" group="${basegroup}.${mod_internalid}" group_path="${new String(group).replaceAll(/\./,'/')}" diff --git a/dependencies.gradle b/dependencies.gradle index aa84057..de2c3ff 100755 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -26,7 +26,7 @@ dependencies { // Real examples // compile 'com.mod-buildcraft:buildcraft:6.0.8:dev' // adds buildcraft to the dev env // compile 'com.googlecode.efficient-java-matrix-library:ejml:0.24' // adds ejml to the dev env - compile fg.deobf('com.wumple.util:wumpleutil:3.1.0') { + compile fg.deobf('com.wumple.util:wumpleutil:3.2.0') { transitive = false; } //compile fg.deobf('com.wumple.megamap:megamap:2.0.0') diff --git a/src/main/java/com/wumple/pantography/recipe/TranscribeMapRecipe.java b/src/main/java/com/wumple/pantography/recipe/TranscribeMapRecipe.java index 6f53ab3..0bbb4ce 100755 --- a/src/main/java/com/wumple/pantography/recipe/TranscribeMapRecipe.java +++ b/src/main/java/com/wumple/pantography/recipe/TranscribeMapRecipe.java @@ -3,20 +3,18 @@ import com.wumple.pantography.ConfigManager; import com.wumple.pantography.Pantography; import com.wumple.util.crafting.CraftingUtil; -import com.wumple.util.crafting.ShapelessRecipe; +import com.wumple.util.crafting.XShapelessRecipe; import com.wumple.util.map.MapTranscription; import com.wumple.util.xmap.XMapAPI; import net.minecraft.inventory.CraftingInventory; import net.minecraft.inventory.IInventory; -import net.minecraft.item.FilledMapItem; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipeSerializer; import net.minecraft.item.crafting.Ingredient; import net.minecraft.util.NonNullList; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; -import net.minecraft.world.storage.MapData; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.player.PlayerEvent.ItemCraftedEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; @@ -24,7 +22,7 @@ /** * Recipe to copy map data from one filled map into another filled map */ -public class TranscribeMapRecipe extends ShapelessRecipe +public class TranscribeMapRecipe extends XShapelessRecipe { public TranscribeMapRecipe(ResourceLocation idIn, String groupIn, ItemStack recipeOutputIn, NonNullList recipeItemsIn) diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml index 102d9c0..ed0d18d 100755 --- a/src/main/resources/META-INF/mods.toml +++ b/src/main/resources/META-INF/mods.toml @@ -53,6 +53,6 @@ description="${mod_description}" [[dependencies.${mod_id}]] modId="wumpleutil" mandatory=true - versionRange="[3.1,)" + versionRange="[3.2,)" ordering="NONE" side="BOTH" diff --git a/update.json b/update.json index 1ed9174..112b9fc 100755 --- a/update.json +++ b/update.json @@ -1,14 +1,15 @@ { "homepage": "https://github.com/Stormwind99/Pantography", "promos": { - "1.14.4-latest": "3.1.0", - "1.14.4-recommended": "3.1.0", + "1.14.4-latest": "3.2.0", + "1.14.4-recommended": "3.2.0", "1.12.2-latest": "2.0.2", "1.12.2-recommended": "2.0.2", "1.7.10-latest": "1.0.1", "1.7.10-recommended": "1.0.1" }, "1.14.4": { + "3.2.0": "Library update", "3.1.0": "FML reobf issue causing java.lang.NoSuchFieldError: container exception when opening Pantograph", "3.0.10": "Fix Curseforge dependencies to add WumpleUtil", "3.0.9": "Fix Curseforge dependencies to add WumpleUtil", diff --git a/version.properties b/version.properties index 17cda41..5ef0545 100755 --- a/version.properties +++ b/version.properties @@ -1,3 +1,3 @@ #Automated build number increase -#Thu Jan 16 16:10:17 CST 2020 -BUILD_NUMBER=289 +#Mon Jan 20 15:07:51 CST 2020 +BUILD_NUMBER=296