From 4314581a61e73d036d441b21fbda8c880d0ea816 Mon Sep 17 00:00:00 2001 From: TheBusyBiscuit Date: Sat, 27 Jun 2020 14:22:45 +0200 Subject: [PATCH] Another fix and an addition --- CHANGELOG.md | 2 ++ .../slimefun4/core/services/github/GitHubService.java | 8 +++++--- .../items/electric/machines/ElectricPress.java | 1 + 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c370baea7..e826c9b1a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -32,6 +32,7 @@ * Added Magical Zombie Pills * Added 1.13 compatibility to the Auto Drier * Added Corals to the fuel list for the Bio Generator +* Added Clay -> Clay blocks recipe to the Electric Press * (1.16+) Slimefun guide can now show Smithing Table recipes * (1.16+) Added Nether Gold Ore recipe to the Ore Crusher * (1.16+) Added Shroomlights to the fuel list for the Bio Generator @@ -61,6 +62,7 @@ * Fixed some issues with AsyncWorldEdit * Fixed some problems with unregistered or fake worlds * Fixed a rare concurrency issue with world saving +* Fixed some contributors showing up twice ## Release Candidate 13 (16 Jun 2020) https://thebusybiscuit.github.io/builds/TheBusyBiscuit/Slimefun4/stable/#13 diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/services/github/GitHubService.java b/src/main/java/io/github/thebusybiscuit/slimefun4/core/services/github/GitHubService.java index f4ab531dd..72a48028e 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/services/github/GitHubService.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/core/services/github/GitHubService.java @@ -73,10 +73,12 @@ public class GitHubService { contributors.put(name, contributor); } - public Contributor addContributor(String name, String profile, String role, int commits) { - Contributor contributor = contributors.computeIfAbsent(name, key -> new Contributor(name, profile)); + public Contributor addContributor(String minecraftName, String profile, String role, int commits) { + String username = profile.substring(profile.lastIndexOf('/') + 1); + + Contributor contributor = contributors.computeIfAbsent(username, key -> new Contributor(minecraftName, profile)); contributor.setContribution(role, commits); - contributor.setUniqueId(uuidCache.getUUID(name)); + contributor.setUniqueId(uuidCache.getUUID(minecraftName)); return contributor; } diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/ElectricPress.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/ElectricPress.java index 09e81095d..94a1c3858 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/ElectricPress.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/ElectricPress.java @@ -27,6 +27,7 @@ public abstract class ElectricPress extends AContainer implements RecipeDisplayI addRecipe(3, new ItemStack(Material.DRIED_KELP, 9), new ItemStack(Material.DRIED_KELP_BLOCK)); addRecipe(3, new ItemStack(Material.BONE_MEAL, 9), new ItemStack(Material.BONE_BLOCK)); + addRecipe(3, new ItemStack(Material.CLAY_BALL, 4), new ItemStack(Material.CLAY)); addRecipe(6, SlimefunItems.COPPER_INGOT, new CustomItem(SlimefunItems.COPPER_WIRE, 3)); addRecipe(16, new CustomItem(SlimefunItems.STEEL_INGOT, 8), SlimefunItems.STEEL_PLATE);