From 2203efc30164d08d2520e54d2a710b66fcb48875 Mon Sep 17 00:00:00 2001 From: Craig Date: Tue, 4 Jul 2023 23:25:41 +0100 Subject: [PATCH] Adjusts textures and tags --- build.gradle | 9 +- .../client/animation/AnimationHandler.java | 6 +- .../venturecraft/gliders/util/GliderUtil.java | 31 +- .../vc_gliders/player_animation/insanity.json | 522 ------------------ .../entity/glider/paraglider_sapphire.png | Bin 2289 -> 0 bytes .../entity/glider/paraglider_wood.png | Bin 1740 -> 1728 bytes .../gliders/forge/data/BlockTagsProvider.java | 6 +- .../gliders/forge/events/ClientEvents.java | 1 + 8 files changed, 26 insertions(+), 549 deletions(-) delete mode 100644 common/src/main/resources/assets/vc_gliders/player_animation/insanity.json delete mode 100644 common/src/main/resources/assets/vc_gliders/textures/entity/glider/paraglider_sapphire.png diff --git a/build.gradle b/build.gradle index b212eea..77fb7e7 100644 --- a/build.gradle +++ b/build.gradle @@ -37,16 +37,19 @@ def version = rootProject.mod_version def forgeDir = new File(project.projectDir, 'forge/build/libs/') def fabricDir = new File(project.projectDir, 'fabric/build/libs/') def commonDir = new File(project.projectDir, 'common/build/libs/') -forgeDir.mkdir() -fabricDir.mkdir() -commonDir.mkdir() def filter = { File file -> file.getName().contains(version) } as FileFilter +// Create directories if they do not exist +forgeDir.mkdirs() +fabricDir.mkdirs() +commonDir.mkdirs() + def forgeFiles = forgeDir.listFiles(filter) def fabricFiles = fabricDir.listFiles(filter) def commonFiles = commonDir.listFiles(filter) + githubRelease { token project.findProperty("github") ?: System.getenv("github") ?: "" owner "VentureCraftMods" diff --git a/common/src/main/java/net/venturecraft/gliders/client/animation/AnimationHandler.java b/common/src/main/java/net/venturecraft/gliders/client/animation/AnimationHandler.java index b0e9c2d..48fa6f1 100644 --- a/common/src/main/java/net/venturecraft/gliders/client/animation/AnimationHandler.java +++ b/common/src/main/java/net/venturecraft/gliders/client/animation/AnimationHandler.java @@ -20,10 +20,12 @@ public static void startGliderAnimation(LivingEntity livingEntity, CallbackInfo ModifierLayer animationContainer = ((AnimatedPlayer) livingEntity).gliders_getModifierLayer(); KeyframeAnimation gliderAnimation = PlayerAnimationRegistry.getAnimation(new ResourceLocation(VCGliders.MOD_ID, "gliding")); - if (GliderUtil.isGlidingWithActiveGlider(livingEntity)) { if (animationContainer.getAnimation() == null) { - var builder = gliderAnimation.mutableCopy(); + KeyframeAnimation.AnimationBuilder builder = null; + if (gliderAnimation != null) { + builder = gliderAnimation.mutableCopy(); + } gliderAnimation = builder.build(); animationContainer.setAnimation(new KeyframeAnimationPlayer(gliderAnimation)); } diff --git a/common/src/main/java/net/venturecraft/gliders/util/GliderUtil.java b/common/src/main/java/net/venturecraft/gliders/util/GliderUtil.java index 06d6894..dcb2949 100644 --- a/common/src/main/java/net/venturecraft/gliders/util/GliderUtil.java +++ b/common/src/main/java/net/venturecraft/gliders/util/GliderUtil.java @@ -3,7 +3,6 @@ import net.minecraft.client.Minecraft; import net.minecraft.core.BlockPos; import net.minecraft.core.particles.ParticleTypes; -import net.minecraft.server.level.ServerLevel; import net.minecraft.server.level.ServerPlayer; import net.minecraft.sounds.SoundEvents; import net.minecraft.sounds.SoundSource; @@ -17,7 +16,6 @@ import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.phys.AABB; import net.minecraft.world.phys.Vec3; -import net.threetag.palladiumcore.util.Platform; import net.venturecraft.gliders.common.compat.trinket.CuriosTrinketsUtil; import net.venturecraft.gliders.common.item.GliderItem; import net.venturecraft.gliders.common.sound.SoundRegistry; @@ -62,11 +60,12 @@ public static void onTickPlayerGlide(Level level, LivingEntity player) { lightningLogic(level, player, glider); - if (player.tickCount % (player.level.dimension() == Level.NETHER ? 40 : 400) == 0) { + if (player.tickCount % (player.level.dimension() == Level.NETHER ? 40 : 100) == 0) { if (player instanceof ServerPlayer serverPlayer) { int damageAmount = player.level.dimension() == Level.NETHER && !hasNetherUpgrade(glider) ? glider.getMaxDamage() / 2 : 1; - glider.setDamageValue(glider.getDamageValue() - damageAmount); + glider.setDamageValue(glider.getDamageValue() + damageAmount); + System.out.println(glider.getDamageValue()); if (glider.getDamageValue() >= glider.getMaxDamage()) { level.playSound(null, serverPlayer.getX(), serverPlayer.getY(), serverPlayer.getZ(), SoundEvents.FIRE_EXTINGUISH, SoundSource.PLAYERS, 1.0F, 1.0F / (level.getRandom().nextFloat() * 0.4F + 1.2F)); level.playSound(null, serverPlayer.getX(), serverPlayer.getY(), serverPlayer.getZ(), SoundEvents.ITEM_BREAK, SoundSource.PLAYERS, 1.0F, 1.0F / (level.getRandom().nextFloat() * 0.4F + 1.2F)); @@ -78,33 +77,27 @@ public static void onTickPlayerGlide(Level level, LivingEntity player) { handleNetherLogic(level, player, glider); - if(checkUpdraft(player.blockPosition(), level, player)) return; + if (checkUpdraft(player.blockPosition(), level, player)) return; // Particles float horizonalSpeed = (float) player.getDeltaMovement().horizontalDistance(); - if (isSpaceGlider(glider) && horizonalSpeed >= 0.01F) { + if (horizonalSpeed >= 0.01F) { - if (!level.isClientSide()) { + // Space Glider + if (isSpaceGlider(glider)) { for (int i = 0; i < 2; ++i) { - for (ServerPlayer serverplayer : Platform.getCurrentServer().getPlayerList().getPlayers()) { - ((ServerLevel) serverplayer.level).sendParticles(ParticleTypes.DRAGON_BREATH, player.getRandomX(0.5D), player.getY() + 2.5, player.getRandomZ(0.5D), 1, 0.0D, 0.0D, 0.0D, 0.0D); - } + level.addParticle(ParticleTypes.DRAGON_BREATH, player.getRandomX(0.5D), player.getY() + 2.5, player.getRandomZ(0.5D), 1, 0.0D, 0.0D); } } - } - // Speed Modifications - if (hasSpeedMods) { - if (!level.isClientSide() && horizonalSpeed >= 0.01F) { - for (int i = 0; i < 2; ++i) { - for (ServerPlayer serverplayer : Platform.getCurrentServer().getPlayerList().getPlayers()) { - ((ServerLevel) serverplayer.level).sendParticles(ParticleTypes.GLOW, player.getRandomX(0.5D), player.getY() + 2.5, player.getRandomZ(0.5D), 1, 0.0D, 0.0D, 0.0D, 0.0D); - } - } + // Speed Modifications + if (hasSpeedMods) { + level.addParticle(ParticleTypes.WITCH, player.getRandomX(0.5D), player.getY() + 2.5, player.getRandomZ(0.5D), 0.5, 0.0D, 0.0D); } } + if (m.y < -0.05) player.setDeltaMovement(new Vec3(m.x, -0.05, m.z)); return; diff --git a/common/src/main/resources/assets/vc_gliders/player_animation/insanity.json b/common/src/main/resources/assets/vc_gliders/player_animation/insanity.json deleted file mode 100644 index 077a7ee..0000000 --- a/common/src/main/resources/assets/vc_gliders/player_animation/insanity.json +++ /dev/null @@ -1,522 +0,0 @@ -{ - "version": 1, - "valid": true, - "name": "insanity", - "description": "Forget your virtual reality", - "author": "Wah0o", - "emote": { - "beginTick": 0, - "endTick": 20, - "stopTick": 21, - "isLoop": true, - "returnTick": 2, - "nsfw": false, - "degrees": false, - "moves": [ - { - "tick": 1, - "easing": "INOUTQUAD", - "head": { - "x": -0.0 - } - }, - { - "tick": 20, - "easing": "INOUTQUAD", - "head": { - "x": -0.0 - } - }, - { - "tick": 1, - "easing": "INOUTQUAD", - "head": { - "y": -0.0 - } - }, - { - "tick": 20, - "easing": "INOUTQUAD", - "head": { - "y": -0.0 - } - }, - { - "tick": 1, - "easing": "INOUTQUAD", - "head": { - "z": -0.0 - } - }, - { - "tick": 20, - "easing": "INOUTQUAD", - "head": { - "z": -0.0 - } - }, - { - "tick": 1, - "easing": "INOUTQUAD", - "head": { - "pitch": -0.017418005 - } - }, - { - "tick": 20, - "easing": "INOUTQUAD", - "head": { - "pitch": -0.017418005 - } - }, - { - "tick": 1, - "easing": "INOUTQUAD", - "head": { - "yaw": -0.6246321 - } - }, - { - "tick": 20, - "easing": "INOUTQUAD", - "head": { - "yaw": -0.6246321 - } - }, - { - "tick": 1, - "easing": "INOUTQUAD", - "head": { - "roll": 0.0027182566 - } - }, - { - "tick": 20, - "easing": "INOUTQUAD", - "head": { - "roll": 0.0027182566 - } - }, - { - "tick": 1, - "easing": "INOUTQUAD", - "rightLeg": { - "x": -1.9 - } - }, - { - "tick": 20, - "easing": "INOUTQUAD", - "rightLeg": { - "x": -1.9 - } - }, - { - "tick": 1, - "easing": "INOUTQUAD", - "rightLeg": { - "y": 12.0 - } - }, - { - "tick": 20, - "easing": "INOUTQUAD", - "rightLeg": { - "y": 12.0 - } - }, - { - "tick": 1, - "easing": "INOUTQUAD", - "rightLeg": { - "z": 0.1 - } - }, - { - "tick": 20, - "easing": "INOUTQUAD", - "rightLeg": { - "z": 0.1 - } - }, - { - "tick": 1, - "easing": "INOUTQUAD", - "rightLeg": { - "pitch": 0.037856523 - } - }, - { - "tick": 20, - "easing": "INOUTQUAD", - "rightLeg": { - "pitch": 0.037856523 - } - }, - { - "tick": 1, - "easing": "INOUTQUAD", - "rightLeg": { - "yaw": 0.4219151 - } - }, - { - "tick": 20, - "easing": "INOUTQUAD", - "rightLeg": { - "yaw": 0.4219151 - } - }, - { - "tick": 1, - "easing": "INOUTQUAD", - "rightLeg": { - "roll": 0.037537437 - } - }, - { - "tick": 20, - "easing": "INOUTQUAD", - "rightLeg": { - "roll": 0.037537437 - } - }, - { - "tick": 1, - "easing": "INOUTQUAD", - "rightArm": { - "x": -6.0125732 - } - }, - { - "tick": 20, - "easing": "INOUTQUAD", - "rightArm": { - "x": -6.0125732 - } - }, - { - "tick": 1, - "easing": "INOUTQUAD", - "rightArm": { - "y": 3.5028677 - } - }, - { - "tick": 20, - "easing": "INOUTQUAD", - "rightArm": { - "y": 3.5028677 - } - }, - { - "tick": 1, - "easing": "INOUTQUAD", - "rightArm": { - "z": 0.09424782 - } - }, - { - "tick": 20, - "easing": "INOUTQUAD", - "rightArm": { - "z": 0.09424782 - } - }, - { - "tick": 1, - "easing": "INOUTQUAD", - "rightArm": { - "pitch": -0.7741042 - } - }, - { - "tick": 20, - "easing": "INOUTQUAD", - "rightArm": { - "pitch": -0.7741042 - } - }, - { - "tick": 1, - "easing": "INOUTQUAD", - "rightArm": { - "yaw": -0.8304596 - } - }, - { - "tick": 20, - "easing": "INOUTQUAD", - "rightArm": { - "yaw": -0.8304596 - } - }, - { - "tick": 1, - "easing": "INOUTQUAD", - "rightArm": { - "roll": -1.2576404 - } - }, - { - "tick": 20, - "easing": "INOUTQUAD", - "rightArm": { - "roll": -1.2576404 - } - }, - { - "tick": 1, - "easing": "INOUTQUAD", - "leftArm": { - "x": 5.0 - } - }, - { - "tick": 20, - "easing": "INOUTQUAD", - "leftArm": { - "x": 5.0 - } - }, - { - "tick": 1, - "easing": "INOUTQUAD", - "leftArm": { - "y": 2.0 - } - }, - { - "tick": 20, - "easing": "INOUTQUAD", - "leftArm": { - "y": 2.0 - } - }, - { - "tick": 1, - "easing": "INOUTQUAD", - "leftArm": { - "z": -0.0 - } - }, - { - "tick": 20, - "easing": "INOUTQUAD", - "leftArm": { - "z": -0.0 - } - }, - { - "tick": 1, - "easing": "INOUTQUAD", - "leftArm": { - "pitch": 0.3382392 - } - }, - { - "tick": 20, - "easing": "INOUTQUAD", - "leftArm": { - "pitch": 0.3382392 - } - }, - { - "tick": 1, - "easing": "INOUTQUAD", - "leftArm": { - "yaw": 1.3632238 - } - }, - { - "tick": 20, - "easing": "INOUTQUAD", - "leftArm": { - "yaw": 1.3632238 - } - }, - { - "tick": 1, - "easing": "INOUTQUAD", - "leftArm": { - "roll": -0.035788156 - } - }, - { - "tick": 20, - "easing": "INOUTQUAD", - "leftArm": { - "roll": -0.035788156 - } - }, - { - "tick": 1, - "easing": "INOUTQUAD", - "leftLeg": { - "x": 1.9 - } - }, - { - "tick": 20, - "easing": "INOUTQUAD", - "leftLeg": { - "x": 1.9 - } - }, - { - "tick": 1, - "easing": "INOUTQUAD", - "leftLeg": { - "y": 12.0 - } - }, - { - "tick": 20, - "easing": "INOUTQUAD", - "leftLeg": { - "y": 12.0 - } - }, - { - "tick": 1, - "easing": "INOUTQUAD", - "leftLeg": { - "z": -0.1 - } - }, - { - "tick": 20, - "easing": "INOUTQUAD", - "leftLeg": { - "z": -0.1 - } - }, - { - "tick": 1, - "easing": "INOUTQUAD", - "leftLeg": { - "pitch": 0.03181031 - } - }, - { - "tick": 20, - "easing": "INOUTQUAD", - "leftLeg": { - "pitch": 0.03181031 - } - }, - { - "tick": 1, - "easing": "INOUTQUAD", - "leftLeg": { - "yaw": -0.4517735 - } - }, - { - "tick": 20, - "easing": "INOUTQUAD", - "leftLeg": { - "yaw": -0.4517735 - } - }, - { - "tick": 1, - "easing": "INOUTQUAD", - "leftLeg": { - "roll": -0.07295257 - } - }, - { - "tick": 20, - "easing": "INOUTQUAD", - "leftLeg": { - "roll": -0.07295257 - } - }, - { - "tick": 1, - "easing": "INOUTQUAD", - "body": { - "x": 0.0 - } - }, - { - "tick": 20, - "easing": "INOUTQUAD", - "body": { - "x": 0.0 - } - }, - { - "tick": 1, - "easing": "INOUTQUAD", - "body": { - "y": 0.0 - } - }, - { - "tick": 20, - "easing": "INOUTQUAD", - "body": { - "y": 0.0 - } - }, - { - "tick": 1, - "easing": "INOUTQUAD", - "body": { - "z": -0.0 - } - }, - { - "tick": 20, - "easing": "INOUTQUAD", - "body": { - "z": -0.0 - } - }, - { - "tick": 1, - "easing": "INOUTQUAD", - "body": { - "pitch": 8.1457384E-4 - } - }, - { - "tick": 20, - "easing": "INOUTQUAD", - "body": { - "pitch": 8.1457384E-4 - } - }, - { - "tick": 1, - "easing": "INOUTQUAD", - "body": { - "yaw": -0.5952535 - } - }, - { - "tick": 20, - "easing": "INOUTQUAD", - "body": { - "yaw": -0.5952535 - } - }, - { - "tick": 1, - "easing": "INOUTQUAD", - "body": { - "roll": 0.02491199 - } - }, - { - "tick": 20, - "easing": "INOUTQUAD", - "body": { - "roll": 0.02491199 - } - } - ] - } -} \ No newline at end of file diff --git a/common/src/main/resources/assets/vc_gliders/textures/entity/glider/paraglider_sapphire.png b/common/src/main/resources/assets/vc_gliders/textures/entity/glider/paraglider_sapphire.png deleted file mode 100644 index 65e214147a46f554442ccddb8d439338ab419f6d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2289 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 BG3NjP delta 1705 zcmV;a23GmN4a^OYB!81hL_t(|obBCTNLyDN2k>vYn``{n8mn2cja9ZGtfNh12dgxU zF{JB2oDY2}xCf!or*(ym4a(jIg$>(vg+gHu6G|WYP^1rCkugSAeP|VDXF*D-n^e~5 zwAR(y=yvwt&h||oY$9;5en8Sq4wrGAGnt%1D z-5&_R9|&0TB$qFp0|3lUCYTI5j4eGt>`1FGF)?M_W)L`sR$0As&2hN%(&mlNnyzDZ zbS5PbSSc(FTY7-_jcy?ePMW?nZLkbq5=R) zg5}12i+|6Thr#6h(wdC^COIv% zi7h>Vxe^$x*#%&^p@HRIVKJG^sANpmu_XXvM_PSy7+6d$H+;IrHdhU4bJ?B*&Q2zb z3$WDK^3vSaj>N{4 zTFtg3@baZ|Mq|fsbc)OiI0k^nF#tSH z`F{Wyy*H3`cAm>NZl!zx*r9*Sy`>5z|Fho1hegxPo4(O|1EQoNnDzR>#P~xo_hcG% zuSb1yU+X>o#L`yt zuwn+`7E1L1TCr{5jnLUHkXpW>FiR>Tqt(rw-df!Ut?jQw+#{lp+1^_uDD&yv;g?H{``Pfcsoa=c zG70oJ20(`LJs{-NZyCw^8$wQf+$mn!vlHQ+Rj8_}K+~Izd5y!pw}1P^u(paujOQAYj)prwy00^1i500000NkvXXu0mjfTYXf9 diff --git a/forge/src/main/java/net/venturecraft/gliders/forge/data/BlockTagsProvider.java b/forge/src/main/java/net/venturecraft/gliders/forge/data/BlockTagsProvider.java index 85046f8..d2fc5b9 100644 --- a/forge/src/main/java/net/venturecraft/gliders/forge/data/BlockTagsProvider.java +++ b/forge/src/main/java/net/venturecraft/gliders/forge/data/BlockTagsProvider.java @@ -1,9 +1,9 @@ package net.venturecraft.gliders.forge.data; +import net.minecraft.core.Registry; import net.minecraft.data.DataGenerator; import net.minecraft.tags.TagKey; -import net.minecraft.world.level.block.Block; -import net.minecraft.world.level.block.Blocks; +import net.minecraft.world.level.block.*; import net.minecraftforge.common.data.ExistingFileHelper; import net.venturecraft.gliders.VCGliders; import net.venturecraft.gliders.util.VCGliderTags; @@ -17,7 +17,7 @@ public BlockTagsProvider(DataGenerator arg, @Nullable ExistingFileHelper existin @Override protected void addTags() { - add(VCGliderTags.UPDRAFT_BLOCKS, Blocks.FIRE, Blocks.MAGMA_BLOCK, Blocks.CAMPFIRE, Blocks.SOUL_CAMPFIRE); + add(VCGliderTags.UPDRAFT_BLOCKS, Registry.BLOCK.stream().filter(block -> block instanceof FireBlock || block instanceof CampfireBlock || block == Blocks.MAGMA_BLOCK).toList().toArray(new Block[0])); } public void add(TagKey branch, Block block) { diff --git a/forge/src/main/java/net/venturecraft/gliders/forge/events/ClientEvents.java b/forge/src/main/java/net/venturecraft/gliders/forge/events/ClientEvents.java index f268b94..6e7b2c9 100644 --- a/forge/src/main/java/net/venturecraft/gliders/forge/events/ClientEvents.java +++ b/forge/src/main/java/net/venturecraft/gliders/forge/events/ClientEvents.java @@ -39,6 +39,7 @@ public static void onRenderLevelLast(RenderLevelStageEvent event) { posestack.scale(1.5F, 1.5F, 1.5F); if (GliderItem.isSpaceGlider(stack)) { posestack.translate(0, -0.2, 0); + posestack.mulPose(Vector3f.YP.rotation(180)); PlayerGliderLayer.xWingModel.setupAnim(living, 0, 0, living.tickCount, 0, 0); PlayerGliderLayer.xWingModel.renderToBuffer(posestack, bufferSource.bufferSource().getBuffer(RenderType.entityCutoutNoCull(PlayerGliderLayer.getGliderTexture(stack))), lightLevel, OverlayTexture.NO_OVERLAY, 1, 1, 1, 1); } else {