diff --git a/build.gradle b/build.gradle index 58bcbe4..673e6f8 100644 --- a/build.gradle +++ b/build.gradle @@ -3,7 +3,7 @@ plugins { id 'eclipse' id 'idea' id 'maven-publish' - id 'net.neoforged.gradle.userdev' version '7.0.145' + id 'net.neoforged.gradle.userdev' version '7.0.165' } tasks.named('wrapper', Wrapper).configure { @@ -74,7 +74,7 @@ runs { // workingDirectory project.file('run-data') systemProperty('gradle.task', 'runData') // Specify the modid for data generation, where to output the resulting resource, and where to look for existing resources. - programArguments.addAll '--mod', project.mod_id, '--all', '--output', file('src/generated/resources/').getAbsolutePath(), '--existing', file('src/main/resources/').getAbsolutePath() + getArguments().addAll '--mod', project.mod_id, '--all', '--output', file('src/generated/resources/').getAbsolutePath(), '--existing', file('src/main/resources/').getAbsolutePath() } } diff --git a/gradle.properties b/gradle.properties index 46655a9..76477df 100644 --- a/gradle.properties +++ b/gradle.properties @@ -16,7 +16,7 @@ minecraft_version=1.21.1 # as they do not follow standard versioning conventions. minecraft_version_range=[1.21,1.22) # The Neo version must agree with the Minecraft version to get a valid artifact -neo_version=21.1.35 +neo_version=21.1.61 # The Neo version range can use any version of Neo as bounds neo_version_range=[21.0.0-beta,) # The loader version range can only use the major version of FML as bounds diff --git a/src/generated/resources/.cache/818caf9537d536e2a9ffeae84514691689356c22 b/src/generated/resources/.cache/818caf9537d536e2a9ffeae84514691689356c22 new file mode 100644 index 0000000..45382fa --- /dev/null +++ b/src/generated/resources/.cache/818caf9537d536e2a9ffeae84514691689356c22 @@ -0,0 +1,2 @@ +// 1.21.1 2024-10-21T20:49:37.2108769 Tags for minecraft:painting_variant mod id leashedplayer +e081a053d7c2f2d3238cf38436185ef23d234505 data/minecraft/tags/painting_variant/placeable.json diff --git a/src/generated/resources/data/minecraft/tags/painting_variant/placeable.json b/src/generated/resources/data/minecraft/tags/painting_variant/placeable.json new file mode 100644 index 0000000..bef65ca --- /dev/null +++ b/src/generated/resources/data/minecraft/tags/painting_variant/placeable.json @@ -0,0 +1,5 @@ +{ + "values": [ + "leashedplayer:group_photo" + ] +} \ No newline at end of file diff --git a/src/main/java/com/r3944realms/leashedplayer/ClientEventHandler.java b/src/main/java/com/r3944realms/leashedplayer/ClientEventHandler.java index b36ed46..5bc9153 100644 --- a/src/main/java/com/r3944realms/leashedplayer/ClientEventHandler.java +++ b/src/main/java/com/r3944realms/leashedplayer/ClientEventHandler.java @@ -2,7 +2,6 @@ package com.r3944realms.leashedplayer; import com.r3944realms.leashedplayer.client.renders.entities.LeashRopeArrowRenderer; import com.r3944realms.leashedplayer.client.renders.entities.SpectralLeashRopeArrowRenderer; -import com.r3944realms.leashedplayer.content.entities.LeashRopeArrow; import com.r3944realms.leashedplayer.content.entities.ModEntityRegister; import com.r3944realms.leashedplayer.content.items.ModItemRegister; import com.r3944realms.leashedplayer.content.items.type.ILeashRopeArrow; diff --git a/src/main/java/com/r3944realms/leashedplayer/client/processBar/IProcessBar.java b/src/main/java/com/r3944realms/leashedplayer/client/processBar/IProcessBar.java index f79bc00..c1462b0 100644 --- a/src/main/java/com/r3944realms/leashedplayer/client/processBar/IProcessBar.java +++ b/src/main/java/com/r3944realms/leashedplayer/client/processBar/IProcessBar.java @@ -1,7 +1,5 @@ package com.r3944realms.leashedplayer.client.processBar; -import java.util.concurrent.CompletableFuture; - /** * 进度条 diff --git a/src/main/java/com/r3944realms/leashedplayer/content/items/ModItemRegister.java b/src/main/java/com/r3944realms/leashedplayer/content/items/ModItemRegister.java index ccc43fd..375c5f3 100644 --- a/src/main/java/com/r3944realms/leashedplayer/content/items/ModItemRegister.java +++ b/src/main/java/com/r3944realms/leashedplayer/content/items/ModItemRegister.java @@ -6,7 +6,6 @@ import com.r3944realms.leashedplayer.content.items.type.SpectralLeashRopeArrowIt import com.r3944realms.leashedplayer.content.items.type.TestItem; import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.world.item.Item; -import net.minecraft.world.item.SpectralArrowItem; import net.neoforged.bus.api.IEventBus; import net.neoforged.neoforge.registries.DeferredRegister; diff --git a/src/main/java/com/r3944realms/leashedplayer/content/items/type/SpectralLeashRopeArrowItem.java b/src/main/java/com/r3944realms/leashedplayer/content/items/type/SpectralLeashRopeArrowItem.java index e05ab4b..bcf7a44 100644 --- a/src/main/java/com/r3944realms/leashedplayer/content/items/type/SpectralLeashRopeArrowItem.java +++ b/src/main/java/com/r3944realms/leashedplayer/content/items/type/SpectralLeashRopeArrowItem.java @@ -7,7 +7,6 @@ import net.minecraft.ChatFormatting; import net.minecraft.core.Direction; import net.minecraft.core.Position; import net.minecraft.network.chat.Component; - import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.entity.projectile.AbstractArrow; import net.minecraft.world.entity.projectile.Projectile; diff --git a/src/main/java/com/r3944realms/leashedplayer/datagen/LanguageAndOtherData/ModLangKeyValue.java b/src/main/java/com/r3944realms/leashedplayer/datagen/LanguageAndOtherData/ModLangKeyValue.java index f8f4275..bb48405 100644 --- a/src/main/java/com/r3944realms/leashedplayer/datagen/LanguageAndOtherData/ModLangKeyValue.java +++ b/src/main/java/com/r3944realms/leashedplayer/datagen/LanguageAndOtherData/ModLangKeyValue.java @@ -6,9 +6,9 @@ import com.r3944realms.leashedplayer.content.entities.ModEntityRegister; import com.r3944realms.leashedplayer.content.gamerules.Server.CreateLeashFenceKnotEntityIfAbsent; import com.r3944realms.leashedplayer.content.gamerules.Server.KeepLeashNotDropTime; import com.r3944realms.leashedplayer.content.gamerules.Server.TeleportWithLeashedPlayers; -import com.r3944realms.leashedplayer.content.items.type.LeashRopeArrowItem; import com.r3944realms.leashedplayer.content.items.ModCreativeTab; import com.r3944realms.leashedplayer.content.items.ModItemRegister; +import com.r3944realms.leashedplayer.content.items.type.LeashRopeArrowItem; import com.r3944realms.leashedplayer.datagen.provider.attributes.ModPaintingVariants; import com.r3944realms.leashedplayer.utils.Enum.LanguageEnum; import com.r3944realms.leashedplayer.utils.Enum.ModPartEnum; diff --git a/src/main/java/com/r3944realms/leashedplayer/mixin/MixinMinecraft.java b/src/main/java/com/r3944realms/leashedplayer/mixin/MixinMinecraft.java new file mode 100644 index 0000000..a56978d --- /dev/null +++ b/src/main/java/com/r3944realms/leashedplayer/mixin/MixinMinecraft.java @@ -0,0 +1,28 @@ +package com.r3944realms.leashedplayer.mixin; + +import net.minecraft.client.Minecraft; +import net.minecraft.client.Options; +import net.minecraft.client.player.LocalPlayer; +import net.minecraft.world.entity.Entity; +import net.minecraft.world.entity.EntityType; +import org.spongepowered.asm.mixin.Final; +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.CallbackInfoReturnable; + +import javax.annotation.Nullable; + +@Mixin(Minecraft.class) +public class MixinMinecraft { + @Shadow @Nullable public LocalPlayer player; + + @Shadow @Final public Options options; + + @Inject(method = "shouldEntityAppearGlowing", at = @At("HEAD"), cancellable = true) + private void shouldEntityAppearGlowing(Entity entity, CallbackInfoReturnable cir) { + cir.setReturnValue(entity.isCurrentlyGlowing() + || player != null && this.player.isSpectator() && options.keySpectatorOutlines.isDown() && entity.getType() == EntityType.PLAYER); + } +} diff --git a/src/main/java/com/r3944realms/leashedplayer/mixin/both/MixinEntity.java b/src/main/java/com/r3944realms/leashedplayer/mixin/both/MixinEntity.java index f4247a1..06b9350 100644 --- a/src/main/java/com/r3944realms/leashedplayer/mixin/both/MixinEntity.java +++ b/src/main/java/com/r3944realms/leashedplayer/mixin/both/MixinEntity.java @@ -29,4 +29,5 @@ public abstract class MixinEntity { } } + } diff --git a/src/main/resources/leashedplayer.mixins.json b/src/main/resources/leashedplayer.mixins.json index aba28ef..cdcaea7 100644 --- a/src/main/resources/leashedplayer.mixins.json +++ b/src/main/resources/leashedplayer.mixins.json @@ -9,6 +9,7 @@ "server.MixinServerGamePacketListenerImpl" ], "client": [ + "MixinMinecraft", "client.MixinEntityRenderer", "client.MixinLevelRenderer", "client.MixinPlayerRenderer"