Skip to content

Commit

Permalink
Library update
Browse files Browse the repository at this point in the history
Stormwind99 committed Jan 20, 2020
1 parent 6bef644 commit bfb373f
Showing 7 changed files with 14 additions and 14 deletions.
5 changes: 3 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -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'
}

4 changes: 2 additions & 2 deletions build.properties
Original file line number Diff line number Diff line change
@@ -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(/\./,'/')}"
2 changes: 1 addition & 1 deletion dependencies.gradle
Original file line number Diff line number Diff line change
@@ -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')
Original file line number Diff line number Diff line change
@@ -3,28 +3,26 @@
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;

/**
* 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<Ingredient> recipeItemsIn)
2 changes: 1 addition & 1 deletion src/main/resources/META-INF/mods.toml
Original file line number Diff line number Diff line change
@@ -53,6 +53,6 @@ description="${mod_description}"
[[dependencies.${mod_id}]]
modId="wumpleutil"
mandatory=true
versionRange="[3.1,)"
versionRange="[3.2,)"
ordering="NONE"
side="BOTH"
5 changes: 3 additions & 2 deletions update.json
Original file line number Diff line number Diff line change
@@ -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",
4 changes: 2 additions & 2 deletions version.properties
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit bfb373f

Please sign in to comment.