diff --git a/build.gradle b/build.gradle index 23476a9..dfebe13 100644 --- a/build.gradle +++ b/build.gradle @@ -1,18 +1,15 @@ buildscript { - repositories { - maven { url = 'https://maven.minecraftforge.net' } - maven { url = 'https://maven.parchmentmc.org' } - jcenter() - mavenCentral() - } dependencies { - classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '5.1.+', changing: true classpath 'org.parchmentmc:librarian:1.+' } } -apply plugin: 'net.minecraftforge.gradle' -apply plugin: 'eclipse' -apply plugin: 'maven-publish' + +plugins { + id 'eclipse' + id 'maven-publish' + id 'net.minecraftforge.gradle' version '5.1.+' +} + apply plugin: 'org.parchmentmc.librarian.forgegradle' diff --git a/gradle.properties b/gradle.properties index 9d9cf13..94c26d4 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,9 +1,9 @@ # Sets default memory used for gradle commands. Can be overridden by user or command line properties. # This is required to provide enough memory for the Minecraft decompilation process. org.gradle.jvmargs=-Xmx3G -version=1.17.0 -minecraft_version=1.18.2 -mappings_version=2022.02.13-1.18.1 -forge_version=40.0.3 +version=1.18.0 +minecraft_version=1.19 +mappings_version=1.18.2-2022.06.05-1.19 +forge_version=41.0.17 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/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 7454180..41d9927 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index e750102..aa991fc 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index c53aefa..1b6c787 100755 --- a/gradlew +++ b/gradlew @@ -1,7 +1,7 @@ #!/bin/sh # -# Copyright © 2015-2021 the original authors. +# Copyright © 2015-2021 the original authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -32,10 +32,10 @@ # Busybox and similar reduced shells will NOT work, because this script # requires all of these POSIX shell features: # * functions; -# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», -# «${var#prefix}», «${var%suffix}», and «$( cmd )»; -# * compound commands having a testable exit status, especially «case»; -# * various built-in commands including «command», «set», and «ulimit». +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». # # Important for patching: # diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..ba700c1 --- /dev/null +++ b/settings.gradle @@ -0,0 +1,9 @@ +pluginManagement { + repositories { + gradlePluginPortal() + maven { url = 'https://maven.minecraftforge.net/' } + maven { url = 'https://maven.parchmentmc.org' } + jcenter() + mavenCentral() + } +} \ No newline at end of file diff --git a/src/main/java/tschipp/carryon/CarryOn.java b/src/main/java/tschipp/carryon/CarryOn.java index 6ae3ef4..41f5fc5 100644 --- a/src/main/java/tschipp/carryon/CarryOn.java +++ b/src/main/java/tschipp/carryon/CarryOn.java @@ -7,9 +7,6 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.item.Item; -import net.minecraftforge.event.RegistryEvent; -import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.DistExecutor; import net.minecraftforge.fml.ModLoadingContext; import net.minecraftforge.fml.common.Mod; @@ -56,6 +53,7 @@ public class CarryOn ModLoadingContext.get().registerConfig(ModConfig.Type.SERVER, Configs.SERVER_CONFIG); info = ModLoadingContext.get().getActiveContainer().getModInfo(); + RegistrationHandler.init(); } private void setup(final FMLCommonSetupEvent event) @@ -78,13 +76,4 @@ public class CarryOn proxy.setup(event); } - - @SubscribeEvent - public static void onRegistry(RegistryEvent.Register event) - { - RegistrationHandler.regItems(); - - event.getRegistry().register(RegistrationHandler.itemEntity); - event.getRegistry().register(RegistrationHandler.itemTile); - } } \ No newline at end of file diff --git a/src/main/java/tschipp/carryon/client/event/RenderEntityEvents.java b/src/main/java/tschipp/carryon/client/event/RenderEntityEvents.java index 369ac95..6c1291e 100644 --- a/src/main/java/tschipp/carryon/client/event/RenderEntityEvents.java +++ b/src/main/java/tschipp/carryon/client/event/RenderEntityEvents.java @@ -68,13 +68,13 @@ public class RenderEntityEvents Player player = Minecraft.getInstance().player; ItemStack stack = player.getMainHandItem(); int perspective = CarryRenderHelper.getPerspective(); - float partialticks = event.getPartialTicks(); + float partialticks = event.getPartialTick(); PoseStack matrix = event.getPoseStack(); int light = event.getPackedLight(); MultiBufferSource buffer = event.getMultiBufferSource(); EntityRenderDispatcher manager = Minecraft.getInstance().getEntityRenderDispatcher(); - if (!stack.isEmpty() && stack.getItem() == RegistrationHandler.itemEntity && ItemCarryonEntity.hasEntityData(stack)) + if (!stack.isEmpty() && stack.getItem() == RegistrationHandler.itemEntity.get() && ItemCarryonEntity.hasEntityData(stack)) { if (ModList.get().isLoaded("realrender") || ModList.get().isLoaded("rfpr")) return; diff --git a/src/main/java/tschipp/carryon/client/event/RenderEvents.java b/src/main/java/tschipp/carryon/client/event/RenderEvents.java index 3bf1cea..550f642 100644 --- a/src/main/java/tschipp/carryon/client/event/RenderEvents.java +++ b/src/main/java/tschipp/carryon/client/event/RenderEvents.java @@ -28,7 +28,7 @@ import net.minecraft.client.resources.model.BakedModel; import net.minecraft.nbt.CompoundTag; import net.minecraft.network.chat.ClickEvent; import net.minecraft.network.chat.ClickEvent.Action; -import net.minecraft.network.chat.TextComponent; +import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; import net.minecraft.util.Mth; import net.minecraft.world.InteractionHand; @@ -87,7 +87,7 @@ public class RenderEvents { ItemStack stack = player.getMainHandItem(); - if (!stack.isEmpty() && (stack.getItem() == RegistrationHandler.itemTile || stack.getItem() == RegistrationHandler.itemEntity)) + if (!stack.isEmpty() && (stack.getItem() == RegistrationHandler.itemTile.get() || stack.getItem() == RegistrationHandler.itemEntity.get())) { if (ItemCarryonBlock.hasTileData(stack) || ItemCarryonEntity.hasEntityData(stack)) { @@ -136,10 +136,10 @@ public class RenderEvents if (CarryOn.FINGERPRINT_VIOLATED) { - TextComponent cf = new TextComponent(ChatFormatting.AQUA + "Curseforge" + ChatFormatting.RED); + Component cf = Component.literal(ChatFormatting.AQUA + "Curseforge" + ChatFormatting.RED); cf.getStyle().withClickEvent(new ClickEvent(Action.OPEN_URL, "https://minecraft.curseforge.com/projects/carry-on")); - player.displayClientMessage(new TextComponent(ChatFormatting.RED + "[CarryOn] WARNING! Invalid fingerprint detected! The Carry On mod file may have been tampered with! If you didn't download the file from ").append(cf).append(ChatFormatting.RED + " or through any kind of mod launcher, immediately delete the file and re-download it from ").append(cf), false); + player.displayClientMessage(Component.literal(ChatFormatting.RED + "[CarryOn] WARNING! Invalid fingerprint detected! The Carry On mod file may have been tampered with! If you didn't download the file from ").append(cf).append(ChatFormatting.RED + " or through any kind of mod launcher, immediately delete the file and re-download it from ").append(cf), false); } } @@ -163,7 +163,7 @@ public class RenderEvents { ItemStack stack = player.getItemInHand(InteractionHand.MAIN_HAND); - if (!stack.isEmpty() && (stack.getItem() == RegistrationHandler.itemTile && ItemCarryonBlock.hasTileData(stack) || stack.getItem() == RegistrationHandler.itemEntity && ItemCarryonEntity.hasEntityData(stack))) + if (!stack.isEmpty() && (stack.getItem() == RegistrationHandler.itemTile.get() && ItemCarryonBlock.hasTileData(stack) || stack.getItem() == RegistrationHandler.itemEntity.get() && ItemCarryonEntity.hasEntityData(stack))) { Minecraft.getInstance().player.closeContainer(); Minecraft.getInstance().screen = null; @@ -192,7 +192,7 @@ public class RenderEvents { ItemStack stack = Minecraft.getInstance().player.getMainHandItem(); - if (!stack.isEmpty() && (stack.getItem() == RegistrationHandler.itemTile && ItemCarryonBlock.hasTileData(stack) || stack.getItem() == RegistrationHandler.itemEntity && ItemCarryonEntity.hasEntityData(stack))) + if (!stack.isEmpty() && (stack.getItem() == RegistrationHandler.itemTile.get() && ItemCarryonBlock.hasTileData(stack) || stack.getItem() == RegistrationHandler.itemEntity.get() && ItemCarryonEntity.hasEntityData(stack))) { if (settings.keyDrop.matches(key, scancode)) { @@ -241,7 +241,7 @@ public class RenderEvents PoseStack matrix = event.getPoseStack(); int light = event.getPackedLight(); - if (!stack.isEmpty() && stack.getItem() == RegistrationHandler.itemTile && ItemCarryonBlock.hasTileData(stack) && perspective == 0 && !f1) + if (!stack.isEmpty() && stack.getItem() == RegistrationHandler.itemTile.get() && ItemCarryonBlock.hasTileData(stack) && perspective == 0 && !f1) { if (ModList.get().isLoaded("realrender") || ModList.get().isLoaded("rfpr")) return; @@ -336,7 +336,7 @@ public class RenderEvents light = manager.getPackedLightCoords(player, partialticks); ItemStack stack = player.getMainHandItem(); - if (!stack.isEmpty() && stack.getItem() == RegistrationHandler.itemTile && ItemCarryonBlock.hasTileData(stack)) + if (!stack.isEmpty() && stack.getItem() == RegistrationHandler.itemTile.get() && ItemCarryonBlock.hasTileData(stack)) { Block block = ItemCarryonBlock.getBlock(stack); BlockState state = ItemCarryonBlock.getBlockState(stack); @@ -380,7 +380,7 @@ public class RenderEvents matrix.popPose(); } - else if (!stack.isEmpty() && stack.getItem() == RegistrationHandler.itemEntity && ItemCarryonEntity.hasEntityData(stack)) + else if (!stack.isEmpty() && stack.getItem() == RegistrationHandler.itemEntity.get() && ItemCarryonEntity.hasEntityData(stack)) { Entity entity = RenderEntityEvents.getEntity(stack, level); @@ -594,7 +594,7 @@ public class RenderEvents if (handleMobends() && !ModList.get().isLoaded("obfuscate")) { ItemStack stack = player.getMainHandItem(); - if (!stack.isEmpty() && stack.getItem() == RegistrationHandler.itemTile && ItemCarryonBlock.hasTileData(stack) || stack.getItem() == RegistrationHandler.itemEntity && ItemCarryonEntity.hasEntityData(stack)) + if (!stack.isEmpty() && stack.getItem() == RegistrationHandler.itemTile.get() && ItemCarryonBlock.hasTileData(stack) || stack.getItem() == RegistrationHandler.itemEntity.get() && ItemCarryonEntity.hasEntityData(stack)) { PlayerModel model = getPlayerModel((AbstractClientPlayer) player); @@ -629,8 +629,8 @@ public class RenderEvents } else if (renderLeft) { - renderArmPost(model.leftArm, 2.0F + (doSneakCheck(player) ? 0f : 0.2f) - (stack.getItem() == RegistrationHandler.itemEntity ? 0.3f : 0), stack.getItem() == RegistrationHandler.itemEntity ? 0.15f : 0, false, doSneakCheck(player), light, matrix, builder); - renderArmPost(model.leftSleeve, 2.0F + (doSneakCheck(player) ? 0f : 0.2f) - (stack.getItem() == RegistrationHandler.itemEntity ? 0.3f : 0), stack.getItem() == RegistrationHandler.itemEntity ? 0.15f : 0, false, doSneakCheck(player), light, matrix, builder); + renderArmPost(model.leftArm, 2.0F + (doSneakCheck(player) ? 0f : 0.2f) - (stack.getItem() == RegistrationHandler.itemEntity.get() ? 0.3f : 0), stack.getItem() == RegistrationHandler.itemEntity.get() ? 0.15f : 0, false, doSneakCheck(player), light, matrix, builder); + renderArmPost(model.leftSleeve, 2.0F + (doSneakCheck(player) ? 0f : 0.2f) - (stack.getItem() == RegistrationHandler.itemEntity.get() ? 0.3f : 0), stack.getItem() == RegistrationHandler.itemEntity.get() ? 0.15f : 0, false, doSneakCheck(player), light, matrix, builder); } if (renderRight && rotRight != null) @@ -640,16 +640,16 @@ public class RenderEvents } else if (renderRight) { - renderArmPost(model.rightArm, 2.0F + (doSneakCheck(player) ? 0f : 0.2f) - (stack.getItem() == RegistrationHandler.itemEntity ? 0.3f : 0), stack.getItem() == RegistrationHandler.itemEntity ? -0.15f : 0, true, doSneakCheck(player), light, matrix, builder); - renderArmPost(model.rightSleeve, 2.0F + (doSneakCheck(player) ? 0f : 0.2f) - (stack.getItem() == RegistrationHandler.itemEntity ? 0.3f : 0), stack.getItem() == RegistrationHandler.itemEntity ? -0.15f : 0, true, doSneakCheck(player), light, matrix, builder); + renderArmPost(model.rightArm, 2.0F + (doSneakCheck(player) ? 0f : 0.2f) - (stack.getItem() == RegistrationHandler.itemEntity.get() ? 0.3f : 0), stack.getItem() == RegistrationHandler.itemEntity.get() ? -0.15f : 0, true, doSneakCheck(player), light, matrix, builder); + renderArmPost(model.rightSleeve, 2.0F + (doSneakCheck(player) ? 0f : 0.2f) - (stack.getItem() == RegistrationHandler.itemEntity.get() ? 0.3f : 0), stack.getItem() == RegistrationHandler.itemEntity.get() ? -0.15f : 0, true, doSneakCheck(player), light, matrix, builder); } } else { - renderArmPost(model.rightArm, 2.0F + (doSneakCheck(player) ? 0f : 0.2f) - (stack.getItem() == RegistrationHandler.itemEntity ? 0.3f : 0), stack.getItem() == RegistrationHandler.itemEntity ? -0.15f : 0, true, doSneakCheck(player), light, matrix, builder); - renderArmPost(model.leftArm, 2.0F + (doSneakCheck(player) ? 0f : 0.2f) - (stack.getItem() == RegistrationHandler.itemEntity ? 0.3f : 0), stack.getItem() == RegistrationHandler.itemEntity ? 0.15f : 0, false, doSneakCheck(player), light, matrix, builder); - renderArmPost(model.leftSleeve, 2.0F + (doSneakCheck(player) ? 0f : 0.2f) - (stack.getItem() == RegistrationHandler.itemEntity ? 0.3f : 0), stack.getItem() == RegistrationHandler.itemEntity ? 0.15f : 0, false, doSneakCheck(player), light, matrix, builder); - renderArmPost(model.rightSleeve, 2.0F + (doSneakCheck(player) ? 0f : 0.2f) - (stack.getItem() == RegistrationHandler.itemEntity ? 0.3f : 0), stack.getItem() == RegistrationHandler.itemEntity ? -0.15f : 0, true, doSneakCheck(player), light, matrix, builder); + renderArmPost(model.rightArm, 2.0F + (doSneakCheck(player) ? 0f : 0.2f) - (stack.getItem() == RegistrationHandler.itemEntity.get() ? 0.3f : 0), stack.getItem() == RegistrationHandler.itemEntity.get() ? -0.15f : 0, true, doSneakCheck(player), light, matrix, builder); + renderArmPost(model.leftArm, 2.0F + (doSneakCheck(player) ? 0f : 0.2f) - (stack.getItem() == RegistrationHandler.itemEntity.get() ? 0.3f : 0), stack.getItem() == RegistrationHandler.itemEntity.get() ? 0.15f : 0, false, doSneakCheck(player), light, matrix, builder); + renderArmPost(model.leftSleeve, 2.0F + (doSneakCheck(player) ? 0f : 0.2f) - (stack.getItem() == RegistrationHandler.itemEntity.get() ? 0.3f : 0), stack.getItem() == RegistrationHandler.itemEntity.get() ? 0.15f : 0, false, doSneakCheck(player), light, matrix, builder); + renderArmPost(model.rightSleeve, 2.0F + (doSneakCheck(player) ? 0f : 0.2f) - (stack.getItem() == RegistrationHandler.itemEntity.get() ? 0.3f : 0), stack.getItem() == RegistrationHandler.itemEntity.get() ? -0.15f : 0, true, doSneakCheck(player), light, matrix, builder); } if (buffer instanceof BufferSource) @@ -675,7 +675,7 @@ public class RenderEvents Player player = event.getPlayer(); Pose pose = player.getPose(); ItemStack stack = player.getMainHandItem(); - if (pose != Pose.SWIMMING && pose != Pose.FALL_FLYING && !stack.isEmpty() && (stack.getItem() == RegistrationHandler.itemTile && ItemCarryonBlock.hasTileData(stack) || stack.getItem() == RegistrationHandler.itemEntity && ItemCarryonEntity.hasEntityData(stack))) + if (pose != Pose.SWIMMING && pose != Pose.FALL_FLYING && !stack.isEmpty() && (stack.getItem() == RegistrationHandler.itemTile.get() && ItemCarryonBlock.hasTileData(stack) || stack.getItem() == RegistrationHandler.itemEntity.get() && ItemCarryonEntity.hasEntityData(stack))) { PlayerModel model = event.getRenderer().getModel(); @@ -787,8 +787,8 @@ public class RenderEvents // { // ItemStack stack = event.getItemStack(); // - // if (stack != null && (stack.getItem() == RegistrationHandler.itemTile || - // stack.getItem() == RegistrationHandler.itemEntity)) + // if (stack != null && (stack.getItem() == RegistrationHandler.itemTile.get() || + // stack.getItem() == RegistrationHandler.itemEntity.get())) // { // event.setCanceled(true); // } diff --git a/src/main/java/tschipp/carryon/common/command/CommandCarryOn.java b/src/main/java/tschipp/carryon/common/command/CommandCarryOn.java index 256e846..aafc3dc 100644 --- a/src/main/java/tschipp/carryon/common/command/CommandCarryOn.java +++ b/src/main/java/tschipp/carryon/common/command/CommandCarryOn.java @@ -10,7 +10,7 @@ import com.mojang.brigadier.exceptions.CommandSyntaxException; import net.minecraft.commands.CommandSourceStack; import net.minecraft.commands.Commands; import net.minecraft.commands.arguments.EntityArgument; -import net.minecraft.network.chat.TextComponent; +import net.minecraft.network.chat.Component; import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.item.ItemStack; import net.minecraftforge.network.PacketDistributor; @@ -49,17 +49,17 @@ public class CommandCarryOn ServerPlayer player = source.getPlayerOrException(); ItemStack main = player.getMainHandItem(); - if (!main.isEmpty() && main.getItem() == RegistrationHandler.itemTile) + if (!main.isEmpty() && main.getItem() == RegistrationHandler.itemTile.get()) { - source.sendSuccess(new TextComponent("Block: " + ItemCarryonBlock.getBlock(main)), true); - source.sendSuccess(new TextComponent("BlockState: " + ItemCarryonBlock.getBlockState(main)), true); - source.sendSuccess(new TextComponent("ItemStack: " + ItemCarryonBlock.getItemStack(main)), true); + source.sendSuccess(Component.literal("Block: " + ItemCarryonBlock.getBlock(main)), true); + source.sendSuccess(Component.literal("BlockState: " + ItemCarryonBlock.getBlockState(main)), true); + source.sendSuccess(Component.literal("ItemStack: " + ItemCarryonBlock.getItemStack(main)), true); if (ModelOverridesHandler.hasCustomOverrideModel(ItemCarryonBlock.getBlockState(main), ItemCarryonBlock.getTileData(main))) - source.sendSuccess(new TextComponent("Override Model: " + ModelOverridesHandler.getOverrideObject(ItemCarryonBlock.getBlockState(main), ItemCarryonBlock.getTileData(main))), true); + source.sendSuccess(Component.literal("Override Model: " + ModelOverridesHandler.getOverrideObject(ItemCarryonBlock.getBlockState(main), ItemCarryonBlock.getTileData(main))), true); if (CustomPickupOverrideHandler.hasSpecialPickupConditions(ItemCarryonBlock.getBlockState(main))) - source.sendSuccess(new TextComponent("Custom Pickup Condition: " + CustomPickupOverrideHandler.getPickupCondition(ItemCarryonBlock.getBlockState(main))), true); + source.sendSuccess(Component.literal("Custom Pickup Condition: " + CustomPickupOverrideHandler.getPickupCondition(ItemCarryonBlock.getBlockState(main))), true); CarryOn.LOGGER.info("Block: " + ItemCarryonBlock.getBlock(main)); CarryOn.LOGGER.info("BlockState: " + ItemCarryonBlock.getBlockState(main)); @@ -73,13 +73,13 @@ public class CommandCarryOn return 1; } - else if (!main.isEmpty() && main.getItem() == RegistrationHandler.itemEntity) + else if (!main.isEmpty() && main.getItem() == RegistrationHandler.itemEntity.get()) { - source.sendSuccess(new TextComponent("Entity: " + ItemCarryonEntity.getEntity(main, player.level)), true); - source.sendSuccess(new TextComponent("Entity Name: " + ItemCarryonEntity.getEntityName(main)), true); + source.sendSuccess(Component.literal("Entity: " + ItemCarryonEntity.getEntity(main, player.level)), true); + source.sendSuccess(Component.literal("Entity Name: " + ItemCarryonEntity.getEntityName(main)), true); if (CustomPickupOverrideHandler.hasSpecialPickupConditions(ItemCarryonEntity.getEntity(main, player.level))) - source.sendSuccess(new TextComponent("Custom Pickup Condition: " + CustomPickupOverrideHandler.getPickupCondition(ItemCarryonEntity.getEntity(main, player.level))), true); + source.sendSuccess(Component.literal("Custom Pickup Condition: " + CustomPickupOverrideHandler.getPickupCondition(ItemCarryonEntity.getEntity(main, player.level))), true); CarryOn.LOGGER.info("Entity: " + ItemCarryonEntity.getEntity(main, player.level)); CarryOn.LOGGER.info("Entity Name: " + ItemCarryonEntity.getEntityName(main)); @@ -104,15 +104,15 @@ public class CommandCarryOn for (ServerPlayer player : players) { int cleared = 0; - cleared += player.getInventory().clearOrCountMatchingItems(stack -> !stack.isEmpty() && stack.getItem() == RegistrationHandler.itemTile, 64, player.inventoryMenu.getCraftSlots()); // TODO - cleared += player.getInventory().clearOrCountMatchingItems(stack -> !stack.isEmpty() && stack.getItem() == RegistrationHandler.itemEntity, 64, player.inventoryMenu.getCraftSlots()); + cleared += player.getInventory().clearOrCountMatchingItems(stack -> !stack.isEmpty() && stack.getItem() == RegistrationHandler.itemTile.get(), 64, player.inventoryMenu.getCraftSlots()); // TODO + cleared += player.getInventory().clearOrCountMatchingItems(stack -> !stack.isEmpty() && stack.getItem() == RegistrationHandler.itemEntity.get(), 64, player.inventoryMenu.getCraftSlots()); CarryOn.network.send(PacketDistributor.PLAYER.with(() -> player), new CarrySlotPacket(9, player.getId())); if (cleared != 1) - source.sendSuccess(new TextComponent("Cleared " + cleared + " Items!"), true); + source.sendSuccess(Component.literal("Cleared " + cleared + " Items!"), true); else - source.sendSuccess(new TextComponent("Cleared " + cleared + " Item!"), true); + source.sendSuccess(Component.literal("Cleared " + cleared + " Item!"), true); return 1; } diff --git a/src/main/java/tschipp/carryon/common/event/ItemEntityEvents.java b/src/main/java/tschipp/carryon/common/event/ItemEntityEvents.java index e3f0653..b824d1e 100644 --- a/src/main/java/tschipp/carryon/common/event/ItemEntityEvents.java +++ b/src/main/java/tschipp/carryon/common/event/ItemEntityEvents.java @@ -44,7 +44,7 @@ public class ItemEntityEvents { Player player = event.getPlayer(); ItemStack stack = player.getMainHandItem(); - if (!stack.isEmpty() && stack.getItem() == RegistrationHandler.itemEntity && ItemCarryonEntity.hasEntityData(stack)) + if (!stack.isEmpty() && stack.getItem() == RegistrationHandler.itemEntity.get() && ItemCarryonEntity.hasEntityData(stack)) { player.getPersistentData().remove("carrySlot"); event.setUseBlock(Result.DENY); @@ -73,7 +73,7 @@ public class ItemEntityEvents { ItemStack stack = eitem.getItem(); Item item = stack.getItem(); - if (item == RegistrationHandler.itemEntity && ItemCarryonEntity.hasEntityData(stack)) + if (item == RegistrationHandler.itemEntity.get() && ItemCarryonEntity.hasEntityData(stack)) { BlockPos pos = eitem.blockPosition(); Entity entity = ItemCarryonEntity.getEntity(stack, level); @@ -101,7 +101,7 @@ public class ItemEntityEvents if (main.isEmpty() && off.isEmpty() && CarryOnKeybinds.isKeyPressed(player)) { - ItemStack stack = new ItemStack(RegistrationHandler.itemEntity); + ItemStack stack = new ItemStack(RegistrationHandler.itemEntity.get()); if (entity.invulnerableTime == 0) { @@ -139,7 +139,7 @@ public class ItemEntityEvents } } - else if (!main.isEmpty() && main.getItem() == RegistrationHandler.itemEntity && ItemCarryonEntity.hasEntityData(main) && !CarryOnKeybinds.isKeyPressed(player) && Settings.stackableEntities.get()) + else if (!main.isEmpty() && main.getItem() == RegistrationHandler.itemEntity.get() && ItemCarryonEntity.hasEntityData(main) && !CarryOnKeybinds.isKeyPressed(player) && Settings.stackableEntities.get()) { Entity entityHeld = ItemCarryonEntity.getEntity(main, level); @@ -248,7 +248,7 @@ public class ItemEntityEvents LivingEntity entity = event.getEntityLiving(); Level level = entity.level; ItemStack main = entity.getMainHandItem(); - if (!main.isEmpty() && main.getItem() == RegistrationHandler.itemEntity && ItemCarryonEntity.hasEntityData(main)) + if (!main.isEmpty() && main.getItem() == RegistrationHandler.itemEntity.get() && ItemCarryonEntity.hasEntityData(main)) { BlockPos pos = entity.blockPosition(); BlockPos below = pos.relative(Direction.DOWN); diff --git a/src/main/java/tschipp/carryon/common/event/ItemEvents.java b/src/main/java/tschipp/carryon/common/event/ItemEvents.java index 8989074..4d6f305 100644 --- a/src/main/java/tschipp/carryon/common/event/ItemEvents.java +++ b/src/main/java/tschipp/carryon/common/event/ItemEvents.java @@ -1,5 +1,6 @@ package tschipp.carryon.common.event; +import java.awt.TextComponent; import java.util.Optional; import net.minecraft.ChatFormatting; @@ -8,7 +9,7 @@ import net.minecraft.core.Direction; import net.minecraft.nbt.CompoundTag; import net.minecraft.network.chat.ClickEvent; import net.minecraft.network.chat.ClickEvent.Action; -import net.minecraft.network.chat.TextComponent; +import net.minecraft.network.chat.Component; import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.Container; import net.minecraft.world.InteractionHand; @@ -73,7 +74,7 @@ public class ItemEvents Player player = event.getPlayer(); ItemStack stack = player.getMainHandItem(); - if (!stack.isEmpty() && stack.getItem() == RegistrationHandler.itemTile && ItemCarryonBlock.hasTileData(stack)) + if (!stack.isEmpty() && stack.getItem() == RegistrationHandler.itemTile.get() && ItemCarryonBlock.hasTileData(stack)) { player.getPersistentData().remove("carrySlot"); event.setUseBlock(Result.DENY); @@ -102,7 +103,7 @@ public class ItemEvents { ItemStack stack = eitem.getItem(); Item item = stack.getItem(); - if (item == RegistrationHandler.itemTile && ItemCarryonBlock.hasTileData(stack)) + if (item == RegistrationHandler.itemTile.get() && ItemCarryonBlock.hasTileData(stack)) { BlockPos pos = eitem.blockPosition(); BlockPos finalPos = pos; @@ -152,9 +153,9 @@ public class ItemEvents Level level = player.getCommandSenderWorld(); ItemStack carried = player.getMainHandItem(); - if (!carried.isEmpty() && carried.getItem() == RegistrationHandler.itemTile || carried.getItem() == RegistrationHandler.itemEntity) + if (!carried.isEmpty() && carried.getItem() == RegistrationHandler.itemTile.get() || carried.getItem() == RegistrationHandler.itemEntity.get()) { - if (carried.getItem() == RegistrationHandler.itemTile) + if (carried.getItem() == RegistrationHandler.itemTile.get()) { CarryOnOverride override = ScriptChecker.inspectBlock(ItemCarryonBlock.getBlockState(carried), level, player.blockPosition(), ItemCarryonBlock.getTileData(carried)); if (override != null) @@ -209,9 +210,9 @@ public class ItemEvents Level level = player.getCommandSenderWorld(); ItemStack carried = player.getMainHandItem(); - if (!carried.isEmpty() && carried.getItem() == RegistrationHandler.itemTile || carried.getItem() == RegistrationHandler.itemEntity) + if (!carried.isEmpty() && carried.getItem() == RegistrationHandler.itemTile.get() || carried.getItem() == RegistrationHandler.itemEntity.get()) { - if (carried.getItem() == RegistrationHandler.itemTile) + if (carried.getItem() == RegistrationHandler.itemTile.get()) { CarryOnOverride override = ScriptChecker.inspectBlock(ItemCarryonBlock.getBlockState(carried), level, player.blockPosition(), ItemCarryonBlock.getTileData(carried)); if (override != null) @@ -239,7 +240,7 @@ public class ItemEvents if (player != null && !Settings.hitWhileCarrying.get()) { ItemStack stack = player.getMainHandItem(); - if (!stack.isEmpty() && (stack.getItem() == RegistrationHandler.itemTile || stack.getItem() == RegistrationHandler.itemEntity)) + if (!stack.isEmpty() && (stack.getItem() == RegistrationHandler.itemTile.get() || stack.getItem() == RegistrationHandler.itemEntity.get())) event.setNewSpeed(0); } } @@ -249,7 +250,7 @@ public class ItemEvents { Player player = event.getPlayer(); ItemStack stack = player.getMainHandItem(); - if (!stack.isEmpty() && !Settings.hitWhileCarrying.get() && (stack.getItem() == RegistrationHandler.itemTile || stack.getItem() == RegistrationHandler.itemEntity)) + if (!stack.isEmpty() && !Settings.hitWhileCarrying.get() && (stack.getItem() == RegistrationHandler.itemTile.get() || stack.getItem() == RegistrationHandler.itemEntity.get())) { event.setCanceled(true); } @@ -262,7 +263,7 @@ public class ItemEvents if (player != null && !Settings.hitWhileCarrying.get()) { ItemStack stack = player.getMainHandItem(); - if (!stack.isEmpty() && (stack.getItem() == RegistrationHandler.itemTile || stack.getItem() == RegistrationHandler.itemEntity)) + if (!stack.isEmpty() && (stack.getItem() == RegistrationHandler.itemTile.get() || stack.getItem() == RegistrationHandler.itemEntity.get())) event.setCanceled(true); } } @@ -274,7 +275,7 @@ public class ItemEvents if (eliving instanceof Player player && Settings.dropCarriedWhenHit.get()) { ItemStack stack = player.getMainHandItem(); - if (!stack.isEmpty() && (stack.getItem() == RegistrationHandler.itemTile || stack.getItem() == RegistrationHandler.itemEntity) && !player.level.isClientSide) + if (!stack.isEmpty() && (stack.getItem() == RegistrationHandler.itemTile.get() || stack.getItem() == RegistrationHandler.itemEntity.get()) && !player.level.isClientSide) { player.setItemInHand(InteractionHand.MAIN_HAND, ItemStack.EMPTY); ItemEntity item = new ItemEntity(player.level, player.getX(), player.getY(), player.getZ(), stack); @@ -305,7 +306,7 @@ public class ItemEvents if (main.isEmpty() && off.isEmpty() && CarryOnKeybinds.isKeyPressed(player)) { - ItemStack stack = new ItemStack(RegistrationHandler.itemTile); + ItemStack stack = new ItemStack(RegistrationHandler.itemTile.get()); BlockEntity te = level.getBlockEntity(pos); if (PickupHandler.canPlayerPickUpBlock((ServerPlayer) player, te, level, pos)) @@ -360,10 +361,10 @@ public class ItemEvents BlockEntity.loadStatic(pos, statee, tag); } - player.displayClientMessage(new TextComponent(ChatFormatting.RED + "Error detected. Cannot pick up block."), false); - TextComponent s = new TextComponent(ChatFormatting.GOLD + "here"); + player.displayClientMessage(Component.literal(ChatFormatting.RED + "Error detected. Cannot pick up block."), false); + Component s = Component.literal(ChatFormatting.GOLD + "here"); s.getStyle().withClickEvent(new ClickEvent(Action.OPEN_URL, "https://github.com/Tschipp/CarryOn/issues")); - player.displayClientMessage(new TextComponent(ChatFormatting.RED + "Please report this error ").append(s), false); + player.displayClientMessage(Component.literal(ChatFormatting.RED + "Please report this error ").append(s), false); } } @@ -437,7 +438,7 @@ public class ItemEvents boolean wasDead = event.isWasDeath(); GameRules rules = player.level.getGameRules(); boolean keepInv = rules.getBoolean(GameRules.RULE_KEEPINVENTORY); - boolean wasCarrying = player.getInventory().contains(new ItemStack(RegistrationHandler.itemTile)) || player.getInventory().contains(new ItemStack(RegistrationHandler.itemEntity)); + boolean wasCarrying = player.getInventory().contains(new ItemStack(RegistrationHandler.itemTile.get())) || player.getInventory().contains(new ItemStack(RegistrationHandler.itemEntity.get())); if ((wasDead ? keepInv : true) && wasCarrying) { @@ -465,13 +466,13 @@ public class ItemEvents LivingEntity entity = event.getEntityLiving(); if (entity instanceof Player player && !entity.level.isClientSide) { - boolean hasCarried = player.getInventory().contains(new ItemStack(RegistrationHandler.itemTile)) || player.getInventory().contains(new ItemStack(RegistrationHandler.itemEntity)); + boolean hasCarried = player.getInventory().contains(new ItemStack(RegistrationHandler.itemTile.get())) || player.getInventory().contains(new ItemStack(RegistrationHandler.itemEntity.get())); ItemStack inHand = player.getMainHandItem(); - if (hasCarried && inHand.getItem() != RegistrationHandler.itemTile && inHand.getItem() != RegistrationHandler.itemEntity && player.getDimensionChangingDelay() == 0) + if (hasCarried && inHand.getItem() != RegistrationHandler.itemTile.get() && inHand.getItem() != RegistrationHandler.itemEntity.get() && player.getDimensionChangingDelay() == 0) { - int slotBlock = this.getSlot(player, RegistrationHandler.itemTile); - int slotEntity = this.getSlot(player, RegistrationHandler.itemEntity); + int slotBlock = this.getSlot(player, RegistrationHandler.itemTile.get()); + int slotEntity = this.getSlot(player, RegistrationHandler.itemEntity.get()); ItemEntity item = null; if (slotBlock != -1) diff --git a/src/main/java/tschipp/carryon/common/handler/CustomPickupOverrideHandler.java b/src/main/java/tschipp/carryon/common/handler/CustomPickupOverrideHandler.java index edff1cb..f1f6f24 100644 --- a/src/main/java/tschipp/carryon/common/handler/CustomPickupOverrideHandler.java +++ b/src/main/java/tschipp/carryon/common/handler/CustomPickupOverrideHandler.java @@ -13,6 +13,7 @@ import net.minecraftforge.fml.ModList; import net.minecraftforge.registries.ForgeRegistries; import tschipp.carryon.common.config.Configs.CustomPickupConditions; import tschipp.carryon.common.helper.InvalidConfigException; +import tschipp.carryon.common.helper.StringParser; public class CustomPickupOverrideHandler { @@ -85,15 +86,7 @@ public class CustomPickupOverrideHandler for (String cond : PICKUP_CONDITIONS.keySet()) { - BlockStateParser parser = new BlockStateParser(new StringReader(cond), false); - try - { - parser.parse(false); - } - catch (CommandSyntaxException e) - { - } - if (parser.getState() == state) + if(state == StringParser.getBlockState(cond)); return true; } @@ -104,15 +97,7 @@ public class CustomPickupOverrideHandler { for (String cond : PICKUP_CONDITIONS.keySet()) { - BlockStateParser parser = new BlockStateParser(new StringReader(cond), false); - try - { - parser.parse(false); - } - catch (CommandSyntaxException e) - { - } - if (parser.getState() == state) + if(state == StringParser.getBlockState(cond)); return PICKUP_CONDITIONS.get(cond); } return null; @@ -123,13 +108,13 @@ public class CustomPickupOverrideHandler if (!ModList.get().isLoaded("gamestages")) return false; - String name = entity.getType().getRegistryName().toString(); + String name = ForgeRegistries.ENTITIES.getKey(entity.getType()).toString(); return PICKUP_CONDITIONS_ENTITIES.containsKey(name); } public static String getPickupCondition(Entity entity) { - String name = entity.getType().getRegistryName().toString(); + String name = ForgeRegistries.ENTITIES.getKey(entity.getType()).toString(); return PICKUP_CONDITIONS_ENTITIES.get(name); } diff --git a/src/main/java/tschipp/carryon/common/handler/ListHandler.java b/src/main/java/tschipp/carryon/common/handler/ListHandler.java index 384d5b4..0c32354 100644 --- a/src/main/java/tschipp/carryon/common/handler/ListHandler.java +++ b/src/main/java/tschipp/carryon/common/handler/ListHandler.java @@ -33,7 +33,7 @@ public class ListHandler public static boolean isForbidden(Block block) { - String name = block.getRegistryName().toString(); + String name = ForgeRegistries.BLOCKS.getKey(block).toString(); if (FORBIDDEN_TILES.contains(name)) return true; else @@ -51,7 +51,7 @@ public class ListHandler for (TagKey tag : FORBIDDEN_TILES_TAGS) { - if (block.defaultBlockState().m_204336_(tag)) + if (block.defaultBlockState().is(tag)) return true; } @@ -61,12 +61,12 @@ public class ListHandler public static boolean isForbidden(Entity entity) { - String name = entity.getType().getRegistryName().toString(); + String name = ForgeRegistries.ENTITIES.getKey(entity.getType()).toString(); boolean contains = FORBIDDEN_ENTITIES.contains(name); for (TagKey> tag : FORBIDDEN_ENTITIES_TAGS) { - if (entity.getType().m_204039_(tag)) + if (entity.getType().is(tag)) return true; } @@ -75,12 +75,12 @@ public class ListHandler public static boolean isAllowed(Entity entity) { - String name = entity.getType().getRegistryName().toString(); + String name = ForgeRegistries.ENTITIES.getKey(entity.getType()).toString(); boolean contains = ALLOWED_ENTITIES.contains(name); for (TagKey> tag : ALLOWED_ENTITIES_TAGS) { - if (entity.getType().m_204039_(tag)) + if (entity.getType().is(tag)) return true; } @@ -89,12 +89,12 @@ public class ListHandler public static boolean isStackingForbidden(Entity entity) { - String name = entity.getType().getRegistryName().toString(); + String name = ForgeRegistries.ENTITIES.getKey(entity.getType()).toString(); boolean contains = FORBIDDEN_STACKING.contains(name); for (TagKey> tag : FORBIDDEN_STACKING_TAGS) { - if (entity.getType().m_204039_(tag)) + if (entity.getType().is(tag)) return true; } @@ -103,12 +103,12 @@ public class ListHandler public static boolean isStackingAllowed(Entity entity) { - String name = entity.getType().getRegistryName().toString(); + String name = ForgeRegistries.ENTITIES.getKey(entity.getType()).toString(); boolean contains = ALLOWED_STACKING.contains(name); for (TagKey> tag : ALLOWED_STACKING_TAGS) { - if (entity.getType().m_204039_(tag)) + if (entity.getType().is(tag)) return true; } @@ -117,7 +117,7 @@ public class ListHandler public static boolean isAllowed(Block block) { - String name = block.getRegistryName().toString(); + String name = ForgeRegistries.BLOCKS.getKey(block).toString(); if (ALLOWED_TILES.contains(name)) return true; else @@ -135,7 +135,7 @@ public class ListHandler for (TagKey tag : ALLOWED_TILES_TAGS) { - if (block.defaultBlockState().m_204336_(tag)) + if (block.defaultBlockState().is(tag)) return true; } @@ -277,8 +277,8 @@ public class ListHandler } } - 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)); + Map> blocktags = Registry.BLOCK.getTagNames().collect(Collectors.toMap(t -> t.location(), t -> t)); + Map>> entitytags = Registry.ENTITY_TYPE.getTagNames().collect(Collectors.toMap(t -> t.location(), t -> t)); diff --git a/src/main/java/tschipp/carryon/common/handler/ModelOverridesHandler.java b/src/main/java/tschipp/carryon/common/handler/ModelOverridesHandler.java index 70dc0f1..d5df5da 100644 --- a/src/main/java/tschipp/carryon/common/handler/ModelOverridesHandler.java +++ b/src/main/java/tschipp/carryon/common/handler/ModelOverridesHandler.java @@ -19,6 +19,7 @@ import net.minecraft.world.level.block.state.BlockState; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.fml.ModList; +import net.minecraftforge.registries.ForgeRegistries; import tschipp.carryon.common.config.Configs.ModelOverrides; import tschipp.carryon.common.helper.InvalidConfigException; import tschipp.carryon.common.helper.StringParser; @@ -131,12 +132,12 @@ public class ModelOverridesHandler keyComp.put("nbttag", tag); if (toOverrideObject instanceof Block) { - keyComp.putString("block", ((Block) toOverrideObject).getRegistryName().toString()); + keyComp.putString("block", ForgeRegistries.BLOCKS.getKey(((Block) toOverrideObject)).toString()); } else { keyComp.putInt("stateid", Block.getId((BlockState) toOverrideObject)); - keyComp.putString("block", ((BlockState) toOverrideObject).getBlock().getRegistryName().toString()); + keyComp.putString("block", ForgeRegistries.BLOCKS.getKey(((BlockState) toOverrideObject).getBlock()).toString()); } OVERRIDE_OBJECTS.put(keyComp, overrideObject); } diff --git a/src/main/java/tschipp/carryon/common/handler/PickupHandler.java b/src/main/java/tschipp/carryon/common/handler/PickupHandler.java index 83b1bb1..46edcff 100644 --- a/src/main/java/tschipp/carryon/common/handler/PickupHandler.java +++ b/src/main/java/tschipp/carryon/common/handler/PickupHandler.java @@ -103,7 +103,7 @@ public class PickupHandler { double distance = pos.distanceToSqr(player.position()); - if (distance <= Math.pow(Settings.maxDistance.get(), 2) && toPickUp instanceof TamableAnimal tame && tame.getOwnerUUID() != null && tame.getOwnerUUID() != Player.createPlayerUUID(player.getGameProfile())) + if (distance <= Math.pow(Settings.maxDistance.get(), 2) && toPickUp instanceof TamableAnimal tame && tame.getOwnerUUID() != null && tame.getOwnerUUID() != player.getGameProfile().getId()) return false; if (CustomPickupOverrideHandler.hasSpecialPickupConditions(toPickUp)) @@ -136,7 +136,7 @@ public class PickupHandler if (toPickUp instanceof TamableAnimal tame) { UUID owner = tame.getOwnerUUID(); - UUID playerID = Player.createPlayerUUID(player.getGameProfile()); + UUID playerID = player.getGameProfile().getId(); if (owner != null && !owner.equals(playerID)) return false; } diff --git a/src/main/java/tschipp/carryon/common/handler/RegistrationHandler.java b/src/main/java/tschipp/carryon/common/handler/RegistrationHandler.java index 3b62dfd..3cc8e25 100644 --- a/src/main/java/tschipp/carryon/common/handler/RegistrationHandler.java +++ b/src/main/java/tschipp/carryon/common/handler/RegistrationHandler.java @@ -6,7 +6,11 @@ import net.minecraftforge.common.capabilities.RegisterCapabilitiesEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod.EventBusSubscriber; import net.minecraftforge.fml.common.Mod.EventBusSubscriber.Bus; +import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; +import net.minecraftforge.registries.DeferredRegister; +import net.minecraftforge.registries.ForgeRegistries; import net.minecraftforge.registries.ObjectHolder; +import net.minecraftforge.registries.RegistryObject; import tschipp.carryon.CarryOn; import tschipp.carryon.client.event.RenderEntityEvents; import tschipp.carryon.client.event.RenderEvents; @@ -22,18 +26,17 @@ import tschipp.carryon.common.item.ItemCarryonEntity; @EventBusSubscriber(modid = CarryOn.MODID, bus = Bus.MOD) public class RegistrationHandler { - @ObjectHolder("carryon:tile_item") - public static Item itemTile; + + private static final DeferredRegister ITEMS = DeferredRegister.create(ForgeRegistries.ITEMS, CarryOn.MODID); - @ObjectHolder("carryon:entity_item") - public static Item itemEntity; + public static final RegistryObject itemTile = ITEMS.register("tile_item", () -> new ItemCarryonBlock()); + public static final RegistryObject itemEntity = ITEMS.register("entity_item", () -> new ItemCarryonEntity()); - public static void regItems() - { - itemTile = new ItemCarryonBlock(); - itemEntity = new ItemCarryonEntity(); + + public static void init() { + ITEMS.register(FMLJavaModLoadingContext.get().getModEventBus()); } - + public static void regCommonEvents() { MinecraftForge.EVENT_BUS.register(new ItemEvents()); diff --git a/src/main/java/tschipp/carryon/common/helper/ScriptParseHelper.java b/src/main/java/tschipp/carryon/common/helper/ScriptParseHelper.java index 2996f47..b73eef1 100644 --- a/src/main/java/tschipp/carryon/common/helper/ScriptParseHelper.java +++ b/src/main/java/tschipp/carryon/common/helper/ScriptParseHelper.java @@ -15,6 +15,7 @@ import net.minecraft.world.level.material.Material; import net.minecraft.world.scores.Objective; import net.minecraft.world.scores.Score; import net.minecraft.world.scores.Scoreboard; +import net.minecraftforge.registries.ForgeRegistries; public class ScriptParseHelper { @@ -256,7 +257,7 @@ public class ScriptParseHelper for (MobEffectInstance effect : effects) { int amp = effect.getAmplifier(); - String name = effect.getEffect().getRegistryName().toString(); + String name = ForgeRegistries.MOB_EFFECTS.getKey(effect.getEffect()).toString(); if (names.contains(name)) { diff --git a/src/main/java/tschipp/carryon/common/helper/StringParser.java b/src/main/java/tschipp/carryon/common/helper/StringParser.java index 1a4ba08..668ffa7 100644 --- a/src/main/java/tschipp/carryon/common/helper/StringParser.java +++ b/src/main/java/tschipp/carryon/common/helper/StringParser.java @@ -5,7 +5,11 @@ import javax.annotation.Nullable; import com.mojang.brigadier.StringReader; import net.minecraft.commands.arguments.blocks.BlockStateParser; +import net.minecraft.commands.arguments.blocks.BlockStateParser.BlockResult; import net.minecraft.commands.arguments.item.ItemParser; +import net.minecraft.commands.arguments.item.ItemParser.ItemResult; +import net.minecraft.core.HolderLookup; +import net.minecraft.core.Registry; import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.TagParser; import net.minecraft.world.item.Item; @@ -32,12 +36,11 @@ public class StringParser if (string == null) return null; - BlockStateParser parser = new BlockStateParser(new StringReader(string), false); try { - parser.parse(false); - return parser.getState(); + BlockResult result = BlockStateParser.parseForBlock(HolderLookup.forRegistry(Registry.BLOCK), new StringReader(string), false); + return result.blockState(); } catch (Exception e) { @@ -52,12 +55,11 @@ public class StringParser if (string == null) return null; - ItemParser parser = new ItemParser(new StringReader(string), false); try { - parser.parse(); - return parser.getItem(); + ItemResult res = ItemParser.parseForItem(HolderLookup.forRegistry(Registry.ITEM), new StringReader(string)); + return res.item().get(); } catch (Exception e) { @@ -71,13 +73,13 @@ public class StringParser if (string == null) return null; - ItemParser parser = new ItemParser(new StringReader(string), false); try { - parser.parse(); - Item item = parser.getItem(); - CompoundTag nbt = parser.getNbt(); + ItemResult res = ItemParser.parseForItem(HolderLookup.forRegistry(Registry.ITEM), new StringReader(string)); + + Item item = res.item().get(); + CompoundTag nbt = res.nbt(); ItemStack stack = new ItemStack(item, 1); diff --git a/src/main/java/tschipp/carryon/common/item/ItemCarryonBlock.java b/src/main/java/tschipp/carryon/common/item/ItemCarryonBlock.java index 6084c93..6193532 100644 --- a/src/main/java/tschipp/carryon/common/item/ItemCarryonBlock.java +++ b/src/main/java/tschipp/carryon/common/item/ItemCarryonBlock.java @@ -13,7 +13,6 @@ import net.minecraft.nbt.CompoundTag; import net.minecraft.network.chat.ClickEvent; import net.minecraft.network.chat.ClickEvent.Action; import net.minecraft.network.chat.Component; -import net.minecraft.network.chat.TextComponent; import net.minecraft.world.InteractionHand; import net.minecraft.world.InteractionResult; import net.minecraft.world.effect.MobEffectInstance; @@ -35,6 +34,7 @@ import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.util.BlockSnapshot; import net.minecraftforge.event.world.BlockEvent.EntityPlaceEvent; import net.minecraftforge.fml.ModList; +import net.minecraftforge.registries.ForgeRegistries; import tschipp.carryon.CarryOn; import tschipp.carryon.client.keybinds.CarryOnKeybinds; import tschipp.carryon.common.config.Configs.Settings; @@ -51,7 +51,6 @@ public class ItemCarryonBlock extends Item public ItemCarryonBlock() { super(new Item.Properties().stacksTo(1)); - this.setRegistryName(CarryOn.MODID, "tile_item"); } @Override @@ -77,7 +76,7 @@ public class ItemCarryonBlock extends Item return getItemStack(stack).getHoverName(); } - return new TextComponent(""); + return Component.literal(""); } @Override @@ -207,7 +206,7 @@ public class ItemCarryonBlock extends Item { CarryOn.LOGGER.info("Block: " + ItemCarryonBlock.getBlock(stack)); CarryOn.LOGGER.info("BlockState: " + ItemCarryonBlock.getBlockState(stack)); - // CarryOn.LOGGER.info("Meta: " + ItemTile.getMeta(stack)); + // CarryOn.LOGGER.info("Meta: " + itemTile.get().getMeta(stack)); CarryOn.LOGGER.info("ItemStack: " + ItemCarryonBlock.getItemStack(stack)); if (ModelOverridesHandler.hasCustomOverrideModel(ItemCarryonBlock.getBlockState(stack), ItemCarryonBlock.getTileData(stack))) @@ -216,10 +215,10 @@ public class ItemCarryonBlock extends Item if (CustomPickupOverrideHandler.hasSpecialPickupConditions(ItemCarryonBlock.getBlockState(stack))) CarryOn.LOGGER.info("Custom Pickup Condition: " + CustomPickupOverrideHandler.getPickupCondition(ItemCarryonBlock.getBlockState(stack))); - player.displayClientMessage(new TextComponent(ChatFormatting.RED + "Error detected. Cannot place block. Execute \"/carryon clear\" to remove the item"), false); - TextComponent s = new TextComponent(ChatFormatting.GOLD + "here"); + player.displayClientMessage(Component.literal(ChatFormatting.RED + "Error detected. Cannot place block. Execute \"/carryon clear\" to remove the item"), false); + Component s = Component.literal(ChatFormatting.GOLD + "here"); s.getStyle().withClickEvent(new ClickEvent(Action.OPEN_URL, "https://github.com/Tschipp/CarryOn/issues")); - player.displayClientMessage(new TextComponent(ChatFormatting.RED + "Please report this error ").append(s), false); + player.displayClientMessage(Component.literal(ChatFormatting.RED + "Please report this error ").append(s), false); } } @@ -276,7 +275,7 @@ public class ItemCarryonBlock extends Item // ItemStack drop = new ItemStack(state.getBlock().getItemDropped(state, // itemRand, 0), 1, state.getBlock().damageDropped(state)); - tag.putString("block", state.getBlock().getRegistryName().toString()); + tag.putString("block", ForgeRegistries.BLOCKS.getKey(state.getBlock()).toString()); // Item item = Item.getItemFromBlock(state.getBlock()); // tag.setInt("meta", drop.getItemDamage()); tag.putInt("stateid", Block.getId(state)); diff --git a/src/main/java/tschipp/carryon/common/item/ItemCarryonEntity.java b/src/main/java/tschipp/carryon/common/item/ItemCarryonEntity.java index fe15a0e..bcafb29 100644 --- a/src/main/java/tschipp/carryon/common/item/ItemCarryonEntity.java +++ b/src/main/java/tschipp/carryon/common/item/ItemCarryonEntity.java @@ -9,8 +9,6 @@ import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.nbt.CompoundTag; import net.minecraft.network.chat.Component; -import net.minecraft.network.chat.TextComponent; -import net.minecraft.network.chat.TranslatableComponent; import net.minecraft.world.InteractionHand; import net.minecraft.world.InteractionResult; import net.minecraft.world.effect.MobEffectInstance; @@ -49,7 +47,6 @@ public class ItemCarryonEntity extends Item public ItemCarryonEntity() { super(new Item.Properties().stacksTo(1)); - this.setRegistryName(CarryOn.MODID, "entity_item"); } @Override @@ -58,10 +55,10 @@ public class ItemCarryonEntity extends Item if (hasEntityData(stack)) { - return new TranslatableComponent(getEntityType(stack).getDescriptionId()); + return Component.translatable(getEntityType(stack).getDescriptionId()); } - return new TextComponent(""); + return Component.literal(""); } public static boolean hasEntityData(ItemStack stack) diff --git a/src/main/java/tschipp/carryon/common/scripting/ScriptChecker.java b/src/main/java/tschipp/carryon/common/scripting/ScriptChecker.java index bd40744..90eb703 100644 --- a/src/main/java/tschipp/carryon/common/scripting/ScriptChecker.java +++ b/src/main/java/tschipp/carryon/common/scripting/ScriptChecker.java @@ -19,6 +19,7 @@ import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.material.Material; import net.minecraftforge.fml.ModList; import net.minecraftforge.fml.util.ObfuscationReflectionHelper; +import net.minecraftforge.registries.ForgeRegistries; import tschipp.carryon.common.config.Configs.Settings; import tschipp.carryon.common.handler.ListHandler; import tschipp.carryon.common.helper.ScriptParseHelper; @@ -58,7 +59,7 @@ public class ScriptChecker if (!Settings.useScripts.get()) return null; - String name = entity.getType().getRegistryName().toString(); + String name = ForgeRegistries.ENTITIES.getKey(entity.getType()).toString(); float height = entity.getBbHeight(); float width = entity.getBbWidth(); float health = entity instanceof LivingEntity ? ((LivingEntity) entity).getHealth() : 0.0f; diff --git a/src/main/java/tschipp/carryon/compat/obfuscate/ObfuscateEvents.java b/src/main/java/tschipp/carryon/compat/obfuscate/ObfuscateEvents.java index 7257461..0974ac7 100644 --- a/src/main/java/tschipp/carryon/compat/obfuscate/ObfuscateEvents.java +++ b/src/main/java/tschipp/carryon/compat/obfuscate/ObfuscateEvents.java @@ -34,9 +34,9 @@ // // PlayerModel model = event.getModelPlayer(); // ItemStack stack = player.getMainHandItem(); -// if (!stack.isEmpty() && stack.getItem() == RegistrationHandler.itemTile && +// if (!stack.isEmpty() && stack.getItem() == RegistrationHandler.itemTile.get() && // ItemCarryonBlock.hasTileData(stack) || stack.getItem() == -// RegistrationHandler.itemEntity && ItemCarryonEntity.hasEntityData(stack)) +// RegistrationHandler.itemEntity.get() && ItemCarryonEntity.hasEntityData(stack)) // { // // float rotation = 0; @@ -66,11 +66,11 @@ // else if (renderLeft) // { // renderArmPre(model.leftArm, 0.8F + (player.isShiftKeyDown() ? 0.2f : 0f) - -// (stack.getItem() == RegistrationHandler.itemEntity ? -0.2f : 0), -// (stack.getItem() == RegistrationHandler.itemEntity ? 0.15f : 0), rotation); +// (stack.getItem() == RegistrationHandler.itemEntity.get() ? -0.2f : 0), +// (stack.getItem() == RegistrationHandler.itemEntity.get() ? 0.15f : 0), rotation); // renderArmPre(model.leftSleeve, 0.8F + (player.isShiftKeyDown() ? 0.2f : 0f) - -// (stack.getItem() == RegistrationHandler.itemEntity ? -0.2f : 0), -// (stack.getItem() == RegistrationHandler.itemEntity ? 0.15f : 0), rotation); +// (stack.getItem() == RegistrationHandler.itemEntity.get() ? -0.2f : 0), +// (stack.getItem() == RegistrationHandler.itemEntity.get() ? 0.15f : 0), rotation); // } // // if (renderRight && rotRight != null) @@ -83,28 +83,28 @@ // else if (renderRight) // { // renderArmPre(model.rightArm, 0.8F + (player.isShiftKeyDown() ? 0.2f : 0f) - -// (stack.getItem() == RegistrationHandler.itemEntity ? -0.2f : 0), -// (stack.getItem() == RegistrationHandler.itemEntity ? -0.15f : 0), rotation); +// (stack.getItem() == RegistrationHandler.itemEntity.get() ? -0.2f : 0), +// (stack.getItem() == RegistrationHandler.itemEntity.get() ? -0.15f : 0), rotation); // renderArmPre(model.rightSleeve, 0.8F + (player.isShiftKeyDown() ? 0.2f : 0f) -// - (stack.getItem() == RegistrationHandler.itemEntity ? -0.2f : 0), -// (stack.getItem() == RegistrationHandler.itemEntity ? -0.15f : 0), rotation); +// - (stack.getItem() == RegistrationHandler.itemEntity.get() ? -0.2f : 0), +// (stack.getItem() == RegistrationHandler.itemEntity.get() ? -0.15f : 0), rotation); // } // // } // else // { // renderArmPre(model.rightArm, 0.8F + (player.isShiftKeyDown() ? 0.2f : 0f) - -// (stack.getItem() == RegistrationHandler.itemEntity ? -0.2f : 0), -// (stack.getItem() == RegistrationHandler.itemEntity ? -0.15f : 0), rotation); +// (stack.getItem() == RegistrationHandler.itemEntity.get() ? -0.2f : 0), +// (stack.getItem() == RegistrationHandler.itemEntity.get() ? -0.15f : 0), rotation); // renderArmPre(model.rightSleeve, 0.8F + (player.isShiftKeyDown() ? 0.2f : 0f) -// - (stack.getItem() == RegistrationHandler.itemEntity ? -0.2f : 0), -// (stack.getItem() == RegistrationHandler.itemEntity ? -0.15f : 0), rotation); +// - (stack.getItem() == RegistrationHandler.itemEntity.get() ? -0.2f : 0), +// (stack.getItem() == RegistrationHandler.itemEntity.get() ? -0.15f : 0), rotation); // renderArmPre(model.leftArm, 0.8F + (player.isShiftKeyDown() ? 0.2f : 0f) - -// (stack.getItem() == RegistrationHandler.itemEntity ? -0.2f : 0), -// (stack.getItem() == RegistrationHandler.itemEntity ? 0.15f : 0), rotation); +// (stack.getItem() == RegistrationHandler.itemEntity.get() ? -0.2f : 0), +// (stack.getItem() == RegistrationHandler.itemEntity.get() ? 0.15f : 0), rotation); // renderArmPre(model.leftSleeve, 0.8F + (player.isShiftKeyDown() ? 0.2f : 0f) - -// (stack.getItem() == RegistrationHandler.itemEntity ? -0.2f : 0), -// (stack.getItem() == RegistrationHandler.itemEntity ? 0.15f : 0), rotation); +// (stack.getItem() == RegistrationHandler.itemEntity.get() ? -0.2f : 0), +// (stack.getItem() == RegistrationHandler.itemEntity.get() ? 0.15f : 0), rotation); // } // // } diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml index 2260b24..46c77ae 100644 --- a/src/main/resources/META-INF/mods.toml +++ b/src/main/resources/META-INF/mods.toml @@ -1,5 +1,5 @@ modLoader="javafml" -loaderVersion="[40,)" +loaderVersion="[41,)" 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="[40.0.3,)" #mandatory + versionRange="[41,)" #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.2,1.19)" + versionRange="[1.19,1.20)" ordering="NONE" side="BOTH"