From 02c537697993d8c196af291199434f659846fa79 Mon Sep 17 00:00:00 2001 From: Tschipp Date: Sat, 5 Mar 2022 16:50:08 +0100 Subject: [PATCH] Updated to 1.18.2 --- build.gradle | 2 +- gradle.properties | 6 +- .../carryon/common/handler/ListHandler.java | 67 ++++++++++--------- src/main/resources/META-INF/mods.toml | 6 +- 4 files changed, 42 insertions(+), 39 deletions(-) diff --git a/build.gradle b/build.gradle index 4cdd512..23476a9 100644 --- a/build.gradle +++ b/build.gradle @@ -40,7 +40,7 @@ java.toolchain.languageVersion = JavaLanguageVersion.of(17) println('Java: ' + System.getProperty('java.version') + ' JVM: ' + System.getProperty('java.vm.version') + '(' + System.getProperty('java.vendor') + ') Arch: ' + System.getProperty('os.arch')) minecraft { - mappings channel: 'parchment', version: "${mappings_version}-${minecraft_version}" + mappings channel: 'parchment', version: "${mappings_version}" runs { client { diff --git a/gradle.properties b/gradle.properties index c3cecf4..9d9cf13 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,8 +2,8 @@ # This is required to provide enough memory for the Minecraft decompilation process. org.gradle.jvmargs=-Xmx3G version=1.17.0 -minecraft_version=1.18.1 -mappings_version=2021.12.19 -forge_version=39.0.8 +minecraft_version=1.18.2 +mappings_version=2022.02.13-1.18.1 +forge_version=40.0.3 org.gradle.daemon=false # chorg.gradle.java.home=C:/Program Files/AdoptOpenJDK/jdk-17.0.1/ \ No newline at end of file diff --git a/src/main/java/tschipp/carryon/common/handler/ListHandler.java b/src/main/java/tschipp/carryon/common/handler/ListHandler.java index 48c3192..384d5b4 100644 --- a/src/main/java/tschipp/carryon/common/handler/ListHandler.java +++ b/src/main/java/tschipp/carryon/common/handler/ListHandler.java @@ -2,12 +2,12 @@ package tschipp.carryon.common.handler; import java.util.ArrayList; import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; +import net.minecraft.core.Registry; import net.minecraft.resources.ResourceLocation; -import net.minecraft.tags.BlockTags; -import net.minecraft.tags.EntityTypeTags; -import net.minecraft.tags.Tag; -import net.minecraft.tags.TagCollection; +import net.minecraft.tags.TagKey; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.EntityType; import net.minecraft.world.level.block.Block; @@ -24,12 +24,12 @@ public class ListHandler public static List FORBIDDEN_STACKING = new ArrayList<>(); public static List ALLOWED_STACKING = new ArrayList<>(); - public static List> FORBIDDEN_TILES_TAGS = new ArrayList<>(); - public static List>> FORBIDDEN_ENTITIES_TAGS = new ArrayList<>(); - public static List>> ALLOWED_ENTITIES_TAGS = new ArrayList<>(); - public static List> ALLOWED_TILES_TAGS = new ArrayList<>(); - public static List>> FORBIDDEN_STACKING_TAGS = new ArrayList<>(); - public static List>> ALLOWED_STACKING_TAGS = new ArrayList<>(); + public static List> FORBIDDEN_TILES_TAGS = new ArrayList<>(); + public static List>> FORBIDDEN_ENTITIES_TAGS = new ArrayList<>(); + public static List>> ALLOWED_ENTITIES_TAGS = new ArrayList<>(); + public static List> ALLOWED_TILES_TAGS = new ArrayList<>(); + public static List>> FORBIDDEN_STACKING_TAGS = new ArrayList<>(); + public static List>> ALLOWED_STACKING_TAGS = new ArrayList<>(); public static boolean isForbidden(Block block) { @@ -49,9 +49,9 @@ public class ListHandler } } - for (Tag tag : FORBIDDEN_TILES_TAGS) + for (TagKey tag : FORBIDDEN_TILES_TAGS) { - if (tag.contains(block)) + if (block.defaultBlockState().m_204336_(tag)) return true; } @@ -64,9 +64,9 @@ public class ListHandler String name = entity.getType().getRegistryName().toString(); boolean contains = FORBIDDEN_ENTITIES.contains(name); - for (Tag> tag : FORBIDDEN_ENTITIES_TAGS) + for (TagKey> tag : FORBIDDEN_ENTITIES_TAGS) { - if (tag.contains(entity.getType())) + if (entity.getType().m_204039_(tag)) return true; } @@ -78,9 +78,9 @@ public class ListHandler String name = entity.getType().getRegistryName().toString(); boolean contains = ALLOWED_ENTITIES.contains(name); - for (Tag> tag : ALLOWED_ENTITIES_TAGS) + for (TagKey> tag : ALLOWED_ENTITIES_TAGS) { - if (tag.contains(entity.getType())) + if (entity.getType().m_204039_(tag)) return true; } @@ -92,9 +92,9 @@ public class ListHandler String name = entity.getType().getRegistryName().toString(); boolean contains = FORBIDDEN_STACKING.contains(name); - for (Tag> tag : FORBIDDEN_STACKING_TAGS) + for (TagKey> tag : FORBIDDEN_STACKING_TAGS) { - if (tag.contains(entity.getType())) + if (entity.getType().m_204039_(tag)) return true; } @@ -106,9 +106,9 @@ public class ListHandler String name = entity.getType().getRegistryName().toString(); boolean contains = ALLOWED_STACKING.contains(name); - for (Tag> tag : ALLOWED_STACKING_TAGS) + for (TagKey> tag : ALLOWED_STACKING_TAGS) { - if (tag.contains(entity.getType())) + if (entity.getType().m_204039_(tag)) return true; } @@ -133,17 +133,18 @@ public class ListHandler } } - for (Tag tag : ALLOWED_TILES_TAGS) + for (TagKey tag : ALLOWED_TILES_TAGS) { - if (tag.contains(block)) + if (block.defaultBlockState().m_204336_(tag)) return true; } - return contains; + return contains; } } + @SuppressWarnings("deprecation") public static void initConfigLists() { FORBIDDEN_ENTITIES.clear(); @@ -276,17 +277,19 @@ public class ListHandler } } - TagCollection blocktags = BlockTags.getAllTags(); - TagCollection> entitytags = EntityTypeTags.getAllTags(); + Map> blocktags = Registry.BLOCK.m_203613_().collect(Collectors.toMap(t -> t.f_203868_(), t -> t)); + Map>> entitytags = Registry.ENTITY_TYPE.m_203613_().collect(Collectors.toMap(t -> t.f_203868_(), t -> t)); - System.out.println(blocktags.getAvailableTags()); + + +// System.out.println(blocktags.getAvailableTags()); for (String s : forbidden) { if (s.startsWith("#")) { String sub = s.substring(1); - Tag tag = blocktags.getTag(new ResourceLocation(sub)); + TagKey tag = blocktags.get(new ResourceLocation(sub)); if (tag != null) FORBIDDEN_TILES_TAGS.add(tag); } @@ -296,7 +299,7 @@ public class ListHandler { if (s.startsWith("#")) { - Tag tag = blocktags.getTag(new ResourceLocation(s.substring(1))); + TagKey tag = blocktags.get(new ResourceLocation(s.substring(1))); if (tag != null) ALLOWED_TILES_TAGS.add(tag); } @@ -306,7 +309,7 @@ public class ListHandler { if (s.startsWith("#")) { - Tag> tag = entitytags.getTag(new ResourceLocation(s.substring(1))); + TagKey> tag = entitytags.get(new ResourceLocation(s.substring(1))); if (tag != null) FORBIDDEN_ENTITIES_TAGS.add(tag); } @@ -316,7 +319,7 @@ public class ListHandler { if (s.startsWith("#")) { - Tag> tag = entitytags.getTag(new ResourceLocation(s.substring(1))); + TagKey> tag = entitytags.get(new ResourceLocation(s.substring(1))); if (tag != null) ALLOWED_ENTITIES_TAGS.add(tag); } @@ -326,7 +329,7 @@ public class ListHandler { if (s.startsWith("#")) { - Tag> tag = entitytags.getTag(new ResourceLocation(s.substring(1))); + TagKey> tag = entitytags.get(new ResourceLocation(s.substring(1))); if (tag != null) FORBIDDEN_STACKING_TAGS.add(tag); } @@ -336,7 +339,7 @@ public class ListHandler { if (s.startsWith("#")) { - Tag> tag = entitytags.getTag(new ResourceLocation(s.substring(1))); + TagKey> tag = entitytags.get(new ResourceLocation(s.substring(1))); if (tag != null) ALLOWED_STACKING_TAGS.add(tag); } diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml index 5356718..2260b24 100644 --- a/src/main/resources/META-INF/mods.toml +++ b/src/main/resources/META-INF/mods.toml @@ -1,5 +1,5 @@ modLoader="javafml" -loaderVersion="[38,)" +loaderVersion="[40,)" issueTrackerURL="https://github.com/Tschipp/CarryOn/issues" logoFile="logo.png" license="GNU LGPLv3" @@ -18,7 +18,7 @@ license="GNU LGPLv3" # Does this dependency have to exist - if not, ordering below must be specified mandatory=true #mandatory # The version range of the dependency - versionRange="[38.0.17,)" #mandatory + versionRange="[40.0.3,)" #mandatory # An ordering relationship for the dependency - BEFORE or AFTER required if the relationship is not mandatory ordering="NONE" # Side this dependency is applied on - BOTH, CLIENT or SERVER @@ -27,6 +27,6 @@ license="GNU LGPLv3" [[dependencies.carryon]] modId="minecraft" mandatory=true - versionRange="[1.18,1.19)" + versionRange="[1.18.2,1.19)" ordering="NONE" side="BOTH"