From 8eaf391193f2151c02423e10d6a54e0ed0d6dddf Mon Sep 17 00:00:00 2001 From: BlueMagic Date: Sat, 29 Feb 2020 19:13:09 -0300 Subject: [PATCH 1/5] Updated to 1.15.2 Updated build.gradle --- build.gradle | 4 ++-- gradle.properties | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/build.gradle b/build.gradle index e0bdfa7..064e5e5 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,6 @@ plugins { id "com.matthewprenger.cursegradle" version "1.4.0" - id 'fabric-loom' version '0.2.4-SNAPSHOT' + id 'fabric-loom' version '0.2.6-SNAPSHOT' id "maven-publish" } @@ -24,7 +24,7 @@ repositories { dependencies { minecraft "com.mojang:minecraft:${mc_version}" - mappings "net.fabricmc:yarn:${mc_version}+build.${mappings_version}" + mappings "net.fabricmc:yarn:${mc_version}+build.${mappings_version}:v2" modCompile "net.fabricmc:fabric-loader:${loader_version}" modCompile "com.github.emilyploszaj:trinkets:v${trinkets_version}" } diff --git a/gradle.properties b/gradle.properties index aff3e69..241def1 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,10 +1,10 @@ mod_name=ArmorDisguise package_group=info.tehnut.armordisguise -mod_version=1.0.1 +mod_version=1.0.2 curse_id=347849 -mc_version=1.14.4 +mc_version=1.15.2 mappings_version=14 -loader_version=0.6.3+build.167 +loader_version=0.7.8+build.184 -trinkets_version=2.1.0 \ No newline at end of file +trinkets_version=2.4.1 From eb8ed2a7451dbf6d92f94ba2fdcf2ded8aeba4df Mon Sep 17 00:00:00 2001 From: BlueMagic Date: Sun, 1 Mar 2020 17:13:57 -0300 Subject: [PATCH 2/5] Updated Code to 1.15.2 --- src/main/java/info/tehnut/armordisguise/Helper.java | 2 +- .../tehnut/armordisguise/mixin/MixinPlayerTrinketComponent.java | 2 +- .../armordisguise/mixin/client/MixinArmorFeatureRenderer.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/info/tehnut/armordisguise/Helper.java b/src/main/java/info/tehnut/armordisguise/Helper.java index 61f7fd2..09f74aa 100644 --- a/src/main/java/info/tehnut/armordisguise/Helper.java +++ b/src/main/java/info/tehnut/armordisguise/Helper.java @@ -19,7 +19,7 @@ public static boolean handleEquip(ItemStack stack, ArmorItem armor, PlayerEntity if (vanillaStack.isEmpty()) { // Not exactly safe, but we know these slots exist TrinketSlots.SlotGroup slotGroup = TrinketSlots.slotGroups.stream().filter(g -> g.getName().equals(armor.getSlotType().getName())).findFirst().get(); - player.setEquippedStack(armor.getSlotType(), stack.copy()); + player.equipStack(armor.getSlotType(), stack.copy()); TrinketsClient.lastEquipped = slotGroup; TrinketsClient.displayEquipped = 16; return true; diff --git a/src/main/java/info/tehnut/armordisguise/mixin/MixinPlayerTrinketComponent.java b/src/main/java/info/tehnut/armordisguise/mixin/MixinPlayerTrinketComponent.java index b2317a1..4ab4a78 100644 --- a/src/main/java/info/tehnut/armordisguise/mixin/MixinPlayerTrinketComponent.java +++ b/src/main/java/info/tehnut/armordisguise/mixin/MixinPlayerTrinketComponent.java @@ -25,7 +25,7 @@ public abstract class MixinPlayerTrinketComponent { public abstract Inventory getInventory(); @Inject(method = "equip", at = @At("HEAD"), cancellable = true, remap = false) - public void armordisguise$equip(ItemStack stack, CallbackInfoReturnable callbackInfoReturnable) { + public void armordisguise$equip(ItemStack stack, boolean shiftClick, CallbackInfoReturnable callbackInfoReturnable) { if (!(stack.getItem() instanceof ArmorItem)) return; diff --git a/src/main/java/info/tehnut/armordisguise/mixin/client/MixinArmorFeatureRenderer.java b/src/main/java/info/tehnut/armordisguise/mixin/client/MixinArmorFeatureRenderer.java index f8c6883..0d11aca 100644 --- a/src/main/java/info/tehnut/armordisguise/mixin/client/MixinArmorFeatureRenderer.java +++ b/src/main/java/info/tehnut/armordisguise/mixin/client/MixinArmorFeatureRenderer.java @@ -13,7 +13,7 @@ // Modifies the stack obtained for rendering on the player. If a trinket "overlay" exists, we want to render that instead // of the proper armor. @Mixin(ArmorFeatureRenderer.class) -public class MixinArmorFeatureRenderer { +public abstract class MixinArmorFeatureRenderer { @Redirect(method = "renderArmor", at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/LivingEntity;getEquippedStack(Lnet/minecraft/entity/EquipmentSlot;)Lnet/minecraft/item/ItemStack;")) public ItemStack armordisguise$getOverlayArmor(T entity, EquipmentSlot slot) { From 111e27fecdbe279c4b245a86f5fd5cb23d6d72ae Mon Sep 17 00:00:00 2001 From: BlueMagic Date: Sun, 1 Mar 2020 17:15:03 -0300 Subject: [PATCH 3/5] Update .gitignore --- .gitignore | 39 +++++++++++++++++++-------------------- 1 file changed, 19 insertions(+), 20 deletions(-) diff --git a/.gitignore b/.gitignore index d4865f3..8dfbaea 100644 --- a/.gitignore +++ b/.gitignore @@ -1,26 +1,25 @@ -# General use .gitignore for Minecraft modding. +# gradle -# Directories -/.gradle/ -/build/ -/eclipse/ -/run/ -/out/ -/asm/ -/bin/ -/.idea/ -/.metadata/ -/.settings/ -/libs/ +.gradle/ +build/ +out/ +classes/ -# File Extensions -*.psd +# idea + +.idea/ *.iml *.ipr *.iws -*.classpath -*.project -*.class -# Specific files -Thumbs.db +# vscode + +.settings/ +.vscode/ +bin/ +.classpath +.project + +# fabric + +run/ From 49ff434fb28e46f525de5865a43451a4173f304d Mon Sep 17 00:00:00 2001 From: BlueMagic Date: Sun, 1 Mar 2020 17:15:23 -0300 Subject: [PATCH 4/5] Update gradle-wrapper.properties --- gradle/wrapper/gradle-wrapper.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 2451a57..3087bbc 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Mon Sep 14 12:28:28 PDT 2015 +#Sun Mar 01 15:26:23 ART 2020 +distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-bin.zip +zipStoreBase=GRADLE_USER_HOME From 03a72cc74401d260522cc165789e6296767ae0c4 Mon Sep 17 00:00:00 2001 From: BlueMagic Date: Sun, 1 Mar 2020 17:15:50 -0300 Subject: [PATCH 5/5] Update build.gradle --- build.gradle | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 064e5e5..ee8206f 100644 --- a/build.gradle +++ b/build.gradle @@ -33,7 +33,7 @@ task sourcesJar(type: Jar) { from sourceSets.main.allJava classifier = 'sources' } - +/* publishing { tasks.publish.dependsOn 'build' publications { @@ -50,6 +50,27 @@ publishing { } } } +*/ + +publishing { + publications { + mavenJava(MavenPublication) { + // add all the jars that should be included when publishing to maven + artifact(remapJar) { + builtBy remapJar + } + artifact(sourcesJar) { + builtBy remapSourcesJar + } + } + } + + // select the repositories you want to publish to + repositories { + // uncomment to publish to the local maven + mavenLocal() + } +} curseforge { if (project.hasProperty('curse_key_TehNut'))