diff --git a/.vscode/launch.json b/.vscode/launch.json new file mode 100644 index 0000000..4f25261 --- /dev/null +++ b/.vscode/launch.json @@ -0,0 +1,71 @@ +{ + "version": "0.2.0", + "configurations": [ + { + "type": "java", + "request": "launch", + "name": "NeoForge Client (:NeoForge)", + "presentation": { + "group": "Mod Development - NeoForge", + "order": 0 + }, + "projectName": "NeoForge", + "mainClass": "net.neoforged.devlaunch.Main", + "args": [ + "@/home/hanro/Documents/GitHub/CarryOn/NeoForge/build/moddev/clientRunProgramArgs.txt" + ], + "vmArgs": [ + "@/home/hanro/Documents/GitHub/CarryOn/NeoForge/build/moddev/clientRunVmArgs.txt", + "-Dfml.modFolders\u003dcarryon%%/home/hanro/Documents/GitHub/CarryOn/NeoForge/bin/main" + ], + "cwd": "${workspaceFolder}/NeoForge/run", + "env": {}, + "console": "internalConsole", + "shortenCommandLine": "none" + }, + { + "type": "java", + "request": "launch", + "name": "NeoForge Data (:NeoForge)", + "presentation": { + "group": "Mod Development - NeoForge", + "order": 1 + }, + "projectName": "NeoForge", + "mainClass": "net.neoforged.devlaunch.Main", + "args": [ + "@/home/hanro/Documents/GitHub/CarryOn/NeoForge/build/moddev/dataRunProgramArgs.txt" + ], + "vmArgs": [ + "@/home/hanro/Documents/GitHub/CarryOn/NeoForge/build/moddev/dataRunVmArgs.txt", + "-Dfml.modFolders\u003dcarryon%%/home/hanro/Documents/GitHub/CarryOn/NeoForge/bin/main" + ], + "cwd": "${workspaceFolder}/NeoForge/run", + "env": {}, + "console": "internalConsole", + "shortenCommandLine": "none" + }, + { + "type": "java", + "request": "launch", + "name": "NeoForge Server (:NeoForge)", + "presentation": { + "group": "Mod Development - NeoForge", + "order": 2 + }, + "projectName": "NeoForge", + "mainClass": "net.neoforged.devlaunch.Main", + "args": [ + "@/home/hanro/Documents/GitHub/CarryOn/NeoForge/build/moddev/serverRunProgramArgs.txt" + ], + "vmArgs": [ + "@/home/hanro/Documents/GitHub/CarryOn/NeoForge/build/moddev/serverRunVmArgs.txt", + "-Dfml.modFolders\u003dcarryon%%/home/hanro/Documents/GitHub/CarryOn/NeoForge/bin/main" + ], + "cwd": "${workspaceFolder}/NeoForge/run", + "env": {}, + "console": "internalConsole", + "shortenCommandLine": "none" + } + ] +} \ No newline at end of file diff --git a/Common/build.gradle b/Common/build.gradle index 2890640..4916994 100644 --- a/Common/build.gradle +++ b/Common/build.gradle @@ -20,7 +20,7 @@ neoForge { accessTransformers.from(at.absolutePath) } parchment { - minecraftVersion = minecraft_version + minecraftVersion = parchment_game_version mappingsVersion = parchment_version } } diff --git a/Common/src/main/java/tschipp/carryon/CarryOnCommon.java b/Common/src/main/java/tschipp/carryon/CarryOnCommon.java index 44f4325..6fbfd1e 100644 --- a/Common/src/main/java/tschipp/carryon/CarryOnCommon.java +++ b/Common/src/main/java/tschipp/carryon/CarryOnCommon.java @@ -26,10 +26,7 @@ import net.minecraft.core.HolderLookup; import net.minecraft.core.RegistryAccess; import net.minecraft.core.RegistrySetBuilder; import net.minecraft.core.registries.BuiltInRegistries; -import net.minecraft.core.registries.Registries; import net.minecraft.server.level.ServerPlayer; -import net.minecraft.world.effect.MobEffectInstance; -import net.minecraft.world.effect.MobEffects; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.player.Inventory; import net.minecraft.world.entity.player.Player; @@ -108,8 +105,6 @@ public class CarryOnCommon public static void onCarryTick(ServerPlayer player) { - //TODO: Remove - System.out.println(player.getGameProfile()); CarryOnData carry = CarryOnDataManager.getCarryData(player); if(carry.isCarrying()) { @@ -117,7 +112,7 @@ public class CarryOnCommon { String cmd = carry.getActiveScript().get().scriptEffects().commandLoop(); if(!cmd.isEmpty()) - player.level().getServer().getCommands().performPrefixedCommand(player.level().getServer().createCommandSourceStack(), "/execute as " + player.getGameProfile() + " run " + cmd); + player.level().getServer().getCommands().performPrefixedCommand(player.level().getServer().createCommandSourceStack(), "/execute as " + player.getGameProfile().name() + " run " + cmd); } Inventory inv = player.getInventory(); diff --git a/Common/src/main/java/tschipp/carryon/CarryOnCommonClient.java b/Common/src/main/java/tschipp/carryon/CarryOnCommonClient.java index 6167c79..d2b50e1 100644 --- a/Common/src/main/java/tschipp/carryon/CarryOnCommonClient.java +++ b/Common/src/main/java/tschipp/carryon/CarryOnCommonClient.java @@ -21,8 +21,6 @@ package tschipp.carryon; import net.minecraft.client.Minecraft; -import net.minecraft.client.input.MouseButtonEvent; -import net.minecraft.client.input.MouseButtonInfo; import net.minecraft.world.entity.player.Player; import tschipp.carryon.client.keybinds.CarryOnKeybinds; import tschipp.carryon.common.carry.CarryOnData; @@ -36,11 +34,11 @@ public class CarryOnCommonClient Player player = mc.player; if(player != null) { CarryOnData carry = CarryOnDataManager.getCarryData(player); - if ((CarryOnKeybinds.carryKey.isUnbound() ? player.isShiftKeyDown() : (CarryOnKeybinds.carryKey.isDown() || checkMouse())) && !carry.isKeyPressed()) { + if ((CarryOnKeybinds.carryKey.isUnbound() ? player.isShiftKeyDown() : (CarryOnKeybinds.carryKey.isDown())) && !carry.isKeyPressed()) { CarryOnKeybinds.onCarryKey(true); carry.setKeyPressed(true); CarryOnDataManager.setCarryData(player, carry); - } else if (!(CarryOnKeybinds.carryKey.isUnbound() ? player.isShiftKeyDown() : (CarryOnKeybinds.carryKey.isDown() || checkMouse()) ) && carry.isKeyPressed()) { + } else if (!(CarryOnKeybinds.carryKey.isUnbound() ? player.isShiftKeyDown() : (CarryOnKeybinds.carryKey.isDown() ) ) && carry.isKeyPressed()) { CarryOnKeybinds.onCarryKey(false); carry.setKeyPressed(false); CarryOnDataManager.setCarryData(player, carry); @@ -48,11 +46,6 @@ public class CarryOnCommonClient } } - private static boolean checkMouse() - { - Minecraft mc = Minecraft.getInstance(); - return (CarryOnKeybinds.carryKey.matchesMouse(new MouseButtonEvent(0,0, new MouseButtonInfo(0,0))) && mc.mouseHandler.isLeftPressed()) || (CarryOnKeybinds.carryKey.matchesMouse(new MouseButtonEvent(0,0, new MouseButtonInfo(1,0))) || CarryOnKeybinds.carryKey.matchesMouse(new MouseButtonEvent(0,0, new MouseButtonInfo(3,0))) && mc.mouseHandler.isMiddlePressed()); - } public static void onCarryClientTick() { diff --git a/Common/src/main/java/tschipp/carryon/client/keybinds/CarryOnKeybinds.java b/Common/src/main/java/tschipp/carryon/client/keybinds/CarryOnKeybinds.java index bc1a4e6..9b0aea5 100644 --- a/Common/src/main/java/tschipp/carryon/client/keybinds/CarryOnKeybinds.java +++ b/Common/src/main/java/tschipp/carryon/client/keybinds/CarryOnKeybinds.java @@ -22,11 +22,13 @@ package tschipp.carryon.client.keybinds; import com.mojang.blaze3d.platform.InputConstants; import net.minecraft.client.KeyMapping; +import net.minecraft.resources.ResourceLocation; import tschipp.carryon.Constants; import tschipp.carryon.networking.serverbound.ServerboundCarryKeyPressedPacket; import tschipp.carryon.platform.Services; import java.util.function.Consumer; +import net.minecraft.client.KeyMapping.Category; public class CarryOnKeybinds { @@ -34,10 +36,13 @@ public class CarryOnKeybinds public static void registerKeybinds(Consumer registrar) { + Category category = Category.register(ResourceLocation.withDefaultNamespace("key.carry.category")); + + if(Services.PLATFORM.isModLoaded("amecsapi")) - carryKey = new ConflictFreeKeyMapping("key.carry.desc", InputConstants.KEY_LSHIFT, "key.carry.category"); + carryKey = new KeyMapping("key.carry.desc", InputConstants.KEY_LSHIFT, category); else - carryKey = new ConflictFreeKeyMapping("key.carry.desc", Services.PLATFORM.getPlatformName().equals("Forge") ? InputConstants.KEY_LSHIFT : InputConstants.UNKNOWN.getValue(), "key.carry.category"); + carryKey = new KeyMapping("key.carry.desc", Services.PLATFORM.getPlatformName().equals("Forge") ? InputConstants.KEY_LSHIFT : InputConstants.UNKNOWN.getValue(), category); registrar.accept(carryKey); } diff --git a/Common/src/main/java/tschipp/carryon/client/keybinds/ConflictFreeKeyMapping.java b/Common/src/main/java/tschipp/carryon/client/keybinds/ConflictFreeKeyMapping.java index 9d67683..e69de29 100644 --- a/Common/src/main/java/tschipp/carryon/client/keybinds/ConflictFreeKeyMapping.java +++ b/Common/src/main/java/tschipp/carryon/client/keybinds/ConflictFreeKeyMapping.java @@ -1,43 +0,0 @@ -/* - * GNU Lesser General Public License v3 - * Copyright (C) 2024 Tschipp - * mrtschipp@gmail.com - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 3 of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - -package tschipp.carryon.client.keybinds; - -import com.mojang.blaze3d.platform.InputConstants.Type; -import net.minecraft.client.KeyMapping; - -public class ConflictFreeKeyMapping extends KeyMapping -{ - public ConflictFreeKeyMapping(String $$0, int $$1, Category $$2) - { - super($$0, $$1, $$2); - } - - public ConflictFreeKeyMapping(String $$0, Type $$1, int $$2, Category $$3) - { - super($$0, $$1, $$2, $$3); - } - - @Override - public boolean same(KeyMapping $$0) - { - return false; - } -} diff --git a/Common/src/main/java/tschipp/carryon/client/modeloverride/ModelOverride.java b/Common/src/main/java/tschipp/carryon/client/modeloverride/ModelOverride.java index 09c1b0a..52d2cb2 100644 --- a/Common/src/main/java/tschipp/carryon/client/modeloverride/ModelOverride.java +++ b/Common/src/main/java/tschipp/carryon/client/modeloverride/ModelOverride.java @@ -23,7 +23,6 @@ package tschipp.carryon.client.modeloverride; import com.mojang.brigadier.StringReader; import com.mojang.brigadier.exceptions.CommandSyntaxException; import com.mojang.datafixers.util.Either; -import com.mojang.serialization.Codec; import com.mojang.serialization.DataResult; import net.minecraft.commands.arguments.blocks.BlockStateParser; import net.minecraft.commands.arguments.blocks.BlockStateParser.BlockResult; @@ -40,22 +39,13 @@ import tschipp.carryon.common.scripting.Matchables.NBTCondition; import javax.annotation.Nullable; import java.util.Map; -public class ModelOverride -{ - //public static Codec CODEC = Codec.STRING.comapFlatMap(ModelOverride::of, override -> override.raw); - - private String raw; +public class ModelOverride { private BlockResult parsedBlock; - private Type type; - private Either parsedRHS; private Either renderObject; private ModelOverride(String raw, BlockResult parsedBlock, Type type, Either parsedRHS) { - this.raw = raw; this.parsedBlock = parsedBlock; - this.type = type; - this.parsedRHS = parsedRHS; parsedRHS.ifLeft(res -> { ItemStack stack = new ItemStack(res.item()); diff --git a/Common/src/main/java/tschipp/carryon/client/render/CarriedObjectRender.java b/Common/src/main/java/tschipp/carryon/client/render/CarriedObjectRender.java index 2c6dd7f..747a918 100644 --- a/Common/src/main/java/tschipp/carryon/client/render/CarriedObjectRender.java +++ b/Common/src/main/java/tschipp/carryon/client/render/CarriedObjectRender.java @@ -20,35 +20,23 @@ package tschipp.carryon.client.render; -import com.mojang.blaze3d.pipeline.BlendFunction; -import com.mojang.blaze3d.pipeline.RenderPipeline; -import com.mojang.blaze3d.pipeline.RenderTarget; -import com.mojang.blaze3d.platform.DepthTestFunction; -import com.mojang.blaze3d.systems.RenderSystem; -import com.mojang.blaze3d.textures.GpuTexture; import com.mojang.blaze3d.vertex.*; import com.mojang.math.Axis; import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.MultiBufferSource; -import net.minecraft.client.renderer.MultiBufferSource.BufferSource; import net.minecraft.client.renderer.RenderType; -import net.minecraft.client.renderer.ShaderDefines; +import net.minecraft.client.renderer.SubmitNodeCollector; import net.minecraft.client.renderer.entity.EntityRenderDispatcher; import net.minecraft.client.renderer.item.ItemStackRenderState; +import net.minecraft.client.renderer.state.CameraRenderState; import net.minecraft.client.renderer.texture.OverlayTexture; -import net.minecraft.client.renderer.texture.TextureAtlas; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.HumanoidArm; import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.entity.player.Player; -import net.minecraft.world.inventory.InventoryMenu; import net.minecraft.world.item.ItemDisplayContext; import net.minecraft.world.item.ItemStack; -import net.minecraft.world.level.Level; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.phys.Vec3; -import org.jetbrains.annotations.NotNull; -import org.joml.Matrix4f; import tschipp.carryon.Constants; import tschipp.carryon.common.carry.CarryOnData; import tschipp.carryon.common.carry.CarryOnData.CarryType; @@ -61,27 +49,17 @@ import java.util.*; public class CarriedObjectRender { - - private static final SequencedMap builders = new LinkedHashMap<>(Map.of( - RenderType.glint(), new ByteBufferBuilder(RenderType.glint().bufferSize()), - RenderType.armorEntityGlint(), new ByteBufferBuilder(RenderType.armorEntityGlint().bufferSize()), - RenderType.glintTranslucent(), new ByteBufferBuilder(RenderType.glintTranslucent().bufferSize()), - RenderType.entityGlint(), new ByteBufferBuilder(RenderType.entityGlint().bufferSize()) - //RenderType.entityGlintDirect(), new ByteBufferBuilder(RenderType.entityGlintDirect().bufferSize()) - )); - - - public static boolean drawFirstPerson(Player player, MultiBufferSource buffer, PoseStack matrix, int light, float partialTicks) + public static boolean draw(Player player, PoseStack matrix, int light, float partialTicks,SubmitNodeCollector nodeCollector, boolean firstPerson) { - if(Services.PLATFORM.isModLoaded("firstperson") || Services.PLATFORM.isModLoaded("firstpersonmod")) + if(Services.PLATFORM.isModLoaded("firstperson") || Services.PLATFORM.isModLoaded("firstpersonmod") || player == null) return false; CarryOnData carry = CarryOnDataManager.getCarryData(player); try { if (carry.isCarrying(CarryType.BLOCK)) - drawFirstPersonBlock(player, buffer, matrix, light, CarryRenderHelper.getRenderState(player)); + drawBlock(player, matrix, light, CarryRenderHelper.getRenderState(player), nodeCollector, firstPerson); else if (carry.isCarrying(CarryType.ENTITY)) - drawFirstPersonEntity(player, buffer, matrix, light, partialTicks); + drawEntity(player, matrix, light, partialTicks,nodeCollector, firstPerson); } catch (Exception e) { @@ -101,13 +79,18 @@ public class CarriedObjectRender return carry.isCarrying(); } - private static void drawFirstPersonBlock(Player player, MultiBufferSource buffer, PoseStack matrix, int light, BlockState state) + private static void drawBlock(Player player, PoseStack matrix, int light, BlockState state,SubmitNodeCollector nodeCollector, boolean firstPerson) { matrix.pushPose(); - matrix.scale(2.5f, 2.5f, 2.5f); - matrix.translate(0, -0.5, -1); - //RenderSystem.enableBlend(); - //RenderSystem.disableCull(); + if (firstPerson){ + matrix.scale(2.5f, 2.5f, 2.5f); + matrix.translate(0, -0.5, -1); + }else{ + matrix.scale(0.6f, 0.6f, 0.6f); + matrix.translate(0, 0.5, -0.8); + matrix.mulPose(Axis.ZN.rotationDegrees(180)); + + } CarryOnData carry = CarryOnDataManager.getCarryData(player); ItemStackRenderState renderState = new ItemStackRenderState(); @@ -124,21 +107,15 @@ public class CarriedObjectRender if(carry.getActiveScript().isPresent()) CarryRenderHelper.performScriptTransformation(matrix, carry.getActiveScript().get()); - //RenderSystem.setShaderTexture(0, GpuTexture); - ItemStack renderStack = CarryRenderHelper.getRenderItemStack(player); Minecraft.getInstance().getItemModelResolver().updateForTopItem(renderState, renderStack, ItemDisplayContext.NONE, player.level(), null, 0); - renderState.submit(matrix, buffer, light, OverlayTexture.NO_OVERLAY); - - - - //RenderSystem.enableCull(); - //RenderSystem.disableBlend(); + renderState.submit(matrix, nodeCollector, light, OverlayTexture.NO_OVERLAY, 0); matrix.popPose(); } - private static void drawFirstPersonEntity(Player player, MultiBufferSource buffer, PoseStack matrix, int light, float partialTicks) { + private static void drawEntity(Player player, PoseStack matrix, int light, float partialTicks,SubmitNodeCollector nodeCollector, boolean firstPerson) { EntityRenderDispatcher manager = Minecraft.getInstance().getEntityRenderDispatcher(); + Entity entity = CarryRenderHelper.getRenderEntity(player); CarryOnData carry = CarryOnDataManager.getCarryData(player); @@ -153,13 +130,17 @@ public class CarriedObjectRender float height = entity.getBbHeight(); float width = entity.getBbWidth(); - - matrix.pushPose(); - matrix.scale(0.8f, 0.8f, 0.8f); - matrix.mulPose(Axis.YP.rotationDegrees(180)); - matrix.translate(0.0, -height - .2, width * 1.3 + 0.1); - - manager.setRenderShadow(false); + matrix.pushPose(); + matrix.mulPose(Axis.YP.rotationDegrees(180)); + if (firstPerson){ + matrix.scale(0.8f, 0.8f, 0.8f); + matrix.translate(0.0, -height - .2, width * 1.3 + 0.1); + }else{ + float multiplier = Math.min(9.9f, height * width) ; + matrix.scale((10 - multiplier) * 0.08f, (10 - multiplier) * 0.08f, (10 - multiplier) * 0.08f); + matrix.translate(0.0, height / 2 + -(height / 4) + 0.5f, width - 0.1 < 0.7 ? width - 0.1 + (0.7 - (width - 0.1)) : width - 0.1); + matrix.mulPose(Axis.ZN.rotationDegrees(180)); + } Optional res = carry.getActiveScript(); if(res.isPresent()) @@ -175,120 +156,13 @@ public class CarriedObjectRender ((LivingEntity) entity).hurtTime = 0; try { - manager.render(entity, 0, 0, 0, 0f, matrix, buffer, light); + manager.submit(manager.extractEntity(entity, 0), new CameraRenderState(), 0, 0, 0, matrix, nodeCollector); } catch (Exception e) { } - manager.setRenderShadow(true); matrix.popPose(); - } - - // RenderSystem.disableAlphaTest(); } - - /** - * Draws the third person view of entities and blocks - * @param partialticks - * @param mat - */ - public static void drawThirdPerson(float partialticks, Matrix4f mat) { - Minecraft mc = Minecraft.getInstance(); - Level level = mc.level; - int light = 0; - int perspective = CarryRenderHelper.getPerspective(); - EntityRenderDispatcher manager = mc.getEntityRenderDispatcher(); - - PoseStack matrix = new PoseStack(); - matrix.mulPose(mat); - - //RenderSystem.enableBlend(); - //RenderSystem.disableCull(); - //RenderSystem.disableDepthTest(); - - BufferSource buffer = MultiBufferSource.immediateWithBuffers(builders, builders.get(RenderType.glint())); - ItemStackRenderState renderState = new ItemStackRenderState(); - var layer = renderState.newLayer(); - layer.setRenderType(RenderType.glint()); - - for (Player player : level.players()) - { - try { - - CarryOnData carry = CarryOnDataManager.getCarryData(player); - - if (perspective == 0 && player == mc.player && !(Services.PLATFORM.isModLoaded("firstperson") || Services.PLATFORM.isModLoaded("firstpersonmod") || Services.PLATFORM.isModLoaded("realcamera"))) - continue; - - light = manager.getPackedLightCoords(player, partialticks); - - if (carry.isCarrying(CarryType.BLOCK)) { - BlockState state = CarryRenderHelper.getRenderState(player); - - CarryRenderHelper.applyBlockTransformations(player, partialticks, matrix, state.getBlock()); - - ItemStack renderItemStack = CarryRenderHelper.getRenderItemStack(player); - - mc.getItemModelResolver().updateForTopItem(renderState, renderItemStack, ItemDisplayContext.NONE, level, null, 0); - - Optional res = carry.getActiveScript(); - res.ifPresent(script -> CarryRenderHelper.performScriptTransformation(matrix, script)); - - //RenderSystem.setShaderTexture(0, TextureAtlas.LOCATION_BLOCKS); - //RenderSystem.enableCull(); - - PoseStack.Pose p = matrix.last(); - PoseStack copy = new PoseStack(); - copy.mulPose(p.pose()); - matrix.popPose(); - - //RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, 1.0F); - - renderState.render(copy, buffer, light, OverlayTexture.NO_OVERLAY); - - matrix.popPose(); - } else if (carry.isCarrying(CarryType.ENTITY)) { - Entity entity = CarryRenderHelper.getRenderEntity(player); - - if (entity != null) { - CarryRenderHelper.applyEntityTransformations(player, partialticks, matrix, entity); - - manager.setRenderShadow(false); - - Optional res = carry.getActiveScript(); - res.ifPresent(script -> CarryRenderHelper.performScriptTransformation(matrix, script)); - - if (entity instanceof LivingEntity le) - le.hurtTime = 0; - - //RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, 1.0F); - - manager.render(entity, 0, 0, 0, 0f, matrix, buffer, light); - matrix.popPose(); - manager.setRenderShadow(true); - matrix.popPose(); - } - } - - - } - catch (Exception e) - { - } - - } - buffer.endLastBatch(); - - buffer.endBatch(RenderType.entitySolid(TextureAtlas.LOCATION_BLOCKS)); - buffer.endBatch(RenderType.entityCutout(TextureAtlas.LOCATION_BLOCKS)); - buffer.endBatch(RenderType.entityCutoutNoCull(TextureAtlas.LOCATION_BLOCKS)); - buffer.endBatch(RenderType.entitySmoothCutout(TextureAtlas.LOCATION_BLOCKS)); - - //RenderSystem.enableDepthTest(); - //RenderSystem.enableCull(); - //RenderSystem.disableBlend(); - } - } diff --git a/Common/src/main/java/tschipp/carryon/client/render/CarryOnRenderType.java b/Common/src/main/java/tschipp/carryon/client/render/CarryOnRenderType.java index 9e1739a..41c05de 100644 --- a/Common/src/main/java/tschipp/carryon/client/render/CarryOnRenderType.java +++ b/Common/src/main/java/tschipp/carryon/client/render/CarryOnRenderType.java @@ -1,49 +1,48 @@ -//package tschipp.carryon.client.render; -// -//import com.mojang.blaze3d.pipeline.BlendFunction; -//import com.mojang.blaze3d.pipeline.RenderPipeline; -//import com.mojang.blaze3d.pipeline.RenderTarget; -//import com.mojang.blaze3d.platform.DepthTestFunction; -//import com.mojang.blaze3d.vertex.MeshData; -//import com.mojang.blaze3d.vertex.VertexFormat; -//import net.minecraft.client.renderer.RenderType; -//import org.jetbrains.annotations.NotNull; -// -//import java.util.IdentityHashMap; -//import java.util.Map; -// -////Credit: klikli for the idea and code for this wrapper -//public class CarryOnRenderType extends RenderType { -// +// package tschipp.carryon.client.render; + +// import com.mojang.blaze3d.pipeline.BlendFunction; +// import com.mojang.blaze3d.pipeline.RenderPipeline; +// import com.mojang.blaze3d.platform.DepthTestFunction; +// import com.mojang.blaze3d.vertex.MeshData; +// import com.mojang.blaze3d.vertex.VertexFormat; +// import net.minecraft.client.renderer.RenderType; +// import org.jetbrains.annotations.NotNull; + +// import java.util.IdentityHashMap; +// import java.util.Map; + +// //Credit: klikli for the idea and code for this wrapper +// public class CarryOnRenderType extends RenderType { + // private static final Map remappedTypes = new IdentityHashMap<>(); // private final RenderPipeline pipeline; // private final RenderType original; -// + // private CarryOnRenderType(RenderType original, RenderPipeline pipeline) { // super(String.format("%s_carryon", original.toString()), original.bufferSize(), original.affectsCrumbling(), true, original::setupRenderState, original::clearRenderState); // this.pipeline = pipeline; // this.original = original; // } -// + // public static RenderType remap(RenderType in) { // return remappedTypes.computeIfAbsent(in, (type) -> { -// + // //modify the pipeline -// var pipeline = toBuilder(in.getRenderPipeline()) +// var pipeline = toBuilder(in.pipeline()) // .withBlend(BlendFunction.TRANSLUCENT) // .withDepthTestFunction(DepthTestFunction.NO_DEPTH_TEST) // .withCull(false); -// + // return new CarryOnRenderType(type, pipeline.build()); // }); // } -// + // private static RenderPipeline.Builder toBuilder(RenderPipeline pipeline) { // RenderPipeline.Builder builder = RenderPipeline.builder(); // builder.withLocation(pipeline.getLocation()); // builder.withFragmentShader(pipeline.getFragmentShader()); // builder.withVertexShader(pipeline.getVertexShader()); -// + // if (!pipeline.getShaderDefines().isEmpty()) { // for (Map.Entry entry : pipeline.getShaderDefines().values().entrySet()) { // try { @@ -58,54 +57,52 @@ // builder.withShaderDefine(flag); // } // } -// + // if (!pipeline.getSamplers().isEmpty()) { // pipeline.getSamplers().forEach(builder::withSampler); // } -// + // if (!pipeline.getUniforms().isEmpty()) { // pipeline.getUniforms().forEach(u -> builder.withUniform(u.name(), u.type())); // } -// + // builder.withDepthTestFunction(pipeline.getDepthTestFunction()); // builder.withPolygonMode(pipeline.getPolygonMode()); // builder.withCull(pipeline.isCull()); // builder.withColorWrite(pipeline.isWriteColor(), pipeline.isWriteAlpha()); // builder.withDepthWrite(pipeline.isWriteDepth()); // builder.withColorLogic(pipeline.getColorLogic()); -// + // if (pipeline.getBlendFunction().isPresent()) // builder.withBlend(pipeline.getBlendFunction().get()); // else // builder.withoutBlend(); // builder.withVertexFormat(pipeline.getVertexFormat(), pipeline.getVertexFormatMode()); // builder.withDepthBias(pipeline.getDepthBiasScaleFactor(), pipeline.getDepthBiasConstant()); -// + // return builder; // } -// + // @Override // public void draw(@NotNull MeshData meshData) { // this.original.draw(meshData); // } -// -// @Override -// public @NotNull RenderTarget getRenderTarget() { -// return this.original.getRenderTarget(); -// } -// -// @Override -// public @NotNull RenderPipeline getRenderPipeline() { -// return this.pipeline; //get our own modified pipeline -// } -// + + + + // @Override // public @NotNull VertexFormat format() { // return this.original.format(); // } -// + // @Override // public VertexFormat.@NotNull Mode mode() { // return this.original.mode(); // } -//} + +// @Override +// public RenderPipeline pipeline() { +// return this.pipeline; //get our own modified pipeline +// } +// } diff --git a/Common/src/main/java/tschipp/carryon/client/render/CarryRenderHelper.java b/Common/src/main/java/tschipp/carryon/client/render/CarryRenderHelper.java index 5a4893b..c6f98c9 100644 --- a/Common/src/main/java/tschipp/carryon/client/render/CarryRenderHelper.java +++ b/Common/src/main/java/tschipp/carryon/client/render/CarryRenderHelper.java @@ -156,7 +156,7 @@ public class CarryRenderHelper public static void applyBlockTransformations(Player player, float partialticks, PoseStack matrix, Block block) { - int perspective = CarryRenderHelper.getPerspective(); + //int perspective = CarryRenderHelper.getPerspective(); applyGeneralTransformations(player, partialticks, matrix); diff --git a/Common/src/main/java/tschipp/carryon/client/render/CarryingItemRenderLayer.java b/Common/src/main/java/tschipp/carryon/client/render/CarryingItemRenderLayer.java new file mode 100644 index 0000000..876ce7f --- /dev/null +++ b/Common/src/main/java/tschipp/carryon/client/render/CarryingItemRenderLayer.java @@ -0,0 +1,22 @@ +package tschipp.carryon.client.render; + +import com.mojang.blaze3d.vertex.PoseStack; + +import net.minecraft.client.model.PlayerModel; +import net.minecraft.client.renderer.SubmitNodeCollector; +import net.minecraft.client.renderer.entity.RenderLayerParent; +import net.minecraft.client.renderer.entity.layers.RenderLayer; +import net.minecraft.client.renderer.entity.state.AvatarRenderState; + +public class CarryingItemRenderLayer extends RenderLayer { + public CarryingItemRenderLayer(RenderLayerParent renderer) { + super(renderer); + } + @Override + public void submit(PoseStack poseStack, SubmitNodeCollector nodeCollector, int packedLight, + AvatarRenderState renderState, float yRot, float xRot) { + if (renderState instanceof ICarryOnRenderState carryOnRenderState){ + CarriedObjectRender.draw(carryOnRenderState.getPlayer(), poseStack, packedLight, 0, nodeCollector,false); + } + } +} diff --git a/Common/src/main/java/tschipp/carryon/client/render/ICarryOnRenderState.java b/Common/src/main/java/tschipp/carryon/client/render/ICarryOnRenderState.java index 8215fde..28377b1 100644 --- a/Common/src/main/java/tschipp/carryon/client/render/ICarryOnRenderState.java +++ b/Common/src/main/java/tschipp/carryon/client/render/ICarryOnRenderState.java @@ -1,5 +1,6 @@ package tschipp.carryon.client.render; +import net.minecraft.world.entity.player.Player; import tschipp.carryon.common.carry.CarryOnData; public interface ICarryOnRenderState { @@ -12,4 +13,8 @@ public interface ICarryOnRenderState { void setRenderWidth(float val); + Player getPlayer(); + + void setPlayer(Player player); + } diff --git a/Common/src/main/java/tschipp/carryon/common/carry/CarryOnData.java b/Common/src/main/java/tschipp/carryon/common/carry/CarryOnData.java index 9224cfb..b8a0156 100644 --- a/Common/src/main/java/tschipp/carryon/common/carry/CarryOnData.java +++ b/Common/src/main/java/tschipp/carryon/common/carry/CarryOnData.java @@ -22,7 +22,6 @@ package tschipp.carryon.common.carry; import com.mojang.serialization.Codec; import com.mojang.serialization.DataResult; -import com.mojang.serialization.MapCodec; import net.minecraft.core.BlockPos; import net.minecraft.core.HolderLookup; import net.minecraft.core.registries.BuiltInRegistries; @@ -39,6 +38,7 @@ import net.minecraft.world.entity.AreaEffectCloud; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.EntitySpawnReason; import net.minecraft.world.entity.EntityType; +import net.minecraft.world.entity.player.Player; import net.minecraft.world.level.Level; import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.state.BlockState; @@ -50,8 +50,8 @@ import tschipp.carryon.Constants; import tschipp.carryon.common.scripting.CarryOnScript; import javax.annotation.Nullable; -import java.util.Objects; import java.util.Optional; +import java.util.UUID; public class CarryOnData { @@ -105,6 +105,11 @@ public class CarryOnData { } + public CarryType getType() + { + return this.type; + } + public CompoundTag getNbt() { nbt.putString("type", type.toString()); @@ -203,8 +208,20 @@ public class CarryOnData { this.activeScript = script; } - public void setCarryingPlayer() { + public void setCarryingPlayer(Player player) + { this.type = CarryType.PLAYER; + nbt.putString("player", player.getStringUUID().toString()); + } + + public Player getCarryingPlayer(Level level) + { + if(this.type != CarryType.PLAYER) + throw new IllegalStateException("Called getCarryingPlayer on data that contained " + this.type); + if(!nbt.contains("player")) + return null; + UUID uuid = UUID.fromString(nbt.getString("player").get()); + return level.getServer().getPlayerList().getPlayer(uuid); } public boolean isCarrying() diff --git a/Common/src/main/java/tschipp/carryon/common/carry/CarryOnDataManager.java b/Common/src/main/java/tschipp/carryon/common/carry/CarryOnDataManager.java index 8a96518..cdf09cf 100644 --- a/Common/src/main/java/tschipp/carryon/common/carry/CarryOnDataManager.java +++ b/Common/src/main/java/tschipp/carryon/common/carry/CarryOnDataManager.java @@ -20,11 +20,6 @@ package tschipp.carryon.common.carry; -import net.minecraft.nbt.CompoundTag; -import net.minecraft.network.syncher.EntityDataAccessor; -import net.minecraft.network.syncher.EntityDataSerializers; -import net.minecraft.network.syncher.SynchedEntityData; -import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.entity.player.Player; import tschipp.carryon.platform.Services; diff --git a/Common/src/main/java/tschipp/carryon/common/carry/PickupHandler.java b/Common/src/main/java/tschipp/carryon/common/carry/PickupHandler.java index 6f3d371..0963957 100644 --- a/Common/src/main/java/tschipp/carryon/common/carry/PickupHandler.java +++ b/Common/src/main/java/tschipp/carryon/common/carry/PickupHandler.java @@ -32,6 +32,8 @@ import net.minecraft.world.effect.MobEffects; import net.minecraft.world.entity.AgeableMob; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.Entity.RemovalReason; +import net.minecraft.world.entity.EntityReference; +import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.entity.MobCategory; import net.minecraft.world.entity.TamableAnimal; import net.minecraft.world.entity.animal.Animal; @@ -50,7 +52,6 @@ import tschipp.carryon.common.pickupcondition.PickupConditionHandler; import tschipp.carryon.common.scripting.CarryOnScript; import tschipp.carryon.common.scripting.ScriptManager; import tschipp.carryon.networking.clientbound.ClientboundStartRidingOtherPlayerPacket; -import tschipp.carryon.networking.clientbound.ClientboundStartRidingPacket; import tschipp.carryon.platform.Services; import javax.annotation.Nullable; @@ -142,7 +143,7 @@ public class PickupHandler { String cmd = script.scriptEffects().commandInit(); if(!cmd.isEmpty()) - player.getServer().getCommands().performPrefixedCommand(player.getServer().createCommandSourceStack(), "/execute as " + player.getGameProfile().getName() + " run " + cmd); + player.level().getServer().getCommands().performPrefixedCommand(player.level().getServer().createCommandSourceStack(), "/execute as " + player.getGameProfile().name() + " run " + cmd); } carry.setBlock(state, blockEntity, player, pos); @@ -173,10 +174,13 @@ public class PickupHandler { if (entity instanceof TamableAnimal tame) { - UUID owner = tame.getOwnerReference().getUUID(); - UUID playerID = player.getGameProfile().getId(); - if (owner != null && !owner.equals(playerID)) - return false; + EntityReference ref = tame.getOwnerReference(); + if (ref != null) { + UUID owner = ref.getUUID(); + UUID playerID = player.getGameProfile().id(); + if (!owner.equals(playerID)) + return false; + } } if(!ListHandler.isPermitted(entity)) @@ -232,12 +236,12 @@ public class PickupHandler { if (result.isPresent()) { String cmd = result.get().scriptEffects().commandInit(); if (!cmd.isEmpty()) - player.getServer().getCommands().performPrefixedCommand(player.getServer().createCommandSourceStack(), "/execute as " + player.getGameProfile().getName() + " run " + cmd); + player.level().getServer().getCommands().performPrefixedCommand(player.level().getServer().createCommandSourceStack(), "/execute as " + player.getGameProfile().name() + " run " + cmd); } - otherPlayer.startRiding(player, true); + otherPlayer.startRiding(player, true, false); Services.PLATFORM.sendPacketToAllPlayers(Constants.PACKET_ID_START_RIDING_OTHER, new ClientboundStartRidingOtherPlayerPacket(player.getId(), otherPlayer.getId(), true), player.level()); - carry.setCarryingPlayer(); + carry.setCarryingPlayer(otherPlayer); player.swing(InteractionHand.MAIN_HAND, true); player.level().playSound(null, player.getOnPos(), SoundEvents.ARMOR_EQUIP_GENERIC.value(), SoundSource.AMBIENT, 1.0f, 0.5f); CarryOnDataManager.setCarryData(player, carry); @@ -257,7 +261,7 @@ public class PickupHandler { { String cmd = result.get().scriptEffects().commandInit(); if(!cmd.isEmpty()) - player.getServer().getCommands().performPrefixedCommand(player.getServer().createCommandSourceStack(), "/execute as " + player.getGameProfile().getName() + " run " + cmd); + player.level().getServer().getCommands().performPrefixedCommand(player.level().getServer().createCommandSourceStack(), "/execute as " + player.getGameProfile().name() + " run " + cmd); } carry.setEntity(entity); diff --git a/Common/src/main/java/tschipp/carryon/common/carry/PlacementHandler.java b/Common/src/main/java/tschipp/carryon/common/carry/PlacementHandler.java index e871dcf..64b2860 100644 --- a/Common/src/main/java/tschipp/carryon/common/carry/PlacementHandler.java +++ b/Common/src/main/java/tschipp/carryon/common/carry/PlacementHandler.java @@ -27,7 +27,6 @@ import net.minecraft.server.level.ServerPlayer; import net.minecraft.sounds.SoundEvents; import net.minecraft.sounds.SoundSource; import net.minecraft.world.InteractionHand; -import net.minecraft.world.effect.MobEffectInstance; import net.minecraft.world.effect.MobEffects; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.Mob; @@ -44,7 +43,6 @@ import net.minecraft.world.level.block.state.properties.Property; import net.minecraft.world.phys.BlockHitResult; import net.minecraft.world.phys.Vec3; import net.minecraft.world.phys.shapes.CollisionContext; -import tschipp.carryon.CarryOnCommon; import tschipp.carryon.Constants; import tschipp.carryon.common.carry.CarryOnData.CarryType; import tschipp.carryon.common.config.ListHandler; @@ -99,7 +97,7 @@ public class PlacementHandler ScriptEffects effects = carry.getActiveScript().get().scriptEffects(); String cmd = effects.commandPlace(); if (!cmd.isEmpty()) - player.getServer().getCommands().performPrefixedCommand(player.getServer().createCommandSourceStack(), "/execute as " + player.getGameProfile().getName() + " run " + cmd); + player.level().getServer().getCommands().performPrefixedCommand(player.level().getServer().createCommandSourceStack(), "/execute as " + player.getGameProfile().name() + " run " + cmd); } level.setBlockAndUpdate(pos, state); @@ -177,7 +175,7 @@ public class PlacementHandler Vec3 placementPos = Vec3.atBottomCenterOf(pos); if (carry.isCarrying(CarryType.PLAYER)) { - Entity otherPlayer = player.getFirstPassenger(); + Entity otherPlayer = carry.getCarryingPlayer(level); player.ejectPassengers(); Services.PLATFORM.sendPacketToAllPlayers(Constants.PACKET_ID_START_RIDING_OTHER, new ClientboundStartRidingOtherPlayerPacket(player.getId(), otherPlayer.getId(), false), player.level()); carry.clear(); @@ -199,7 +197,7 @@ public class PlacementHandler ScriptEffects effects = carry.getActiveScript().get().scriptEffects(); String cmd = effects.commandPlace(); if (!cmd.isEmpty()) - player.getServer().getCommands().performPrefixedCommand(player.getServer().createCommandSourceStack(), "/execute as " + player.getGameProfile().getName() + " run " + cmd); + player.level().getServer().getCommands().performPrefixedCommand(player.level().getServer().createCommandSourceStack(), "/execute as " + player.getGameProfile().name() + " run " + cmd); } level.addFreshEntity(entity); @@ -257,20 +255,20 @@ public class PlacementHandler level.addFreshEntity(entityHeld); entityHeld.teleportTo(tempX, tempY, tempZ); } - entityHeld.startRiding(topEntity, false); + entityHeld.startRiding(topEntity, false,false); } else { if (carry.isCarrying(CarryType.ENTITY)) { entityHeld.setPos(entityClicked.getX(), entityClicked.getY(), entityClicked.getZ()); level.addFreshEntity(entityHeld); } - entityHeld.startRiding(topEntity, false); + entityHeld.startRiding(topEntity, false,false); } if (carry.getActiveScript().isPresent()) { ScriptEffects effects = carry.getActiveScript().get().scriptEffects(); String cmd = effects.commandPlace(); if (!cmd.isEmpty()) - player.getServer().getCommands().performPrefixedCommand(player.getServer().createCommandSourceStack(), "/execute as " + player.getGameProfile().getName() + " run " + cmd); + player.level().getServer().getCommands().performPrefixedCommand(player.level().getServer().createCommandSourceStack(), "/execute as " + player.getGameProfile().name() + " run " + cmd); } player.swing(InteractionHand.MAIN_HAND, true); diff --git a/Common/src/main/java/tschipp/carryon/common/scripting/Matchables.java b/Common/src/main/java/tschipp/carryon/common/scripting/Matchables.java index fcbe34e..3d96eba 100644 --- a/Common/src/main/java/tschipp/carryon/common/scripting/Matchables.java +++ b/Common/src/main/java/tschipp/carryon/common/scripting/Matchables.java @@ -22,10 +22,8 @@ package tschipp.carryon.common.scripting; import com.mojang.serialization.Codec; import it.unimi.dsi.fastutil.objects.Object2IntMap; -import net.minecraft.advancements.Advancement; import net.minecraft.advancements.AdvancementHolder; import net.minecraft.core.BlockPos; -import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.NbtUtils; import net.minecraft.resources.ResourceLocation; @@ -34,7 +32,6 @@ import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.effect.MobEffectInstance; import net.minecraft.world.phys.Vec3; import net.minecraft.world.scores.Objective; -import net.minecraft.world.scores.Score; import net.minecraft.world.scores.Scoreboard; import tschipp.carryon.platform.Services; diff --git a/Common/src/main/java/tschipp/carryon/common/scripting/ScriptManager.java b/Common/src/main/java/tschipp/carryon/common/scripting/ScriptManager.java index 9e8687e..b634fe0 100644 --- a/Common/src/main/java/tschipp/carryon/common/scripting/ScriptManager.java +++ b/Common/src/main/java/tschipp/carryon/common/scripting/ScriptManager.java @@ -23,7 +23,6 @@ package tschipp.carryon.common.scripting; import net.minecraft.core.BlockPos; import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.nbt.CompoundTag; -import net.minecraft.nbt.Tag; import net.minecraft.util.ProblemReporter; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.LivingEntity; diff --git a/Common/src/main/java/tschipp/carryon/common/scripting/ScriptReloadListener.java b/Common/src/main/java/tschipp/carryon/common/scripting/ScriptReloadListener.java index 0c998ac..8698299 100644 --- a/Common/src/main/java/tschipp/carryon/common/scripting/ScriptReloadListener.java +++ b/Common/src/main/java/tschipp/carryon/common/scripting/ScriptReloadListener.java @@ -20,13 +20,8 @@ package tschipp.carryon.common.scripting; -import com.google.gson.Gson; -import com.google.gson.GsonBuilder; -import com.google.gson.JsonElement; import com.mojang.serialization.Codec; import com.mojang.serialization.DataResult; -import com.mojang.serialization.JsonOps; -import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.NbtOps; import net.minecraft.nbt.Tag; import net.minecraft.resources.FileToIdConverter; @@ -37,11 +32,9 @@ import net.minecraft.server.packs.resources.SimpleJsonResourceReloadListener; import net.minecraft.util.profiling.ProfilerFiller; import org.jetbrains.annotations.NotNull; import tschipp.carryon.Constants; -import tschipp.carryon.common.carry.CarryOnData; import tschipp.carryon.networking.clientbound.ClientboundSyncScriptsPacket; import tschipp.carryon.platform.Services; -import java.util.Collections; import java.util.Map; public class ScriptReloadListener extends SimpleJsonResourceReloadListener diff --git a/Common/src/main/java/tschipp/carryon/compat/ClothConfigCompat.java b/Common/src/main/java/tschipp/carryon/compat/ClothConfigCompat.java index 597c2af..3bfb0ba 100644 --- a/Common/src/main/java/tschipp/carryon/compat/ClothConfigCompat.java +++ b/Common/src/main/java/tschipp/carryon/compat/ClothConfigCompat.java @@ -4,13 +4,11 @@ import me.shedaniel.clothconfig2.api.ConfigBuilder; import me.shedaniel.clothconfig2.api.ConfigCategory; import me.shedaniel.clothconfig2.api.ConfigEntryBuilder; import me.shedaniel.clothconfig2.impl.builders.SubCategoryBuilder; -import net.minecraft.client.Minecraft; import net.minecraft.client.gui.screens.Screen; import net.minecraft.network.chat.Component; import tschipp.carryon.config.AnnotationData; import tschipp.carryon.config.BuiltCategory; import tschipp.carryon.config.BuiltConfig; -import tschipp.carryon.config.ConfigLoader; import javax.annotation.Nullable; import java.util.List; diff --git a/Common/src/main/java/tschipp/carryon/mixin/AvatarRenderStateMixin.java b/Common/src/main/java/tschipp/carryon/mixin/AvatarRenderStateMixin.java index e50230e..cfb18f0 100644 --- a/Common/src/main/java/tschipp/carryon/mixin/AvatarRenderStateMixin.java +++ b/Common/src/main/java/tschipp/carryon/mixin/AvatarRenderStateMixin.java @@ -1,13 +1,15 @@ package tschipp.carryon.mixin; -import net.minecraft.client.renderer.entity.state.AvatarRenderState; +import net.minecraft.client.renderer.entity.state.HumanoidRenderState; +import net.minecraft.world.entity.player.Player; + import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Unique; import tschipp.carryon.client.render.ICarryOnRenderState; import tschipp.carryon.common.carry.CarryOnData; -@Mixin(AvatarRenderState.class) -public class AvatarRenderStateMixin implements ICarryOnRenderState { +@Mixin(HumanoidRenderState.class) +public class PlayerRenderStateMixin implements ICarryOnRenderState { @Unique public CarryOnData carryOnData = null; @@ -15,6 +17,10 @@ public class AvatarRenderStateMixin implements ICarryOnRenderState { @Unique public float renderWidth = 0f; + + @Unique + public Player player = null; + @Unique @Override public CarryOnData getCarryOnData() { @@ -38,4 +44,14 @@ public class AvatarRenderStateMixin implements ICarryOnRenderState { public void setRenderWidth(float val) { renderWidth = val; } + + @Override + public Player getPlayer() { + return player; + } + + @Override + public void setPlayer(Player player) { + this.player = player; + } } diff --git a/Common/src/main/java/tschipp/carryon/mixin/AvatarRendererMixin.java b/Common/src/main/java/tschipp/carryon/mixin/AvatarRendererMixin.java new file mode 100644 index 0000000..f87c942 --- /dev/null +++ b/Common/src/main/java/tschipp/carryon/mixin/AvatarRendererMixin.java @@ -0,0 +1,30 @@ +package tschipp.carryon.mixin; + +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + +import net.minecraft.client.entity.ClientAvatarEntity; +import net.minecraft.client.model.PlayerModel; +import net.minecraft.client.renderer.entity.EntityRendererProvider; +import net.minecraft.client.renderer.entity.EntityRendererProvider.Context; +import net.minecraft.client.renderer.entity.LivingEntityRenderer; +import net.minecraft.client.renderer.entity.player.AvatarRenderer; +import net.minecraft.client.renderer.entity.state.AvatarRenderState; +import net.minecraft.world.entity.Avatar; +import tschipp.carryon.client.render.CarryingItemRenderLayer; + +@Mixin(AvatarRenderer.class) +public abstract class AvatarRendererMixin extends LivingEntityRenderer { + + public AvatarRendererMixin(Context context, PlayerModel model, float shadowRadius) { + super(context, model, shadowRadius); + } + + @Inject(method = "(Lnet/minecraft/client/renderer/entity/EntityRendererProvider$Context;Z)V", at = @At("RETURN")) + public void init(EntityRendererProvider.Context context, boolean slim, CallbackInfo info) { + //Player + this.addLayer(new CarryingItemRenderLayer(this)); + } +} diff --git a/Common/src/main/java/tschipp/carryon/mixin/EntityMixin.java b/Common/src/main/java/tschipp/carryon/mixin/EntityMixin.java index 8e4e662..fff8e74 100644 --- a/Common/src/main/java/tschipp/carryon/mixin/EntityMixin.java +++ b/Common/src/main/java/tschipp/carryon/mixin/EntityMixin.java @@ -20,7 +20,6 @@ package tschipp.carryon.mixin; -import com.llamalad7.mixinextras.injector.ModifyExpressionValue; import net.minecraft.server.level.ServerPlayer; import net.minecraft.util.Mth; import net.minecraft.world.entity.Entity; @@ -35,6 +34,9 @@ import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; + +import com.llamalad7.mixinextras.injector.ModifyExpressionValue; + import tschipp.carryon.Constants; import tschipp.carryon.common.carry.CarryOnData; import tschipp.carryon.common.carry.CarryOnData.CarryType; @@ -48,14 +50,15 @@ public abstract class EntityMixin @Shadow public boolean hasPassenger(Entity pEntity) {throw new IllegalStateException("EntityMixin application failed");} - @Shadow public abstract void onPassengerTurned(Entity $$0); - @ModifyExpressionValue(method = "startRiding(Lnet/minecraft/world/entity/Entity;Z)Z", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/entity/EntityType;canSerialize()Z")) + @ModifyExpressionValue(method = "startRiding(Lnet/minecraft/world/entity/Entity;ZZ)Z", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/entity/EntityType;canSerialize()Z")) private boolean onStartRidingCheck(boolean original, Entity entity, boolean force) { if (force && entity instanceof Player) return true; return original; } + @Shadow public abstract void onPassengerTurned(Entity $$0); + @Inject(method = "positionRider(Lnet/minecraft/world/entity/Entity;Lnet/minecraft/world/entity/Entity$MoveFunction;)V", at = @At("HEAD"), cancellable = true) private void onPositionPassenger(Entity entity, MoveFunction move, CallbackInfo ci) { @@ -92,7 +95,7 @@ public abstract class EntityMixin @Inject(method = "onPassengerTurned(Lnet/minecraft/world/entity/Entity;)V", at = @At("HEAD")) private void onPassengerTurned(Entity toUpdate, CallbackInfo ci) { - if((Object)this instanceof Player thisPlayer && toUpdate instanceof Player otherPlayer) + if((Object)this instanceof Player thisPlayer && toUpdate instanceof Player) { CarryOnData carry = CarryOnDataManager.getCarryData(thisPlayer); if(carry.isCarrying(CarryType.PLAYER)) { diff --git a/Common/src/main/java/tschipp/carryon/mixin/EntityRendererMixin.java b/Common/src/main/java/tschipp/carryon/mixin/EntityRendererMixin.java index b990b44..7059083 100644 --- a/Common/src/main/java/tschipp/carryon/mixin/EntityRendererMixin.java +++ b/Common/src/main/java/tschipp/carryon/mixin/EntityRendererMixin.java @@ -23,13 +23,14 @@ public class EntityRendererMixin { shift = At.Shift.AFTER ), method = "createRenderState(Lnet/minecraft/world/entity/Entity;F)Lnet/minecraft/client/renderer/entity/state/EntityRenderState;") private void onCreateRenderState(Entity entity, float $$1, CallbackInfoReturnable cir, @Local(ordinal = 0) EntityRenderState state) { - if (entity instanceof Player player) { CarryOnData carry = CarryOnDataManager.getCarryData(player); ICarryOnRenderState carryOnRenderState = (ICarryOnRenderState) state; carryOnRenderState.setCarryOnData(carry); carryOnRenderState.setRenderWidth(CarryRenderHelper.getRenderWidth(player)); + + carryOnRenderState.setPlayer(player); } } } diff --git a/Common/src/main/java/tschipp/carryon/mixin/HumanoidModelMixin.java b/Common/src/main/java/tschipp/carryon/mixin/HumanoidModelMixin.java index e416cd4..dd672b7 100644 --- a/Common/src/main/java/tschipp/carryon/mixin/HumanoidModelMixin.java +++ b/Common/src/main/java/tschipp/carryon/mixin/HumanoidModelMixin.java @@ -23,7 +23,6 @@ package tschipp.carryon.mixin; import net.minecraft.client.model.HumanoidModel; import net.minecraft.client.model.geom.ModelPart; import net.minecraft.client.renderer.entity.state.HumanoidRenderState; -import net.minecraft.client.renderer.entity.state.AvatarRenderState; import net.minecraft.world.phys.Vec3; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; diff --git a/Common/src/main/java/tschipp/carryon/mixin/InventoryMixin.java b/Common/src/main/java/tschipp/carryon/mixin/InventoryMixin.java index 78a701f..4446fdf 100644 --- a/Common/src/main/java/tschipp/carryon/mixin/InventoryMixin.java +++ b/Common/src/main/java/tschipp/carryon/mixin/InventoryMixin.java @@ -23,7 +23,6 @@ package tschipp.carryon.mixin; import com.llamalad7.mixinextras.injector.wrapoperation.Operation; import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation; import net.minecraft.core.NonNullList; -import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.entity.player.Inventory; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; @@ -33,7 +32,6 @@ import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.Unique; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.Redirect; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import tschipp.carryon.common.carry.CarryOnData; import tschipp.carryon.common.carry.CarryOnDataManager; diff --git a/Common/src/main/java/tschipp/carryon/mixin/MinecraftMixin.java b/Common/src/main/java/tschipp/carryon/mixin/MinecraftMixin.java index bbe8a51..da24a56 100644 --- a/Common/src/main/java/tschipp/carryon/mixin/MinecraftMixin.java +++ b/Common/src/main/java/tschipp/carryon/mixin/MinecraftMixin.java @@ -25,7 +25,6 @@ import net.minecraft.client.Minecraft; import net.minecraft.world.entity.player.Inventory; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Redirect; import tschipp.carryon.common.carry.CarryOnDataManager; @Mixin(Minecraft.class) diff --git a/Common/src/main/java/tschipp/carryon/mixin/PlayerMixin.java b/Common/src/main/java/tschipp/carryon/mixin/PlayerMixin.java index 7248965..ea2f242 100644 --- a/Common/src/main/java/tschipp/carryon/mixin/PlayerMixin.java +++ b/Common/src/main/java/tschipp/carryon/mixin/PlayerMixin.java @@ -20,26 +20,20 @@ package tschipp.carryon.mixin; - -import net.minecraft.nbt.CompoundTag; -import net.minecraft.network.syncher.EntityDataAccessor; -import net.minecraft.network.syncher.EntityDataSerializers; -import net.minecraft.network.syncher.SynchedEntityData; +import net.minecraft.world.effect.MobEffects; +import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.EntityType; import net.minecraft.world.entity.LivingEntity; -import net.minecraft.world.entity.player.Inventory; import net.minecraft.world.entity.player.Player; import net.minecraft.world.level.Level; import net.minecraft.world.level.storage.ValueInput; -import net.minecraft.world.level.storage.ValueOutput; import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Shadow; -import org.spongepowered.asm.mixin.Unique; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import tschipp.carryon.common.carry.CarryOnData; import tschipp.carryon.common.carry.CarryOnDataManager; +import tschipp.carryon.common.carry.CarryOnData.CarryType; import java.util.Optional; @@ -58,4 +52,17 @@ public abstract class PlayerMixin extends LivingEntity { res.ifPresent(data -> CarryOnDataManager.setCarryData((Player)((Object)this), data)); } + + @Override + public void stopRiding() { + Entity entity = this.getVehicle(); + if (entity instanceof Player && entity.getPassengers().size() < 2){ + CarryOnData carry = CarryOnDataManager.getCarryData((Player) entity); + if (carry.getType() == CarryType.PLAYER){ + carry.clear(); + ((Player) entity).removeEffect(MobEffects.SLOWNESS); + } + } + super.stopRiding(); + } } diff --git a/Common/src/main/java/tschipp/carryon/networking/PacketBase.java b/Common/src/main/java/tschipp/carryon/networking/PacketBase.java index f43a452..82d1cb3 100644 --- a/Common/src/main/java/tschipp/carryon/networking/PacketBase.java +++ b/Common/src/main/java/tschipp/carryon/networking/PacketBase.java @@ -20,12 +20,7 @@ package tschipp.carryon.networking; -import net.minecraft.network.FriendlyByteBuf; -import net.minecraft.network.RegistryFriendlyByteBuf; -import net.minecraft.network.codec.StreamCodec; -import net.minecraft.network.protocol.Packet; import net.minecraft.network.protocol.common.custom.CustomPacketPayload; -import net.minecraft.resources.ResourceLocation; import net.minecraft.world.entity.player.Player; public interface PacketBase extends CustomPacketPayload { diff --git a/Common/src/main/java/tschipp/carryon/networking/clientbound/ClientboundStartRidingOtherPlayerPacket.java b/Common/src/main/java/tschipp/carryon/networking/clientbound/ClientboundStartRidingOtherPlayerPacket.java index 3dfa75f..c267814 100644 --- a/Common/src/main/java/tschipp/carryon/networking/clientbound/ClientboundStartRidingOtherPlayerPacket.java +++ b/Common/src/main/java/tschipp/carryon/networking/clientbound/ClientboundStartRidingOtherPlayerPacket.java @@ -47,7 +47,7 @@ public record ClientboundStartRidingOtherPlayerPacket(int mount, int rider, bool if(mount != null && rider != null) if(ride) - rider.startRiding(mount, true); + rider.startRiding(mount, true,true); else rider.stopRiding(); } diff --git a/Common/src/main/java/tschipp/carryon/networking/clientbound/ClientboundStartRidingPacket.java b/Common/src/main/java/tschipp/carryon/networking/clientbound/ClientboundStartRidingPacket.java index 7cac4e4..2595b7a 100644 --- a/Common/src/main/java/tschipp/carryon/networking/clientbound/ClientboundStartRidingPacket.java +++ b/Common/src/main/java/tschipp/carryon/networking/clientbound/ClientboundStartRidingPacket.java @@ -20,12 +20,10 @@ package tschipp.carryon.networking.clientbound; -import net.minecraft.network.FriendlyByteBuf; import net.minecraft.network.RegistryFriendlyByteBuf; import net.minecraft.network.codec.ByteBufCodecs; import net.minecraft.network.codec.StreamCodec; import net.minecraft.network.protocol.common.custom.CustomPacketPayload; -import net.minecraft.resources.ResourceLocation; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.player.Player; import tschipp.carryon.Constants; diff --git a/Common/src/main/java/tschipp/carryon/networking/clientbound/ClientboundSyncScriptsPacket.java b/Common/src/main/java/tschipp/carryon/networking/clientbound/ClientboundSyncScriptsPacket.java index 727db6f..1a0988c 100644 --- a/Common/src/main/java/tschipp/carryon/networking/clientbound/ClientboundSyncScriptsPacket.java +++ b/Common/src/main/java/tschipp/carryon/networking/clientbound/ClientboundSyncScriptsPacket.java @@ -22,16 +22,12 @@ package tschipp.carryon.networking.clientbound; import com.mojang.serialization.Codec; import com.mojang.serialization.DataResult; -import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.NbtOps; import net.minecraft.nbt.Tag; -import net.minecraft.network.FriendlyByteBuf; import net.minecraft.network.RegistryFriendlyByteBuf; import net.minecraft.network.codec.ByteBufCodecs; import net.minecraft.network.codec.StreamCodec; -import net.minecraft.network.protocol.Packet; import net.minecraft.network.protocol.common.custom.CustomPacketPayload; -import net.minecraft.resources.ResourceLocation; import net.minecraft.world.entity.player.Player; import tschipp.carryon.Constants; import tschipp.carryon.common.scripting.CarryOnScript; diff --git a/Common/src/main/java/tschipp/carryon/networking/serverbound/ServerboundCarryKeyPressedPacket.java b/Common/src/main/java/tschipp/carryon/networking/serverbound/ServerboundCarryKeyPressedPacket.java index 460d418..b98ed28 100644 --- a/Common/src/main/java/tschipp/carryon/networking/serverbound/ServerboundCarryKeyPressedPacket.java +++ b/Common/src/main/java/tschipp/carryon/networking/serverbound/ServerboundCarryKeyPressedPacket.java @@ -20,20 +20,15 @@ package tschipp.carryon.networking.serverbound; -import net.minecraft.network.FriendlyByteBuf; import net.minecraft.network.RegistryFriendlyByteBuf; import net.minecraft.network.codec.ByteBufCodecs; import net.minecraft.network.codec.StreamCodec; import net.minecraft.network.protocol.common.custom.CustomPacketPayload; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.entity.player.Player; import tschipp.carryon.Constants; import tschipp.carryon.common.carry.CarryOnData; import tschipp.carryon.common.carry.CarryOnDataManager; import tschipp.carryon.networking.PacketBase; -import tschipp.carryon.networking.clientbound.ClientboundStartRidingPacket; -import tschipp.carryon.networking.clientbound.ClientboundSyncScriptsPacket; public record ServerboundCarryKeyPressedPacket(boolean pressed) implements PacketBase { diff --git a/Common/src/main/java/tschipp/carryon/platform/services/IPlatformHelper.java b/Common/src/main/java/tschipp/carryon/platform/services/IPlatformHelper.java index 07c1d68..73a1351 100644 --- a/Common/src/main/java/tschipp/carryon/platform/services/IPlatformHelper.java +++ b/Common/src/main/java/tschipp/carryon/platform/services/IPlatformHelper.java @@ -20,9 +20,7 @@ package tschipp.carryon.platform.services; -import net.minecraft.core.HolderLookup; import net.minecraft.network.FriendlyByteBuf; -import net.minecraft.network.RegistryFriendlyByteBuf; import net.minecraft.network.codec.StreamCodec; import net.minecraft.network.protocol.common.custom.CustomPacketPayload; import net.minecraft.resources.ResourceLocation; @@ -30,12 +28,10 @@ import net.minecraft.server.level.ServerLevel; import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.entity.player.Player; import tschipp.carryon.common.carry.CarryOnData; -import tschipp.carryon.common.carry.CarryOnDataManager; import tschipp.carryon.config.BuiltConfig; import tschipp.carryon.networking.PacketBase; import java.util.function.BiConsumer; -import java.util.function.Function; public interface IPlatformHelper { diff --git a/Common/src/main/resources/carryon.mixins.json b/Common/src/main/resources/carryon.mixins.json index cb06f88..8d08e07 100644 --- a/Common/src/main/resources/carryon.mixins.json +++ b/Common/src/main/resources/carryon.mixins.json @@ -11,8 +11,9 @@ "client": [ "HumanoidModelMixin", "MinecraftMixin", - "AvatarRenderStateMixin", - "EntityRendererMixin" + "PlayerRenderStateMixin", + "EntityRendererMixin", + "AvatarRendererMixin" ], "server": [ ], diff --git a/Fabric/build.gradle b/Fabric/build.gradle index f1305cb..26efa73 100644 --- a/Fabric/build.gradle +++ b/Fabric/build.gradle @@ -1,6 +1,6 @@ plugins { id 'multiloader-loader' - id 'fabric-loom' version '1.11-SNAPSHOT' + id 'fabric-loom' version "${loom_version}" } repositories { @@ -32,7 +32,7 @@ dependencies { modApi("me.shedaniel.cloth:cloth-config-fabric:${cloth_config_version}") { exclude(group: "net.fabricmc.fabric-api") } - modApi "com.terraformersmc:modmenu:15.0.0-beta.3" + modApi "com.terraformersmc:modmenu:16.0.0-rc.1" } loom { diff --git a/Fabric/src/main/java/tschipp/carryon/CarryOnFabricClientMod.java b/Fabric/src/main/java/tschipp/carryon/CarryOnFabricClientMod.java index fbd4b1d..9798475 100644 --- a/Fabric/src/main/java/tschipp/carryon/CarryOnFabricClientMod.java +++ b/Fabric/src/main/java/tschipp/carryon/CarryOnFabricClientMod.java @@ -23,20 +23,13 @@ package tschipp.carryon; import net.fabricmc.api.ClientModInitializer; import net.fabricmc.fabric.api.client.keybinding.v1.KeyBindingHelper; import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking; -import net.fabricmc.fabric.api.networking.v1.PacketByteBufs; -import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking; -import net.minecraft.core.RegistryAccess; -import net.minecraft.network.FriendlyByteBuf; -import net.minecraft.network.RegistryFriendlyByteBuf; import net.minecraft.network.protocol.common.custom.CustomPacketPayload; -import net.minecraft.resources.ResourceLocation; import net.minecraft.world.entity.player.Player; import tschipp.carryon.client.keybinds.CarryOnKeybinds; import tschipp.carryon.events.ClientEvents; import tschipp.carryon.networking.PacketBase; import java.util.function.BiConsumer; -import java.util.function.Function; public class CarryOnFabricClientMod implements ClientModInitializer { diff --git a/Fabric/src/main/java/tschipp/carryon/CarryOnFabricMod.java b/Fabric/src/main/java/tschipp/carryon/CarryOnFabricMod.java index e5c7c43..4506c4f 100644 --- a/Fabric/src/main/java/tschipp/carryon/CarryOnFabricMod.java +++ b/Fabric/src/main/java/tschipp/carryon/CarryOnFabricMod.java @@ -22,14 +22,13 @@ package tschipp.carryon; import net.fabricmc.api.ModInitializer; import net.fabricmc.fabric.api.attachment.v1.AttachmentRegistry; -import net.fabricmc.fabric.api.attachment.v1.AttachmentSyncPredicate; import net.fabricmc.fabric.api.attachment.v1.AttachmentType; import net.minecraft.nbt.CompoundTag; import net.minecraft.resources.ResourceLocation; +import net.minecraft.server.level.ServerPlayer; import tschipp.carryon.common.carry.CarryOnData; import tschipp.carryon.config.fabric.ConfigLoaderImpl; import tschipp.carryon.events.CommonEvents; - import java.io.IOException; public class CarryOnFabricMod implements ModInitializer { @@ -39,8 +38,15 @@ public class CarryOnFabricMod implements ModInitializer { builder -> builder .initializer(() -> new CarryOnData(new CompoundTag())) .persistent(CarryOnData.CODEC) - .syncWith(CarryOnData.STREAM_CODEC, (t, p) -> p.connection != null) - .copyOnDeath() + .syncWith(CarryOnData.STREAM_CODEC, (t, p) ->{ + ServerPlayer player = (ServerPlayer) t; + // the isAlive check avoids us syncing attachment data about dead players. Which causes a disconnect + // player.tickCount > 0 avoids us syncing attachment data about players the instant they spawn. + // Which also causes a disconnect as the player entity may not be synced yet. + return p.connection != null && player.isAlive() && player.tickCount > 0; + }) + + ); diff --git a/Fabric/src/main/java/tschipp/carryon/compat/ArchitecturyCompat.java b/Fabric/src/main/java/tschipp/carryon/compat/ArchitecturyCompat.java index 0d8a3e2..3963d6f 100644 --- a/Fabric/src/main/java/tschipp/carryon/compat/ArchitecturyCompat.java +++ b/Fabric/src/main/java/tschipp/carryon/compat/ArchitecturyCompat.java @@ -20,7 +20,6 @@ package tschipp.carryon.compat; -import net.fabricmc.fabric.api.event.Event; import net.minecraft.core.BlockPos; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.player.Player; @@ -39,6 +38,7 @@ public class ArchitecturyCompat { private static Method PLACE_BLOCK; private static Method IS_FALSE; + @SuppressWarnings("unchecked") private static void setup( ) { try { Class BlockEvent = Class.forName("dev.architectury.event.events.common.BlockEvent"); diff --git a/Fabric/src/main/java/tschipp/carryon/config/fabric/ConfigLoaderImpl.java b/Fabric/src/main/java/tschipp/carryon/config/fabric/ConfigLoaderImpl.java index fd385ea..b48a683 100644 --- a/Fabric/src/main/java/tschipp/carryon/config/fabric/ConfigLoaderImpl.java +++ b/Fabric/src/main/java/tschipp/carryon/config/fabric/ConfigLoaderImpl.java @@ -23,8 +23,6 @@ package tschipp.carryon.config.fabric; import com.google.gson.*; import net.fabricmc.loader.api.FabricLoader; import org.apache.commons.io.FileUtils; -import tschipp.carryon.Constants; -import tschipp.carryon.common.config.CarryConfig; import tschipp.carryon.common.config.ListHandler; import tschipp.carryon.config.*; @@ -149,6 +147,7 @@ public class ConfigLoaderImpl { builder.add(category.category, categoryJson); } + @SuppressWarnings("unchecked") private static void buildProperty(JsonObject builder, PropertyData data) throws IllegalAccessException { AnnotationData annotationData = data.getData(); builder.addProperty("//"+data.getId(), annotationData.description()); diff --git a/Fabric/src/main/java/tschipp/carryon/events/ClientEvents.java b/Fabric/src/main/java/tschipp/carryon/events/ClientEvents.java index 6e5d8b2..8061030 100644 --- a/Fabric/src/main/java/tschipp/carryon/events/ClientEvents.java +++ b/Fabric/src/main/java/tschipp/carryon/events/ClientEvents.java @@ -20,11 +20,8 @@ package tschipp.carryon.events; -import com.mojang.blaze3d.vertex.PoseStack; import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents; -import net.fabricmc.fabric.api.client.rendering.v1.WorldRenderEvents; import tschipp.carryon.CarryOnCommonClient; -import tschipp.carryon.client.render.CarriedObjectRender; public class ClientEvents { @@ -34,10 +31,6 @@ public class ClientEvents { CarryOnCommonClient.checkForKeybinds(); CarryOnCommonClient.onCarryClientTick(); }); - - WorldRenderEvents.LAST.register(event -> { - CarriedObjectRender.drawThirdPerson(event.tickCounter().getGameTimeDeltaPartialTick(true), new PoseStack().last().pose()); - }); } } diff --git a/Fabric/src/main/java/tschipp/carryon/events/CommonEvents.java b/Fabric/src/main/java/tschipp/carryon/events/CommonEvents.java index fc7f9ac..fa828c8 100644 --- a/Fabric/src/main/java/tschipp/carryon/events/CommonEvents.java +++ b/Fabric/src/main/java/tschipp/carryon/events/CommonEvents.java @@ -21,7 +21,7 @@ package tschipp.carryon.events; import net.fabricmc.fabric.api.command.v2.CommandRegistrationCallback; -import net.fabricmc.fabric.api.entity.event.v1.ServerPlayerEvents; +import net.fabricmc.fabric.api.entity.event.v1.ServerLivingEntityEvents; import net.fabricmc.fabric.api.event.lifecycle.v1.CommonLifecycleEvents; import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents; import net.fabricmc.fabric.api.event.lifecycle.v1.ServerTickEvents; @@ -33,6 +33,7 @@ import net.minecraft.core.Direction; import net.minecraft.server.level.ServerPlayer; import net.minecraft.server.packs.PackType; import net.minecraft.world.InteractionResult; +import net.minecraft.world.level.GameRules; import tschipp.carryon.CarryOnCommon; import tschipp.carryon.common.carry.CarryOnData; import tschipp.carryon.common.carry.CarryOnData.CarryType; @@ -55,7 +56,7 @@ public class CommonEvents { UseBlockCallback.EVENT.register((player, world, hand, hitResult) -> { - if(world.isClientSide) + if(world.isClientSide()) return InteractionResult.PASS; BlockPos pos = hitResult.getBlockPos(); @@ -96,7 +97,7 @@ public class CommonEvents { UseEntityCallback.EVENT.register((player, level, hand, entity, hitResult) -> { - if(level.isClientSide) + if(level.isClientSide()) return InteractionResult.PASS; CarryOnData carry = CarryOnDataManager.getCarryData(player); @@ -132,10 +133,12 @@ public class CommonEvents { CarryOnCommon.onCarryTick(player); }); - - ServerPlayerEvents.COPY_FROM.register(((oldPlayer, newPlayer, alive) -> { - PlacementHandler.placeCarriedOnDeath(oldPlayer, newPlayer, !alive); - })); + ServerLivingEntityEvents.AFTER_DEATH.register((entity, damageSource)->{ + if (!(entity instanceof ServerPlayer)) return; + var player = (ServerPlayer) entity; + var carry = CarryOnDataManager.getCarryData(player); + if (carry.isCarrying(CarryType.PLAYER) || !player.level().getGameRules().getBoolean(GameRules.RULE_KEEPINVENTORY)) PlacementHandler.placeCarried(player); + }); PlayerBlockBreakEvents.BEFORE.register(((world, player, pos, state, blockEntity) -> { diff --git a/Fabric/src/main/java/tschipp/carryon/mixin/ItemInHandRendererMixin.java b/Fabric/src/main/java/tschipp/carryon/mixin/ItemInHandRendererMixin.java index fc12a3e..62c4e91 100644 --- a/Fabric/src/main/java/tschipp/carryon/mixin/ItemInHandRendererMixin.java +++ b/Fabric/src/main/java/tschipp/carryon/mixin/ItemInHandRendererMixin.java @@ -21,31 +21,24 @@ package tschipp.carryon.mixin; import com.mojang.blaze3d.vertex.PoseStack; -import net.minecraft.client.Minecraft; import net.minecraft.client.player.AbstractClientPlayer; -import net.minecraft.client.renderer.GameRenderer; import net.minecraft.client.renderer.ItemInHandRenderer; -import net.minecraft.client.renderer.MultiBufferSource; -import net.minecraft.client.renderer.RenderBuffers; +import net.minecraft.client.renderer.SubmitNodeCollector; import net.minecraft.world.InteractionHand; -import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import tschipp.carryon.client.render.CarriedObjectRender; -import tschipp.carryon.client.render.CarryRenderHelper; -import tschipp.carryon.platform.Services; @Mixin(ItemInHandRenderer.class) public class ItemInHandRendererMixin { - @Inject(at = @At(value = "HEAD"), method = "renderArmWithItem(Lnet/minecraft/client/player/AbstractClientPlayer;FFLnet/minecraft/world/InteractionHand;FLnet/minecraft/world/item/ItemStack;FLcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;I)V", cancellable = true) - private void onRenderHand(AbstractClientPlayer player, float partialTicks, float pitch, InteractionHand hand, float pSwingProgress, ItemStack pStack, float pEquippedProgress, PoseStack poseStack, MultiBufferSource buffer, int light, CallbackInfo ci) + @Inject(at = @At(value = "HEAD"), method = "renderArmWithItem(Lnet/minecraft/client/player/AbstractClientPlayer;FFLnet/minecraft/world/InteractionHand;FLnet/minecraft/world/item/ItemStack;FLcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/SubmitNodeCollector;I)V", cancellable = true) + private void renderArmWithItem(AbstractClientPlayer player, float partialTick, float pitch, InteractionHand hand, float swingProgress, ItemStack item, float equippedProgress, PoseStack poseStack, SubmitNodeCollector nodeCollector, int packedLight, CallbackInfo ci) { - if(CarryRenderHelper.getPerspective() == 0 && CarriedObjectRender.drawFirstPerson(player, buffer, poseStack, light, partialTicks)) + if(CarriedObjectRender.draw(player, poseStack, packedLight, partialTick,nodeCollector,true)) ci.cancel(); } diff --git a/Fabric/src/main/java/tschipp/carryon/platform/FabricPlatformHelper.java b/Fabric/src/main/java/tschipp/carryon/platform/FabricPlatformHelper.java index 64d4bdf..3412f62 100644 --- a/Fabric/src/main/java/tschipp/carryon/platform/FabricPlatformHelper.java +++ b/Fabric/src/main/java/tschipp/carryon/platform/FabricPlatformHelper.java @@ -20,17 +20,12 @@ package tschipp.carryon.platform; -import net.fabricmc.fabric.api.networking.v1.PacketByteBufs; import net.fabricmc.fabric.api.networking.v1.PayloadTypeRegistry; import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking; -import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking.PlayPayloadHandler; import net.fabricmc.loader.api.FabricLoader; -import net.minecraft.nbt.CompoundTag; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.network.RegistryFriendlyByteBuf; import net.minecraft.network.codec.StreamCodec; -import net.minecraft.network.codec.StreamDecoder; -import net.minecraft.network.codec.StreamMemberEncoder; import net.minecraft.network.protocol.common.custom.CustomPacketPayload; import net.minecraft.resources.ResourceLocation; import net.minecraft.server.level.ServerPlayer; @@ -44,7 +39,6 @@ import tschipp.carryon.networking.PacketBase; import tschipp.carryon.platform.services.IPlatformHelper; import java.util.function.BiConsumer; -import java.util.function.Function; public class FabricPlatformHelper implements IPlatformHelper { @@ -70,6 +64,7 @@ public class FabricPlatformHelper implements IPlatformHelper { ConfigLoaderImpl.registerConfig(cfg); } + @SuppressWarnings("unchecked") @Override public void registerServerboundPacket(CustomPacketPayload.Type type, Class clazz, StreamCodec codec, BiConsumer handler, Object... args) { @@ -82,6 +77,7 @@ public class FabricPlatformHelper implements IPlatformHelper { }); } + @SuppressWarnings("unchecked") @Override public void registerClientboundPacket(CustomPacketPayload.Type type, Class clazz, StreamCodec codec, BiConsumer handler, Object... args) { diff --git a/Forge/src/main/java/tschipp/carryon/CarryOnForge.java b/Forge/src/main/java/tschipp/carryon/CarryOnForge.java index 292bf7b..9c773ee 100644 --- a/Forge/src/main/java/tschipp/carryon/CarryOnForge.java +++ b/Forge/src/main/java/tschipp/carryon/CarryOnForge.java @@ -30,7 +30,6 @@ import net.minecraftforge.network.ChannelBuilder; import net.minecraftforge.network.SimpleChannel; import tschipp.carryon.config.forge.ConfigLoaderImpl; import tschipp.carryon.networking.ClientboundSyncCarryDataPacket; -import tschipp.carryon.networking.clientbound.ClientboundStartRidingPacket; import tschipp.carryon.platform.Services; @Mod(Constants.MOD_ID) diff --git a/Forge/src/main/java/tschipp/carryon/carry/ICarryOnDataCapability.java b/Forge/src/main/java/tschipp/carryon/carry/ICarryOnDataCapability.java index 49ab1f8..17c9e11 100644 --- a/Forge/src/main/java/tschipp/carryon/carry/ICarryOnDataCapability.java +++ b/Forge/src/main/java/tschipp/carryon/carry/ICarryOnDataCapability.java @@ -2,7 +2,6 @@ package tschipp.carryon.carry; import net.minecraftforge.common.capabilities.AutoRegisterCapability; import tschipp.carryon.common.carry.CarryOnData; -import tschipp.carryon.common.carry.CarryOnDataManager; @AutoRegisterCapability public interface ICarryOnDataCapability { diff --git a/Forge/src/main/java/tschipp/carryon/compat/ClothConfigCompatForge.java b/Forge/src/main/java/tschipp/carryon/compat/ClothConfigCompatForge.java deleted file mode 100644 index 516b364..0000000 --- a/Forge/src/main/java/tschipp/carryon/compat/ClothConfigCompatForge.java +++ /dev/null @@ -1,17 +0,0 @@ -package tschipp.carryon.compat; - -import net.minecraft.client.gui.screens.Screen; -import tschipp.carryon.config.BuiltConfig; -import tschipp.carryon.config.forge.ConfigLoaderImpl; - -public class ClothConfigCompatForge { - -// public static Screen createScreen(BuiltConfig client, BuiltConfig common, Screen screen) { -// -// return ClothConfigCompat.getConfigScreen(client, common, screen, () -> { -// ConfigLoaderImpl.saveConfig(client); ConfigLoaderImpl.saveConfig(common);}); -// } -} - - - diff --git a/Forge/src/main/java/tschipp/carryon/config/forge/ConfigLoaderImpl.java b/Forge/src/main/java/tschipp/carryon/config/forge/ConfigLoaderImpl.java index 39bda58..ea4c147 100644 --- a/Forge/src/main/java/tschipp/carryon/config/forge/ConfigLoaderImpl.java +++ b/Forge/src/main/java/tschipp/carryon/config/forge/ConfigLoaderImpl.java @@ -22,21 +22,13 @@ package tschipp.carryon.config.forge; import com.electronwill.nightconfig.core.AbstractConfig; import com.electronwill.nightconfig.core.UnmodifiableConfig; -import net.minecraft.client.Minecraft; -import net.minecraft.server.MinecraftServer; -import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.common.ForgeConfigSpec; -import net.minecraftforge.common.util.LogicalSidedProvider; import net.minecraftforge.eventbus.api.listener.SubscribeEvent; -import net.minecraftforge.fml.LogicalSide; -import net.minecraftforge.fml.ModLoadingContext; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.config.IConfigSpec; import net.minecraftforge.fml.config.ModConfig; import net.minecraftforge.fml.event.config.ModConfigEvent; import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; -import net.minecraftforge.fml.loading.FMLServiceProvider; -import net.minecraftforge.server.ServerLifecycleHooks; import tschipp.carryon.Constants; import tschipp.carryon.config.*; @@ -119,6 +111,7 @@ public class ConfigLoaderImpl { builder.pop(); } + @SuppressWarnings("unchecked") private static void buildProperty(ForgeConfigSpec.Builder builder, PropertyData data) throws IllegalAccessException { AnnotationData annotationData = data.getData(); builder.comment(annotationData.description()); diff --git a/Forge/src/main/java/tschipp/carryon/events/ClientEvents.java b/Forge/src/main/java/tschipp/carryon/events/ClientEvents.java index 4e557af..fb6076d 100644 --- a/Forge/src/main/java/tschipp/carryon/events/ClientEvents.java +++ b/Forge/src/main/java/tschipp/carryon/events/ClientEvents.java @@ -23,14 +23,12 @@ package tschipp.carryon.events; import com.mojang.blaze3d.vertex.PoseStack; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen; -import net.minecraft.client.renderer.MultiBufferSource; +import net.minecraft.client.renderer.SubmitNodeCollector; import net.minecraft.world.entity.player.Player; import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.client.event.RenderHandEvent; import net.minecraftforge.client.event.ScreenEvent; import net.minecraftforge.event.TickEvent.ClientTickEvent; -import net.minecraftforge.event.TickEvent.Phase; import net.minecraftforge.eventbus.api.listener.SubscribeEvent; import net.minecraftforge.fml.common.Mod; import tschipp.carryon.CarryOnCommonClient; @@ -47,24 +45,14 @@ public class ClientEvents { public static boolean renderHand(RenderHandEvent event) { Player player = Minecraft.getInstance().player; - MultiBufferSource buffer = event.getMultiBufferSource(); PoseStack matrix = event.getPoseStack(); int light = event.getPackedLight(); float partialTicks = event.getPartialTick(); - + SubmitNodeCollector nodes =event.getNodeCollector(); //If true, cancels event - return CarriedObjectRender.drawFirstPerson(player, buffer, matrix, light, partialTicks) && CarryRenderHelper.getPerspective() == 0; + return CarriedObjectRender.draw(player, matrix, light, partialTicks,nodes,true) && CarryRenderHelper.getPerspective() == 0; } - /* - @SubscribeEvent - public static void onRenderLevel(Render event) - { - if(event.getStage() == Stage.AFTER_PARTICLES) - CarriedObjectRender.drawThirdPerson(Minecraft.getInstance().getTimer().getGameTimeDeltaPartialTick(true), event.getPoseStack()); - } - */ - @SubscribeEvent public static boolean onGuiInit(ScreenEvent.Init.Pre event) { diff --git a/Forge/src/main/java/tschipp/carryon/events/CommonEvents.java b/Forge/src/main/java/tschipp/carryon/events/CommonEvents.java index b91d5f9..c7945ea 100644 --- a/Forge/src/main/java/tschipp/carryon/events/CommonEvents.java +++ b/Forge/src/main/java/tschipp/carryon/events/CommonEvents.java @@ -30,11 +30,9 @@ import net.minecraft.world.entity.Mob; import net.minecraft.world.entity.player.Player; import net.minecraft.world.level.Level; import net.minecraft.world.level.ServerLevelAccessor; -import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.util.BlockSnapshot; import net.minecraftforge.common.util.Result; import net.minecraftforge.event.*; -import net.minecraftforge.event.TickEvent.Phase; import net.minecraftforge.event.TickEvent.ServerTickEvent; import net.minecraftforge.event.entity.EntityJoinLevelEvent; import net.minecraftforge.event.entity.living.LivingAttackEvent; @@ -50,7 +48,6 @@ import net.minecraftforge.event.level.BlockEvent.EntityPlaceEvent; import net.minecraftforge.eventbus.api.listener.Priority; import net.minecraftforge.eventbus.api.listener.SubscribeEvent; import net.minecraftforge.fml.common.Mod; -import oshi.jna.platform.mac.SystemB; import tschipp.carryon.CarryOnCommon; import tschipp.carryon.Constants; import tschipp.carryon.carry.CarryOnDataCapabilityProvider; @@ -74,7 +71,7 @@ public class CommonEvents Level level = event.getLevel(); BlockPos pos = event.getPos(); - if (level.isClientSide) + if (level.isClientSide()) return false; boolean success = false; @@ -122,7 +119,7 @@ public class CommonEvents Level level = event.getLevel(); Entity target = event.getTarget(); - if (level.isClientSide) + if (level.isClientSide()) return false; CarryOnData carry = CarryOnDataManager.getCarryData(player); @@ -173,14 +170,14 @@ public class CommonEvents @SubscribeEvent public static void onServerTick(ServerTickEvent.Post event) { - for (ServerPlayer player : event.getServer().getPlayerList().getPlayers()) + for (ServerPlayer player : event.server().getPlayerList().getPlayers()) CarryOnCommon.onCarryTick(player); } @SubscribeEvent public static void onClone(Clone event) { - if (!event.getOriginal().level().isClientSide) { + if (!event.getOriginal().level().isClientSide()) { Player newPlayer = event.getEntity(); Player oldPlayer = event.getOriginal(); oldPlayer.reviveCaps(); @@ -226,7 +223,7 @@ public class CommonEvents @SubscribeEvent public static void onAttachCapabilities(AttachCapabilitiesEvent.Entities event) { - if (event.getObject() instanceof Player player) { + if (event.getObject() instanceof Player) { event.addCapability(ResourceLocation.fromNamespaceAndPath(Constants.MOD_ID, "carry_on_data"), new CarryOnDataCapabilityProvider()); } } diff --git a/Forge/src/main/java/tschipp/carryon/events/ModBusEvents.java b/Forge/src/main/java/tschipp/carryon/events/ModBusEvents.java index aa8d7f8..3bac03b 100644 --- a/Forge/src/main/java/tschipp/carryon/events/ModBusEvents.java +++ b/Forge/src/main/java/tschipp/carryon/events/ModBusEvents.java @@ -24,10 +24,8 @@ import net.minecraftforge.eventbus.api.listener.SubscribeEvent; import net.minecraftforge.fml.InterModComms; import net.minecraftforge.fml.InterModComms.IMCMessage; import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent; import net.minecraftforge.fml.event.lifecycle.InterModProcessEvent; import tschipp.carryon.Constants; -import tschipp.carryon.client.modeloverride.ModelOverrideHandler; import tschipp.carryon.common.config.ListHandler; import java.util.stream.Stream; diff --git a/Forge/src/main/java/tschipp/carryon/events/ModClientEvents.java b/Forge/src/main/java/tschipp/carryon/events/ModClientEvents.java index 98c4e34..91396b7 100644 --- a/Forge/src/main/java/tschipp/carryon/events/ModClientEvents.java +++ b/Forge/src/main/java/tschipp/carryon/events/ModClientEvents.java @@ -21,17 +21,13 @@ package tschipp.carryon.events; import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; -import net.minecraftforge.client.ConfigScreenHandler; import net.minecraftforge.client.event.RegisterKeyMappingsEvent; import net.minecraftforge.eventbus.api.listener.SubscribeEvent; -import net.minecraftforge.fml.ModLoadingContext; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.Mod.EventBusSubscriber.Bus; import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent; import tschipp.carryon.Constants; import tschipp.carryon.client.keybinds.CarryOnKeybinds; -import tschipp.carryon.compat.ClothConfigCompatForge; import tschipp.carryon.config.BuiltConfig; import tschipp.carryon.config.forge.ConfigLoaderImpl; import tschipp.carryon.platform.Services; @@ -39,20 +35,15 @@ import tschipp.carryon.platform.Services; @Mod.EventBusSubscriber(bus = Bus.MOD, modid = Constants.MOD_ID, value=Dist.CLIENT) public class ModClientEvents { - @SubscribeEvent - public static void registerKeybinds(RegisterKeyMappingsEvent event) - { - CarryOnKeybinds.registerKeybinds(event::register); + static{ + RegisterKeyMappingsEvent.BUS.addListener((e)->CarryOnKeybinds.registerKeybinds(e::register)); } - @SubscribeEvent public static void clientSetup(FMLClientSetupEvent event) { if(Services.PLATFORM.isModLoaded("cloth_config")) { - - BuiltConfig[] configs = ConfigLoaderImpl.CONFIGS.values().toArray(new BuiltConfig[0]); - //ModLoadingContext.get().registerExtensionPoint(ConfigScreenHandler.ConfigScreenFactory.class, () -> new ConfigScreenHandler.ConfigScreenFactory((mc, prevScreen) -> ClothConfigCompatForge.createScreen(configs[1], configs[0], prevScreen))); + ConfigLoaderImpl.CONFIGS.values().toArray(new BuiltConfig[0]); } } } diff --git a/Forge/src/main/java/tschipp/carryon/mixin/ParticleEngineMixin.java b/Forge/src/main/java/tschipp/carryon/mixin/ParticleEngineMixin.java deleted file mode 100644 index 44632dc..0000000 --- a/Forge/src/main/java/tschipp/carryon/mixin/ParticleEngineMixin.java +++ /dev/null @@ -1,47 +0,0 @@ -/* - * GNU Lesser General Public License v3 - * Copyright (C) 2024 Tschipp - * mrtschipp@gmail.com - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 3 of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - -package tschipp.carryon.mixin; - -import com.mojang.blaze3d.vertex.PoseStack; -import net.minecraft.client.Camera; -import net.minecraft.client.particle.ParticleEngine; -import net.minecraft.client.renderer.LightTexture; -import net.minecraft.client.renderer.MultiBufferSource; -import net.minecraft.client.renderer.culling.Frustum; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import tschipp.carryon.client.render.CarriedObjectRender; - -@Mixin(ParticleEngine.class) -public class ParticleEngineMixin -{ - //I am injecting into a lambda, lord help me - - @Inject(method = "render(Lnet/minecraft/client/Camera;FLnet/minecraft/client/renderer/MultiBufferSource$BufferSource;Lnet/minecraft/client/renderer/culling/Frustum;)V", - at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/MultiBufferSource$BufferSource;endBatch()V", - shift = At.Shift.AFTER)) - private void onRenderLevel(Camera p_107340_, float partialTick, MultiBufferSource.BufferSource p_377798_, Frustum frustum, CallbackInfo ci) - { - CarriedObjectRender.drawThirdPerson(partialTick, new PoseStack().last().pose()); - } -} diff --git a/Forge/src/main/java/tschipp/carryon/networking/ClientboundSyncCarryDataPacket.java b/Forge/src/main/java/tschipp/carryon/networking/ClientboundSyncCarryDataPacket.java index 25e37c4..e78deb7 100644 --- a/Forge/src/main/java/tschipp/carryon/networking/ClientboundSyncCarryDataPacket.java +++ b/Forge/src/main/java/tschipp/carryon/networking/ClientboundSyncCarryDataPacket.java @@ -9,7 +9,6 @@ import net.minecraft.world.entity.player.Player; import tschipp.carryon.Constants; import tschipp.carryon.common.carry.CarryOnData; import tschipp.carryon.common.carry.CarryOnDataManager; -import tschipp.carryon.networking.clientbound.ClientboundStartRidingPacket; public record ClientboundSyncCarryDataPacket(int iden, CarryOnData data) implements PacketBase { diff --git a/Forge/src/main/java/tschipp/carryon/platform/ForgePlatformHelper.java b/Forge/src/main/java/tschipp/carryon/platform/ForgePlatformHelper.java index 54d6fbd..eed5a2d 100644 --- a/Forge/src/main/java/tschipp/carryon/platform/ForgePlatformHelper.java +++ b/Forge/src/main/java/tschipp/carryon/platform/ForgePlatformHelper.java @@ -21,7 +21,6 @@ package tschipp.carryon.platform; import net.minecraft.network.FriendlyByteBuf; -import net.minecraft.network.RegistryFriendlyByteBuf; import net.minecraft.network.codec.StreamCodec; import net.minecraft.network.protocol.common.custom.CustomPacketPayload; import net.minecraft.resources.ResourceLocation; @@ -31,14 +30,12 @@ import net.minecraft.world.entity.player.Player; import net.minecraftforge.event.network.CustomPayloadEvent; import net.minecraftforge.fml.ModList; import net.minecraftforge.fml.loading.FMLLoader; -import net.minecraftforge.network.NetworkDirection; import net.minecraftforge.network.PacketDistributor; import tschipp.carryon.CarryOnCommonClient; import tschipp.carryon.CarryOnForge; import tschipp.carryon.Constants; import tschipp.carryon.carry.CarryOnDataCapability; import tschipp.carryon.carry.CarryOnDataCapabilityProvider; -import tschipp.carryon.carry.ICarryOnDataCapability; import tschipp.carryon.common.carry.CarryOnData; import tschipp.carryon.config.BuiltConfig; import tschipp.carryon.config.forge.ConfigLoaderImpl; @@ -47,7 +44,6 @@ import tschipp.carryon.networking.PacketBase; import tschipp.carryon.platform.services.IPlatformHelper; import java.util.function.BiConsumer; -import java.util.function.Function; public class ForgePlatformHelper implements IPlatformHelper { @@ -74,6 +70,7 @@ public class ForgePlatformHelper implements IPlatformHelper { ConfigLoaderImpl.registerConfig(cfg); } + @SuppressWarnings("unchecked") @Override public void registerServerboundPacket(CustomPacketPayload.Type type, Class clazz, StreamCodec codec, BiConsumer handler, Object... args) { @@ -90,6 +87,7 @@ public class ForgePlatformHelper implements IPlatformHelper { CarryOnForge.network.messageBuilder(clazz).codec((StreamCodec) codec).consumerMainThread(serverHandler).add(); } + @SuppressWarnings("unchecked") @Override public void registerClientboundPacket(CustomPacketPayload.Type type, Class clazz, StreamCodec codec, BiConsumer handler, Object... args) { @@ -129,7 +127,7 @@ public class ForgePlatformHelper implements IPlatformHelper { public void setCarryData(Player player, CarryOnData data) { var cap = player.getCapability(CarryOnDataCapabilityProvider.CARRY_ON_DATA_CAPABILITY).orElse(new CarryOnDataCapability()); cap.setCarryData(data); - if(!player.level().isClientSide) { + if(!player.level().isClientSide()) { sendPacketToAllPlayers(Constants.PACKET_ID_SYNC_SCRIPTS, new ClientboundSyncCarryDataPacket(player.getId(), data), (ServerLevel) player.level()); } } diff --git a/Forge/src/main/resources/carryon.forge.mixins.json b/Forge/src/main/resources/carryon.forge.mixins.json index 0df58a2..8536f54 100644 --- a/Forge/src/main/resources/carryon.forge.mixins.json +++ b/Forge/src/main/resources/carryon.forge.mixins.json @@ -6,7 +6,6 @@ "mixins": [ ], "client": [ - "ParticleEngineMixin" ], "server": [ ], diff --git a/NeoForge/build.gradle b/NeoForge/build.gradle index 57aa5d8..91d6424 100644 --- a/NeoForge/build.gradle +++ b/NeoForge/build.gradle @@ -20,7 +20,7 @@ neoForge { accessTransformers.from(at.absolutePath) } parchment { - minecraftVersion = minecraft_version + minecraftVersion = parchment_game_version mappingsVersion = parchment_version } runs { @@ -47,7 +47,7 @@ neoForge { dependencies { - api "me.shedaniel.cloth:cloth-config-neoforge:${cloth_config_version}" + compileOnly "me.shedaniel.cloth:cloth-config-neoforge:${cloth_config_version}" } sourceSets.main.resources { srcDir 'src/generated/resources' } diff --git a/NeoForge/src/main/java/tschipp/carryon/CarryOnNeoForge.java b/NeoForge/src/main/java/tschipp/carryon/CarryOnNeoForge.java index d7db9dc..30c386c 100644 --- a/NeoForge/src/main/java/tschipp/carryon/CarryOnNeoForge.java +++ b/NeoForge/src/main/java/tschipp/carryon/CarryOnNeoForge.java @@ -21,14 +21,10 @@ package tschipp.carryon; import net.minecraft.nbt.CompoundTag; -import net.neoforged.bus.api.IEventBus; -import net.neoforged.bus.api.SubscribeEvent; import net.neoforged.fml.ModContainer; import net.neoforged.fml.common.Mod; import net.neoforged.fml.event.lifecycle.FMLCommonSetupEvent; import net.neoforged.neoforge.attachment.AttachmentType; -import net.neoforged.neoforge.client.gui.ConfigurationScreen; -import net.neoforged.neoforge.common.NeoForge; import net.neoforged.neoforge.network.event.RegisterPayloadHandlersEvent; import net.neoforged.neoforge.network.registration.PayloadRegistrar; import net.neoforged.neoforge.registries.DeferredRegister; diff --git a/NeoForge/src/main/java/tschipp/carryon/carry/CarryOnDataSyncHandler.java b/NeoForge/src/main/java/tschipp/carryon/carry/CarryOnDataSyncHandler.java index 16fa62f..3f9b4d7 100644 --- a/NeoForge/src/main/java/tschipp/carryon/carry/CarryOnDataSyncHandler.java +++ b/NeoForge/src/main/java/tschipp/carryon/carry/CarryOnDataSyncHandler.java @@ -20,7 +20,11 @@ public class CarryOnDataSyncHandler implements AttachmentSyncHandler void registerServerboundPacket(CustomPacketPayload.Type type, Class clazz, StreamCodec codec, BiConsumer handler, Object... args) { PayloadRegistrar registrar = (PayloadRegistrar) args[0]; @@ -85,6 +83,7 @@ public class NeoForgePlatformHelper implements IPlatformHelper { registrar.playToServer(type, (StreamCodec)codec, serverHandler); } + @SuppressWarnings("unchecked") @Override public void registerClientboundPacket(CustomPacketPayload.Type type, Class clazz, StreamCodec codec, BiConsumer handler, Object... args) { diff --git a/build.gradle b/build.gradle index 1645185..dc85e78 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,6 @@ plugins { // see https://fabricmc.net/develop/ for new versions - id 'fabric-loom' version '1.11-SNAPSHOT' apply false + id 'fabric-loom' version "${loom_version}" apply false // see https://projects.neoforged.net/neoforged/moddevgradle for new versions id 'net.neoforged.moddev' version "${mod_dev_version}" apply false } \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index fa35b2b..293be27 100644 --- a/gradle.properties +++ b/gradle.properties @@ -14,6 +14,7 @@ minecraft_version_range=[1.21.9, 1.22) neo_form_version=1.21.9-20250930.151910 java_version=21 parchment_version=2025.10.05 +parchment_game_version=1.21.9 mod_dev_version=2.0.115 # Forge forge_version= 59.0.5 @@ -25,6 +26,7 @@ parchment_mappings=2025.10.05-1.21.9 fabric_version=0.134.0+1.21.9 fabric_loader_version=0.17.3 parchment_mappings_fabric=1.21.9:2025.10.05 +loom_version=1.11-SNAPSHOT # Neoforge neoforge_version=21.9.16-beta @@ -37,5 +39,5 @@ neogradle.subsystems.parchment.mappingsVersion=2025.10.05 org.gradle.jvmargs=-Xmx3G org.gradle.daemon=false -mixinextras_version=0.3.6 -cloth_config_version=20.0.149 \ No newline at end of file +mixinextras_version=0.5.0 +cloth_config_version=20.0.148 \ No newline at end of file diff --git a/settings.gradle b/settings.gradle index 0a7f7e0..4693ae2 100644 --- a/settings.gradle +++ b/settings.gradle @@ -12,6 +12,7 @@ pluginManagement { } filter { includeGroup('net.fabricmc') + includeGroup('net.fabricmc.unpick') includeGroup('fabric-loom') includeGroup('net.fabricmc.unpick') }