R3944Realms/CarryOn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updated to 1.18.2

Browse Source
This commit is contained in:
Tschipp 2022-03-05 16:50:08 +01:00
parent b462098acf
commit 02c5376979
4 changed files with 42 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@ -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')) println('Java: ' + System.getProperty('java.version') + ' JVM: ' + System.getProperty('java.vm.version') + '(' + System.getProperty('java.vendor') + ') Arch: ' + System.getProperty('os.arch'))
minecraft { minecraft {
mappings channel: 'parchment', version: "${mappings_version}-${minecraft_version}" mappings channel: 'parchment', version: "${mappings_version}"
runs { runs {
client { client {

6
gradle.properties
View File

@ -2,8 +2,8 @@
# This is required to provide enough memory for the Minecraft decompilation process. # This is required to provide enough memory for the Minecraft decompilation process.
org.gradle.jvmargs=-Xmx3G org.gradle.jvmargs=-Xmx3G
version=1.17.0 version=1.17.0
minecraft_version=1.18.1 minecraft_version=1.18.2
mappings_version=2021.12.19 mappings_version=2022.02.13-1.18.1
forge_version=39.0.8 forge_version=40.0.3
org.gradle.daemon=false org.gradle.daemon=false
# chorg.gradle.java.home=C:/Program Files/AdoptOpenJDK/jdk-17.0.1/ # chorg.gradle.java.home=C:/Program Files/AdoptOpenJDK/jdk-17.0.1/

65
src/main/java/tschipp/carryon/common/handler/ListHandler.java
View File

@ -2,12 +2,12 @@ package tschipp.carryon.common.handler;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; 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.resources.ResourceLocation;
import net.minecraft.tags.BlockTags; import net.minecraft.tags.TagKey;
import net.minecraft.tags.EntityTypeTags;
import net.minecraft.tags.Tag;
import net.minecraft.tags.TagCollection;
import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.Entity;
import net.minecraft.world.entity.EntityType; import net.minecraft.world.entity.EntityType;
import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.Block;
@ -24,12 +24,12 @@ public class ListHandler
public static List<String> FORBIDDEN_STACKING = new ArrayList<>(); public static List<String> FORBIDDEN_STACKING = new ArrayList<>();
public static List<String> ALLOWED_STACKING = new ArrayList<>(); public static List<String> ALLOWED_STACKING = new ArrayList<>();
public static List<Tag<Block>> FORBIDDEN_TILES_TAGS = new ArrayList<>(); public static List<TagKey<Block>> FORBIDDEN_TILES_TAGS = new ArrayList<>();
public static List<Tag<EntityType<?>>> FORBIDDEN_ENTITIES_TAGS = new ArrayList<>(); public static List<TagKey<EntityType<?>>> FORBIDDEN_ENTITIES_TAGS = new ArrayList<>();
public static List<Tag<EntityType<?>>> ALLOWED_ENTITIES_TAGS = new ArrayList<>(); public static List<TagKey<EntityType<?>>> ALLOWED_ENTITIES_TAGS = new ArrayList<>();
public static List<Tag<Block>> ALLOWED_TILES_TAGS = new ArrayList<>(); public static List<TagKey<Block>> ALLOWED_TILES_TAGS = new ArrayList<>();
public static List<Tag<EntityType<?>>> FORBIDDEN_STACKING_TAGS = new ArrayList<>(); public static List<TagKey<EntityType<?>>> FORBIDDEN_STACKING_TAGS = new ArrayList<>();
public static List<Tag<EntityType<?>>> ALLOWED_STACKING_TAGS = new ArrayList<>(); public static List<TagKey<EntityType<?>>> ALLOWED_STACKING_TAGS = new ArrayList<>();
public static boolean isForbidden(Block block) public static boolean isForbidden(Block block)
{ {
@ -49,9 +49,9 @@ public class ListHandler
} }
} }
for (Tag<Block> tag : FORBIDDEN_TILES_TAGS) for (TagKey<Block> tag : FORBIDDEN_TILES_TAGS)
{ {
if (tag.contains(block)) if (block.defaultBlockState().m_204336_(tag))
return true; return true;
} }
@ -64,9 +64,9 @@ public class ListHandler
String name = entity.getType().getRegistryName().toString(); String name = entity.getType().getRegistryName().toString();
boolean contains = FORBIDDEN_ENTITIES.contains(name); boolean contains = FORBIDDEN_ENTITIES.contains(name);
for (Tag<EntityType<?>> tag : FORBIDDEN_ENTITIES_TAGS) for (TagKey<EntityType<?>> tag : FORBIDDEN_ENTITIES_TAGS)
{ {
if (tag.contains(entity.getType())) if (entity.getType().m_204039_(tag))
return true; return true;
} }
@ -78,9 +78,9 @@ public class ListHandler
String name = entity.getType().getRegistryName().toString(); String name = entity.getType().getRegistryName().toString();
boolean contains = ALLOWED_ENTITIES.contains(name); boolean contains = ALLOWED_ENTITIES.contains(name);
for (Tag<EntityType<?>> tag : ALLOWED_ENTITIES_TAGS) for (TagKey<EntityType<?>> tag : ALLOWED_ENTITIES_TAGS)
{ {
if (tag.contains(entity.getType())) if (entity.getType().m_204039_(tag))
return true; return true;
} }
@ -92,9 +92,9 @@ public class ListHandler
String name = entity.getType().getRegistryName().toString(); String name = entity.getType().getRegistryName().toString();
boolean contains = FORBIDDEN_STACKING.contains(name); boolean contains = FORBIDDEN_STACKING.contains(name);
for (Tag<EntityType<?>> tag : FORBIDDEN_STACKING_TAGS) for (TagKey<EntityType<?>> tag : FORBIDDEN_STACKING_TAGS)
{ {
if (tag.contains(entity.getType())) if (entity.getType().m_204039_(tag))
return true; return true;
} }
@ -106,9 +106,9 @@ public class ListHandler
String name = entity.getType().getRegistryName().toString(); String name = entity.getType().getRegistryName().toString();
boolean contains = ALLOWED_STACKING.contains(name); boolean contains = ALLOWED_STACKING.contains(name);
for (Tag<EntityType<?>> tag : ALLOWED_STACKING_TAGS) for (TagKey<EntityType<?>> tag : ALLOWED_STACKING_TAGS)
{ {
if (tag.contains(entity.getType())) if (entity.getType().m_204039_(tag))
return true; return true;
} }
@ -133,9 +133,9 @@ public class ListHandler
} }
} }
for (Tag<Block> tag : ALLOWED_TILES_TAGS) for (TagKey<Block> tag : ALLOWED_TILES_TAGS)
{ {
if (tag.contains(block)) if (block.defaultBlockState().m_204336_(tag))
return true; return true;
} }
@ -144,6 +144,7 @@ public class ListHandler
} }
@SuppressWarnings("deprecation")
public static void initConfigLists() public static void initConfigLists()
{ {
FORBIDDEN_ENTITIES.clear(); FORBIDDEN_ENTITIES.clear();
@ -276,17 +277,19 @@ public class ListHandler
} }
} }
TagCollection<Block> blocktags = BlockTags.getAllTags(); Map<ResourceLocation, TagKey<Block>> blocktags = Registry.BLOCK.m_203613_().collect(Collectors.toMap(t -> t.f_203868_(), t -> t));
TagCollection<EntityType<?>> entitytags = EntityTypeTags.getAllTags(); Map<ResourceLocation, TagKey<EntityType<?>>> 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) for (String s : forbidden)
{ {
if (s.startsWith("#")) if (s.startsWith("#"))
{ {
String sub = s.substring(1); String sub = s.substring(1);
Tag<Block> tag = blocktags.getTag(new ResourceLocation(sub)); TagKey<Block> tag = blocktags.get(new ResourceLocation(sub));
if (tag != null) if (tag != null)
FORBIDDEN_TILES_TAGS.add(tag); FORBIDDEN_TILES_TAGS.add(tag);
} }
@ -296,7 +299,7 @@ public class ListHandler
{ {
if (s.startsWith("#")) if (s.startsWith("#"))
{ {
Tag<Block> tag = blocktags.getTag(new ResourceLocation(s.substring(1))); TagKey<Block> tag = blocktags.get(new ResourceLocation(s.substring(1)));
if (tag != null) if (tag != null)
ALLOWED_TILES_TAGS.add(tag); ALLOWED_TILES_TAGS.add(tag);
} }
@ -306,7 +309,7 @@ public class ListHandler
{ {
if (s.startsWith("#")) if (s.startsWith("#"))
{ {
Tag<EntityType<?>> tag = entitytags.getTag(new ResourceLocation(s.substring(1))); TagKey<EntityType<?>> tag = entitytags.get(new ResourceLocation(s.substring(1)));
if (tag != null) if (tag != null)
FORBIDDEN_ENTITIES_TAGS.add(tag); FORBIDDEN_ENTITIES_TAGS.add(tag);
} }
@ -316,7 +319,7 @@ public class ListHandler
{ {
if (s.startsWith("#")) if (s.startsWith("#"))
{ {
Tag<EntityType<?>> tag = entitytags.getTag(new ResourceLocation(s.substring(1))); TagKey<EntityType<?>> tag = entitytags.get(new ResourceLocation(s.substring(1)));
if (tag != null) if (tag != null)
ALLOWED_ENTITIES_TAGS.add(tag); ALLOWED_ENTITIES_TAGS.add(tag);
} }
@ -326,7 +329,7 @@ public class ListHandler
{ {
if (s.startsWith("#")) if (s.startsWith("#"))
{ {
Tag<EntityType<?>> tag = entitytags.getTag(new ResourceLocation(s.substring(1))); TagKey<EntityType<?>> tag = entitytags.get(new ResourceLocation(s.substring(1)));
if (tag != null) if (tag != null)
FORBIDDEN_STACKING_TAGS.add(tag); FORBIDDEN_STACKING_TAGS.add(tag);
} }
@ -336,7 +339,7 @@ public class ListHandler
{ {
if (s.startsWith("#")) if (s.startsWith("#"))
{ {
Tag<EntityType<?>> tag = entitytags.getTag(new ResourceLocation(s.substring(1))); TagKey<EntityType<?>> tag = entitytags.get(new ResourceLocation(s.substring(1)));
if (tag != null) if (tag != null)
ALLOWED_STACKING_TAGS.add(tag); ALLOWED_STACKING_TAGS.add(tag);
} }

6
src/main/resources/META-INF/mods.toml
View File

@ -1,5 +1,5 @@
modLoader="javafml" modLoader="javafml"
loaderVersion="[38,)" loaderVersion="[40,)"
issueTrackerURL="https://github.com/Tschipp/CarryOn/issues" issueTrackerURL="https://github.com/Tschipp/CarryOn/issues"
logoFile="logo.png" logoFile="logo.png"
license="GNU LGPLv3" license="GNU LGPLv3"
@ -18,7 +18,7 @@ license="GNU LGPLv3"
# Does this dependency have to exist - if not, ordering below must be specified # Does this dependency have to exist - if not, ordering below must be specified
mandatory=true #mandatory mandatory=true #mandatory
# The version range of the dependency # 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 # An ordering relationship for the dependency - BEFORE or AFTER required if the relationship is not mandatory
ordering="NONE" ordering="NONE"
# Side this dependency is applied on - BOTH, CLIENT or SERVER # Side this dependency is applied on - BOTH, CLIENT or SERVER
@ -27,6 +27,6 @@ license="GNU LGPLv3"
[[dependencies.carryon]] [[dependencies.carryon]]
modId="minecraft" modId="minecraft"
mandatory=true mandatory=true
versionRange="[1.18,1.19)" versionRange="[1.18.2,1.19)"
ordering="NONE" ordering="NONE"
side="BOTH" side="BOTH"