update to 1.18.2
This commit is contained in:
parent
df24bfbe64
commit
73bc5fde9a
@ -1,3 +1,7 @@
|
|||||||
|
Flan 1.7.4
|
||||||
|
================
|
||||||
|
- 1.18.2
|
||||||
|
|
||||||
Flan 1.7.3
|
Flan 1.7.3
|
||||||
================
|
================
|
||||||
- Internal changes
|
- Internal changes
|
||||||
|
@ -2,7 +2,6 @@ package io.github.flemmli97.flan;
|
|||||||
|
|
||||||
import io.github.flemmli97.flan.api.permission.PermissionRegistry;
|
import io.github.flemmli97.flan.api.permission.PermissionRegistry;
|
||||||
import io.github.flemmli97.flan.config.ConfigHandler;
|
import io.github.flemmli97.flan.config.ConfigHandler;
|
||||||
import io.github.flemmli97.flan.platform.ClaimPermissionCheck;
|
|
||||||
import net.minecraft.server.MinecraftServer;
|
import net.minecraft.server.MinecraftServer;
|
||||||
import org.apache.logging.log4j.LogManager;
|
import org.apache.logging.log4j.LogManager;
|
||||||
import org.apache.logging.log4j.Logger;
|
import org.apache.logging.log4j.Logger;
|
||||||
@ -40,20 +39,20 @@ public class Flan {
|
|||||||
|
|
||||||
@SuppressWarnings("unchecked")
|
@SuppressWarnings("unchecked")
|
||||||
public static <T> T getPlatformInstance(Class<T> abstractClss, String... impls) {
|
public static <T> T getPlatformInstance(Class<T> 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!");
|
throw new IllegalStateException("Couldn't create an instance of " + abstractClss + ". No implementations provided!");
|
||||||
Class<?> clss = null;
|
Class<?> clss = null;
|
||||||
int i = 0;
|
int i = 0;
|
||||||
while(clss == null && i < impls.length) {
|
while (clss == null && i < impls.length) {
|
||||||
try {
|
try {
|
||||||
clss = Class.forName(impls[i]);
|
clss = Class.forName(impls[i]);
|
||||||
} catch (ClassNotFoundException ignored) {
|
} catch (ClassNotFoundException ignored) {
|
||||||
}
|
}
|
||||||
i++;
|
i++;
|
||||||
}
|
}
|
||||||
if(clss == null)
|
if (clss == null)
|
||||||
Flan.logger.fatal("No Implementation of " + abstractClss + " found with given paths " + Arrays.toString(impls));
|
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 {
|
try {
|
||||||
Constructor<T> constructor = (Constructor<T>) clss.getDeclaredConstructor();
|
Constructor<T> constructor = (Constructor<T>) clss.getDeclaredConstructor();
|
||||||
return constructor.newInstance();
|
return constructor.newInstance();
|
||||||
|
@ -1,12 +1,12 @@
|
|||||||
package io.github.flemmli97.flan.api.permission;
|
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.config.ConfigHandler;
|
||||||
import io.github.flemmli97.flan.platform.CrossPlatformStuff;
|
import io.github.flemmli97.flan.platform.CrossPlatformStuff;
|
||||||
|
import net.minecraft.core.HolderSet;
|
||||||
import net.minecraft.core.Registry;
|
import net.minecraft.core.Registry;
|
||||||
import net.minecraft.resources.ResourceLocation;
|
import net.minecraft.resources.ResourceLocation;
|
||||||
import net.minecraft.server.MinecraftServer;
|
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.BucketItem;
|
||||||
import net.minecraft.world.item.EnderpearlItem;
|
import net.minecraft.world.item.EnderpearlItem;
|
||||||
import net.minecraft.world.item.Item;
|
import net.minecraft.world.item.Item;
|
||||||
@ -39,6 +39,7 @@ import net.minecraft.world.level.block.TurtleEggBlock;
|
|||||||
|
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
import java.util.Optional;
|
||||||
import java.util.function.Predicate;
|
import java.util.function.Predicate;
|
||||||
import java.util.function.Supplier;
|
import java.util.function.Supplier;
|
||||||
|
|
||||||
@ -66,15 +67,15 @@ public class ObjectToPermissionMap {
|
|||||||
String[] sub = s.split("-");
|
String[] sub = s.split("-");
|
||||||
boolean remove = sub[1].equals("NONE");
|
boolean remove = sub[1].equals("NONE");
|
||||||
if (s.startsWith("@")) {
|
if (s.startsWith("@")) {
|
||||||
Tag<Item> t = SerializationTags.getInstance().getOrEmpty(Registry.ITEM_REGISTRY).getTag(new ResourceLocation(sub[0].substring(1)));
|
ResourceLocation res = new ResourceLocation(sub[0].substring(1));
|
||||||
if (t != null) {
|
Optional<HolderSet.Named<Item>> t = Registry.ITEM.getTags().filter(p -> p.getFirst().location().equals(res))
|
||||||
t.getValues().forEach(i -> {
|
.map(Pair::getSecond).findFirst();
|
||||||
|
t.ifPresent(holders -> holders.forEach(i -> {
|
||||||
if (remove)
|
if (remove)
|
||||||
itemToPermission.remove(i);
|
itemToPermission.remove(i.value());
|
||||||
else
|
else
|
||||||
itemToPermission.put(i, PermissionRegistry.get(sub[1]));
|
itemToPermission.put(i.value(), PermissionRegistry.get(sub[1]));
|
||||||
});
|
}));
|
||||||
}
|
|
||||||
} else {
|
} else {
|
||||||
if (remove)
|
if (remove)
|
||||||
itemToPermission.remove(CrossPlatformStuff.INSTANCE.registryItems().getFromId(new ResourceLocation(sub[0])));
|
itemToPermission.remove(CrossPlatformStuff.INSTANCE.registryItems().getFromId(new ResourceLocation(sub[0])));
|
||||||
@ -86,14 +87,15 @@ public class ObjectToPermissionMap {
|
|||||||
String[] sub = s.split("-");
|
String[] sub = s.split("-");
|
||||||
boolean remove = sub[1].equals("NONE");
|
boolean remove = sub[1].equals("NONE");
|
||||||
if (s.startsWith("@")) {
|
if (s.startsWith("@")) {
|
||||||
Tag<Block> t = SerializationTags.getInstance().getOrEmpty(Registry.BLOCK_REGISTRY).getTag(new ResourceLocation(sub[0].substring(1)));
|
ResourceLocation res = new ResourceLocation(sub[0].substring(1));
|
||||||
if (t != null)
|
Optional<HolderSet.Named<Block>> t = Registry.BLOCK.getTags().filter(p -> p.getFirst().location().equals(res))
|
||||||
t.getValues().forEach(i -> {
|
.map(Pair::getSecond).findFirst();
|
||||||
|
t.ifPresent(holders -> holders.forEach(i -> {
|
||||||
if (remove)
|
if (remove)
|
||||||
blockToPermission.remove(i);
|
blockToPermission.remove(i.value());
|
||||||
else
|
else
|
||||||
blockToPermission.put(i, PermissionRegistry.get(sub[1]));
|
blockToPermission.put(i.value(), PermissionRegistry.get(sub[1]));
|
||||||
});
|
}));
|
||||||
} else {
|
} else {
|
||||||
if (remove)
|
if (remove)
|
||||||
blockToPermission.remove(CrossPlatformStuff.INSTANCE.registryBlocks().getFromId(new ResourceLocation(sub[0])));
|
blockToPermission.remove(CrossPlatformStuff.INSTANCE.registryBlocks().getFromId(new ResourceLocation(sub[0])));
|
||||||
|
@ -1,23 +1,23 @@
|
|||||||
org.gradle.jvmargs=-Xmx2G
|
org.gradle.jvmargs=-Xmx2G
|
||||||
|
|
||||||
minecraft_version=1.18.1
|
minecraft_version=1.18.2
|
||||||
parchment_version=1.18.1:2022.02.13
|
parchment_version=1.18.1:2022.02.13
|
||||||
|
|
||||||
# Forge Properties
|
# Forge Properties
|
||||||
forge_version=1.18.1-39.0.79
|
forge_version=1.18.2-40.0.1
|
||||||
|
|
||||||
# Fabric Properties
|
# Fabric Properties
|
||||||
# check these on https://fabricmc.net/use
|
# check these on https://fabricmc.net/use
|
||||||
loader_version=0.13.2
|
loader_version=0.13.2
|
||||||
|
|
||||||
# Mod Properties
|
# Mod Properties
|
||||||
mod_version=1.7.3
|
mod_version=1.7.4
|
||||||
maven_group=io.github.flemmli97
|
maven_group=io.github.flemmli97
|
||||||
archives_base_name=flan
|
archives_base_name=flan
|
||||||
|
|
||||||
# Dependencies
|
# Dependencies
|
||||||
# currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api
|
# 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_version=1.1.1.0+1.18.1
|
||||||
gunpowder_currency_version=1.0.8+gunpowder.1.1.1.1.mc.1.18.1
|
gunpowder_currency_version=1.0.8+gunpowder.1.1.1.1.mc.1.18.1
|
||||||
fabric_permissions_api=0.1-SNAPSHOT
|
fabric_permissions_api=0.1-SNAPSHOT
|
||||||
@ -26,7 +26,7 @@ ftb_ranks=1801.1.6-build.20
|
|||||||
dicemcmm=curse.maven:dicemcmoney-406972:3548047
|
dicemcmm=curse.maven:dicemcmoney-406972:3548047
|
||||||
|
|
||||||
# Curse properties
|
# 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_page_fabric=https://www.curseforge.com/minecraft/mc-mods/flan
|
||||||
curse_id_fabric=404578
|
curse_id_fabric=404578
|
||||||
curse_dep_fabric=fabric-api
|
curse_dep_fabric=fabric-api
|
||||||
|
Loading…
Reference in New Issue
Block a user