From 73bc5fde9ac6f8f985f074d7e47a595d8560f5ed Mon Sep 17 00:00:00 2001 From: Flemmli97 Date: Wed, 2 Mar 2022 11:25:30 +0100 Subject: [PATCH] update to 1.18.2 --- Changelog.md | 4 ++ .../java/io/github/flemmli97/flan/Flan.java | 9 ++--- .../api/permission/ObjectToPermissionMap.java | 40 ++++++++++--------- gradle.properties | 10 ++--- 4 files changed, 34 insertions(+), 29 deletions(-) diff --git a/Changelog.md b/Changelog.md index 2977c39..437e921 100644 --- a/Changelog.md +++ b/Changelog.md @@ -1,3 +1,7 @@ +Flan 1.7.4 +================ +- 1.18.2 + Flan 1.7.3 ================ - Internal changes diff --git a/common/src/main/java/io/github/flemmli97/flan/Flan.java b/common/src/main/java/io/github/flemmli97/flan/Flan.java index edccaa4..6977caa 100644 --- a/common/src/main/java/io/github/flemmli97/flan/Flan.java +++ b/common/src/main/java/io/github/flemmli97/flan/Flan.java @@ -2,7 +2,6 @@ package io.github.flemmli97.flan; import io.github.flemmli97.flan.api.permission.PermissionRegistry; import io.github.flemmli97.flan.config.ConfigHandler; -import io.github.flemmli97.flan.platform.ClaimPermissionCheck; import net.minecraft.server.MinecraftServer; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -40,20 +39,20 @@ public class Flan { @SuppressWarnings("unchecked") public static T getPlatformInstance(Class abstractClss, String... impls) { - if(impls == null || impls.length == 0) + if (impls == null || impls.length == 0) throw new IllegalStateException("Couldn't create an instance of " + abstractClss + ". No implementations provided!"); Class clss = null; int i = 0; - while(clss == null && i < impls.length) { + while (clss == null && i < impls.length) { try { clss = Class.forName(impls[i]); } catch (ClassNotFoundException ignored) { } i++; } - if(clss == null) + if (clss == null) Flan.logger.fatal("No Implementation of " + abstractClss + " found with given paths " + Arrays.toString(impls)); - if (clss != null && abstractClss.isAssignableFrom(clss)) { + else if (abstractClss.isAssignableFrom(clss)) { try { Constructor constructor = (Constructor) clss.getDeclaredConstructor(); return constructor.newInstance(); diff --git a/common/src/main/java/io/github/flemmli97/flan/api/permission/ObjectToPermissionMap.java b/common/src/main/java/io/github/flemmli97/flan/api/permission/ObjectToPermissionMap.java index 0f6d1b6..9b89e86 100644 --- a/common/src/main/java/io/github/flemmli97/flan/api/permission/ObjectToPermissionMap.java +++ b/common/src/main/java/io/github/flemmli97/flan/api/permission/ObjectToPermissionMap.java @@ -1,12 +1,12 @@ package io.github.flemmli97.flan.api.permission; +import com.mojang.datafixers.util.Pair; import io.github.flemmli97.flan.config.ConfigHandler; import io.github.flemmli97.flan.platform.CrossPlatformStuff; +import net.minecraft.core.HolderSet; import net.minecraft.core.Registry; import net.minecraft.resources.ResourceLocation; import net.minecraft.server.MinecraftServer; -import net.minecraft.tags.SerializationTags; -import net.minecraft.tags.Tag; import net.minecraft.world.item.BucketItem; import net.minecraft.world.item.EnderpearlItem; import net.minecraft.world.item.Item; @@ -39,6 +39,7 @@ import net.minecraft.world.level.block.TurtleEggBlock; import java.util.HashMap; import java.util.Map; +import java.util.Optional; import java.util.function.Predicate; import java.util.function.Supplier; @@ -66,15 +67,15 @@ public class ObjectToPermissionMap { String[] sub = s.split("-"); boolean remove = sub[1].equals("NONE"); if (s.startsWith("@")) { - Tag t = SerializationTags.getInstance().getOrEmpty(Registry.ITEM_REGISTRY).getTag(new ResourceLocation(sub[0].substring(1))); - if (t != null) { - t.getValues().forEach(i -> { - if (remove) - itemToPermission.remove(i); - else - itemToPermission.put(i, PermissionRegistry.get(sub[1])); - }); - } + ResourceLocation res = new ResourceLocation(sub[0].substring(1)); + Optional> t = Registry.ITEM.getTags().filter(p -> p.getFirst().location().equals(res)) + .map(Pair::getSecond).findFirst(); + t.ifPresent(holders -> holders.forEach(i -> { + if (remove) + itemToPermission.remove(i.value()); + else + itemToPermission.put(i.value(), PermissionRegistry.get(sub[1])); + })); } else { if (remove) itemToPermission.remove(CrossPlatformStuff.INSTANCE.registryItems().getFromId(new ResourceLocation(sub[0]))); @@ -86,14 +87,15 @@ public class ObjectToPermissionMap { String[] sub = s.split("-"); boolean remove = sub[1].equals("NONE"); if (s.startsWith("@")) { - Tag t = SerializationTags.getInstance().getOrEmpty(Registry.BLOCK_REGISTRY).getTag(new ResourceLocation(sub[0].substring(1))); - if (t != null) - t.getValues().forEach(i -> { - if (remove) - blockToPermission.remove(i); - else - blockToPermission.put(i, PermissionRegistry.get(sub[1])); - }); + ResourceLocation res = new ResourceLocation(sub[0].substring(1)); + Optional> t = Registry.BLOCK.getTags().filter(p -> p.getFirst().location().equals(res)) + .map(Pair::getSecond).findFirst(); + t.ifPresent(holders -> holders.forEach(i -> { + if (remove) + blockToPermission.remove(i.value()); + else + blockToPermission.put(i.value(), PermissionRegistry.get(sub[1])); + })); } else { if (remove) blockToPermission.remove(CrossPlatformStuff.INSTANCE.registryBlocks().getFromId(new ResourceLocation(sub[0]))); diff --git a/gradle.properties b/gradle.properties index 7c029ce..e12bf2b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,23 +1,23 @@ org.gradle.jvmargs=-Xmx2G -minecraft_version=1.18.1 +minecraft_version=1.18.2 parchment_version=1.18.1:2022.02.13 # Forge Properties -forge_version=1.18.1-39.0.79 +forge_version=1.18.2-40.0.1 # Fabric Properties # check these on https://fabricmc.net/use loader_version=0.13.2 # Mod Properties -mod_version=1.7.3 +mod_version=1.7.4 maven_group=io.github.flemmli97 archives_base_name=flan # Dependencies # currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api -fabric_version=0.43.1+1.18 +fabric_version=0.47.8+1.18.2 gunpowder_version=1.1.1.0+1.18.1 gunpowder_currency_version=1.0.8+gunpowder.1.1.1.1.mc.1.18.1 fabric_permissions_api=0.1-SNAPSHOT @@ -26,7 +26,7 @@ ftb_ranks=1801.1.6-build.20 dicemcmm=curse.maven:dicemcmoney-406972:3548047 # Curse properties -curse_versions=1.18, 1.18.1, Java 17 +curse_versions=1.18.2, Java 17 curse_page_fabric=https://www.curseforge.com/minecraft/mc-mods/flan curse_id_fabric=404578 curse_dep_fabric=fabric-api