From 8a53f20f77ace00eb7f3c55722352db5f9186f43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bruno=20Ryb=C3=A1rsky?= Date: Fri, 2 Aug 2024 20:05:56 +0200 Subject: [PATCH] Fix bug --- build.gradle | 18 ------------------ .../systems/brn/plasticgun/PlasticGun.java | 10 ++++------ .../brn/plasticgun/bullets/BulletEntity.java | 1 - .../brn/plasticgun/companion/ClientEvents.java | 1 - .../brn/plasticgun/effects/StunEffect.java | 1 - .../brn/plasticgun/grenades/GrenadeEntity.java | 2 -- .../java/systems/brn/plasticgun/guns/Gun.java | 1 - .../brn/plasticgun/guns/WeaponShootGoal.java | 5 ----- .../brn/plasticgun/lib/EventHandler.java | 2 -- .../brn/plasticgun/lib/GunComponents.java | 1 - .../java/systems/brn/plasticgun/lib/Util.java | 13 ------------- .../mixins/AbstractSkeletonEntityGunMixin.java | 7 ------- .../plasticgun/mixins/ZombieGrenadeMixin.java | 3 --- .../brn/plasticgun/packets/ModDetect.java | 2 -- .../brn/plasticgun/shurikens/ShurikenItem.java | 1 - .../throwables/ThrowableProjectile.java | 2 -- 16 files changed, 4 insertions(+), 66 deletions(-) diff --git a/build.gradle b/build.gradle index 75273cf..938a882 100644 --- a/build.gradle +++ b/build.gradle @@ -94,24 +94,6 @@ jar { } } -// configure the maven publication -publishing { - publications { - create("mavenJava", MavenPublication) { - artifactId = project.archives_base_name - from components.java - } - } - - // See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing. - repositories { - // Add repositories to publish to here. - // Notice: This block does NOT have the same function as the block in the top level. - // The repositories here will be used for publishing your artifact, not for - // retrieving dependencies. - } -} - loom { accessWidenerPath = file("src/main/resources/plasticgun.accesswidener") } diff --git a/src/main/java/systems/brn/plasticgun/PlasticGun.java b/src/main/java/systems/brn/plasticgun/PlasticGun.java index 484ed9f..b22853e 100644 --- a/src/main/java/systems/brn/plasticgun/PlasticGun.java +++ b/src/main/java/systems/brn/plasticgun/PlasticGun.java @@ -3,7 +3,6 @@ package systems.brn.plasticgun; import eu.pb4.polymer.core.api.entity.PolymerEntityUtils; import eu.pb4.polymer.resourcepack.api.PolymerResourcePackUtils; import net.fabricmc.api.ModInitializer; -import net.fabricmc.fabric.api.entity.event.v1.ServerPlayerEvents; import net.fabricmc.fabric.api.event.lifecycle.v1.ServerEntityEvents; import net.fabricmc.fabric.api.event.lifecycle.v1.ServerTickEvents; import net.fabricmc.fabric.api.event.player.UseItemCallback; @@ -19,7 +18,6 @@ import net.minecraft.registry.Registries; import net.minecraft.registry.Registry; import net.minecraft.registry.entry.RegistryEntry; import net.minecraft.server.network.ServerPlayerEntity; -import net.minecraft.util.Identifier; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import systems.brn.plasticgun.bullets.BulletEntity; @@ -64,13 +62,13 @@ public class PlasticGun implements ModInitializer { public static Map itemGrenadeItemMap; public static Map itemShurikenItemMap; - public static EntityType BULLET_ENTITY_TYPE = Registry.register( + public static final EntityType BULLET_ENTITY_TYPE = Registry.register( Registries.ENTITY_TYPE, id("bullet"), EntityType.Builder.create(BulletEntity::new, SpawnGroup.MISC).build() ); - public static EntityType GRENADE_ENTITY_TYPE = Registry.register( + public static final EntityType GRENADE_ENTITY_TYPE = Registry.register( Registries.ENTITY_TYPE, id("grenade"), EntityType.Builder.create(GrenadeEntity::new, SpawnGroup.MISC).build() @@ -78,13 +76,13 @@ public class PlasticGun implements ModInitializer { public static final ArrayList weaponArmors = new ArrayList<>(); - public static EntityType SHURIKEN_ENTITY_TYPE = Registry.register( + public static final EntityType SHURIKEN_ENTITY_TYPE = Registry.register( Registries.ENTITY_TYPE, id("shuriken"), EntityType.Builder.create(ShurikenEntity::new, SpawnGroup.MISC).build() ); - public static EntityType DAMAGE_TESTER_ENTITY_TYPE = Registry.register( + public static final EntityType DAMAGE_TESTER_ENTITY_TYPE = Registry.register( Registries.ENTITY_TYPE, id("damagetester"), EntityType.Builder.create(DamageTester::new, SpawnGroup.MISC).build() diff --git a/src/main/java/systems/brn/plasticgun/bullets/BulletEntity.java b/src/main/java/systems/brn/plasticgun/bullets/BulletEntity.java index 6ae93ae..c34369e 100644 --- a/src/main/java/systems/brn/plasticgun/bullets/BulletEntity.java +++ b/src/main/java/systems/brn/plasticgun/bullets/BulletEntity.java @@ -16,7 +16,6 @@ import net.minecraft.util.hit.EntityHitResult; import net.minecraft.util.hit.HitResult; import eu.pb4.polymer.core.api.entity.PolymerEntity; import net.minecraft.world.World; -import systems.brn.plasticgun.PlasticGun; import systems.brn.plasticgun.grenades.GrenadeExplosionBehavior; import systems.brn.plasticgun.guns.Gun; import systems.brn.plasticgun.lib.WeaponDamageType; diff --git a/src/main/java/systems/brn/plasticgun/companion/ClientEvents.java b/src/main/java/systems/brn/plasticgun/companion/ClientEvents.java index 836da76..170412f 100644 --- a/src/main/java/systems/brn/plasticgun/companion/ClientEvents.java +++ b/src/main/java/systems/brn/plasticgun/companion/ClientEvents.java @@ -6,7 +6,6 @@ import net.minecraft.client.MinecraftClient; import net.minecraft.client.gui.DrawContext; import net.minecraft.client.network.ClientPlayNetworkHandler; import net.minecraft.client.render.RenderTickCounter; -import net.minecraft.item.ItemStack; import net.minecraft.util.math.ColorHelper; import systems.brn.plasticgun.packets.ModDetect; import systems.brn.plasticgun.packets.Reload; diff --git a/src/main/java/systems/brn/plasticgun/effects/StunEffect.java b/src/main/java/systems/brn/plasticgun/effects/StunEffect.java index d4236fa..0db02be 100644 --- a/src/main/java/systems/brn/plasticgun/effects/StunEffect.java +++ b/src/main/java/systems/brn/plasticgun/effects/StunEffect.java @@ -9,7 +9,6 @@ import net.minecraft.entity.effect.StatusEffects; import net.minecraft.server.network.ServerPlayerEntity; import systems.brn.plasticgun.PlasticGun; -import static systems.brn.plasticgun.PlasticGun.flashbangEffect; import static systems.brn.plasticgun.PlasticGun.stunEffect; public class StunEffect extends StatusEffect implements PolymerStatusEffect { diff --git a/src/main/java/systems/brn/plasticgun/grenades/GrenadeEntity.java b/src/main/java/systems/brn/plasticgun/grenades/GrenadeEntity.java index 3f90db2..5b1002a 100644 --- a/src/main/java/systems/brn/plasticgun/grenades/GrenadeEntity.java +++ b/src/main/java/systems/brn/plasticgun/grenades/GrenadeEntity.java @@ -6,7 +6,6 @@ import net.minecraft.entity.EntityType; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.MovementType; import net.minecraft.entity.effect.StatusEffectInstance; -import net.minecraft.entity.effect.StatusEffects; import net.minecraft.item.ItemStack; import net.minecraft.particle.ParticleTypes; import net.minecraft.server.network.ServerPlayerEntity; @@ -14,7 +13,6 @@ import net.minecraft.util.math.Vec3d; import net.minecraft.util.math.random.Random; import net.minecraft.server.world.ServerWorld; import net.minecraft.world.World; -import systems.brn.plasticgun.effects.FlashbangEffect; import systems.brn.plasticgun.throwables.ThrowableProjectile; import java.util.List; diff --git a/src/main/java/systems/brn/plasticgun/guns/Gun.java b/src/main/java/systems/brn/plasticgun/guns/Gun.java index 0d73668..7c2b21e 100644 --- a/src/main/java/systems/brn/plasticgun/guns/Gun.java +++ b/src/main/java/systems/brn/plasticgun/guns/Gun.java @@ -3,7 +3,6 @@ package systems.brn.plasticgun.guns; import eu.pb4.polymer.core.api.item.PolymerItem; import net.minecraft.component.DataComponentTypes; import net.minecraft.component.type.LoreComponent; -import net.minecraft.entity.Entity; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.mob.MobEntity; import net.minecraft.entity.player.PlayerEntity; diff --git a/src/main/java/systems/brn/plasticgun/guns/WeaponShootGoal.java b/src/main/java/systems/brn/plasticgun/guns/WeaponShootGoal.java index fdc7515..fc62164 100644 --- a/src/main/java/systems/brn/plasticgun/guns/WeaponShootGoal.java +++ b/src/main/java/systems/brn/plasticgun/guns/WeaponShootGoal.java @@ -12,16 +12,11 @@ import net.minecraft.entity.LivingEntity; import net.minecraft.entity.ai.RangedAttackMob; import net.minecraft.entity.ai.goal.Goal; import net.minecraft.entity.mob.HostileEntity; -import net.minecraft.entity.mob.MobEntity; -import net.minecraft.item.BowItem; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.item.Items; import net.minecraft.server.world.ServerWorld; import net.minecraft.util.Hand; import net.minecraft.util.math.MathHelper; -import static systems.brn.plasticgun.PlasticGun.guns; import static systems.brn.plasticgun.PlasticGun.itemGunMap; import static systems.brn.plasticgun.lib.GunComponents.*; diff --git a/src/main/java/systems/brn/plasticgun/lib/EventHandler.java b/src/main/java/systems/brn/plasticgun/lib/EventHandler.java index 01f0353..f0d9ae4 100644 --- a/src/main/java/systems/brn/plasticgun/lib/EventHandler.java +++ b/src/main/java/systems/brn/plasticgun/lib/EventHandler.java @@ -20,11 +20,9 @@ import net.minecraft.util.TypedActionResult; import net.minecraft.world.World; import systems.brn.plasticgun.grenades.GrenadeEntity; import systems.brn.plasticgun.grenades.GrenadeItem; -import systems.brn.plasticgun.guns.Gun; import systems.brn.plasticgun.packets.ModDetect; import systems.brn.plasticgun.packets.Reload; import systems.brn.plasticgun.packets.Shoot; -import systems.brn.plasticgun.shurikens.ShurikenItem; import java.util.function.Predicate; diff --git a/src/main/java/systems/brn/plasticgun/lib/GunComponents.java b/src/main/java/systems/brn/plasticgun/lib/GunComponents.java index 45e4a55..28eceb2 100644 --- a/src/main/java/systems/brn/plasticgun/lib/GunComponents.java +++ b/src/main/java/systems/brn/plasticgun/lib/GunComponents.java @@ -3,7 +3,6 @@ package systems.brn.plasticgun.lib; import com.mojang.serialization.Codec; import eu.pb4.polymer.core.api.other.PolymerComponent; import net.minecraft.component.ComponentType; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.registry.Registries; import net.minecraft.registry.Registry; diff --git a/src/main/java/systems/brn/plasticgun/lib/Util.java b/src/main/java/systems/brn/plasticgun/lib/Util.java index 3c9ad47..7d9beaf 100644 --- a/src/main/java/systems/brn/plasticgun/lib/Util.java +++ b/src/main/java/systems/brn/plasticgun/lib/Util.java @@ -5,15 +5,11 @@ import dev.emi.trinkets.api.TrinketComponent; import dev.emi.trinkets.api.TrinketInventory; import dev.emi.trinkets.api.TrinketsApi; import eu.pb4.polymer.virtualentity.api.tracker.DisplayTrackedData; -import net.fabricmc.loader.impl.lib.sat4j.core.Vec; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; -import net.minecraft.client.particle.BlockDustParticle; import net.minecraft.client.render.model.json.ModelTransformationMode; import net.minecraft.entity.Entity; import net.minecraft.entity.LivingEntity; -import net.minecraft.entity.attribute.EntityAttributes; -import net.minecraft.entity.damage.DamageSource; import net.minecraft.entity.data.DataTracker; import net.minecraft.entity.decoration.DisplayEntity; import net.minecraft.entity.player.PlayerEntity; @@ -22,11 +18,7 @@ import net.minecraft.inventory.Inventory; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.particle.BlockStateParticleEffect; -import net.minecraft.particle.ParticleEffect; -import net.minecraft.particle.ParticleType; import net.minecraft.particle.ParticleTypes; -import net.minecraft.registry.Registries; -import net.minecraft.registry.tag.BlockTags; import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.server.world.ServerWorld; import net.minecraft.sound.SoundEvents; @@ -44,14 +36,10 @@ import net.minecraft.world.explosion.Explosion; import net.minecraft.world.explosion.ExplosionBehavior; import org.jetbrains.annotations.Nullable; import org.joml.Vector3f; -import systems.brn.plasticgun.PlasticGun; import systems.brn.plasticgun.defence.WeaponArmor; import java.util.*; -import java.util.function.Function; -import static net.minecraft.entity.projectile.AbstractWindChargeEntity.EXPLOSION_BEHAVIOR; -import static net.minecraft.world.explosion.Explosion.getExposure; import static systems.brn.plasticgun.PlasticGun.*; public class Util { @@ -236,7 +224,6 @@ public class Util { case EASY -> 1; case NORMAL -> 2; case HARD -> 3; - default -> 1; }; // Determine the chance to equip a gun diff --git a/src/main/java/systems/brn/plasticgun/mixins/AbstractSkeletonEntityGunMixin.java b/src/main/java/systems/brn/plasticgun/mixins/AbstractSkeletonEntityGunMixin.java index 86c1518..9596ee7 100644 --- a/src/main/java/systems/brn/plasticgun/mixins/AbstractSkeletonEntityGunMixin.java +++ b/src/main/java/systems/brn/plasticgun/mixins/AbstractSkeletonEntityGunMixin.java @@ -2,29 +2,22 @@ package systems.brn.plasticgun.mixins; import net.minecraft.entity.EquipmentSlot; import net.minecraft.entity.ai.goal.BowAttackGoal; -import net.minecraft.entity.ai.goal.GoalSelector; import net.minecraft.entity.ai.goal.MeleeAttackGoal; import net.minecraft.entity.mob.AbstractSkeletonEntity; import net.minecraft.entity.projectile.ProjectileUtil; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.Items; import net.minecraft.item.RangedWeaponItem; -import net.minecraft.util.Hand; import net.minecraft.util.math.random.Random; import net.minecraft.world.Difficulty; import net.minecraft.world.LocalDifficulty; import net.minecraft.world.World; -import org.spongepowered.asm.mixin.Final; 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 org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; -import systems.brn.plasticgun.PlasticGun; -import systems.brn.plasticgun.guns.Gun; import systems.brn.plasticgun.guns.WeaponShootGoal; import static systems.brn.plasticgun.PlasticGun.guns; diff --git a/src/main/java/systems/brn/plasticgun/mixins/ZombieGrenadeMixin.java b/src/main/java/systems/brn/plasticgun/mixins/ZombieGrenadeMixin.java index 216ccc0..2596423 100644 --- a/src/main/java/systems/brn/plasticgun/mixins/ZombieGrenadeMixin.java +++ b/src/main/java/systems/brn/plasticgun/mixins/ZombieGrenadeMixin.java @@ -5,12 +5,10 @@ import net.minecraft.entity.EquipmentSlot; import net.minecraft.entity.damage.DamageSource; import net.minecraft.entity.mob.MobEntity; import net.minecraft.entity.mob.ZombieEntity; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.Items; import net.minecraft.server.world.ServerWorld; import net.minecraft.util.math.random.Random; -import net.minecraft.world.Difficulty; import net.minecraft.world.LocalDifficulty; import net.minecraft.world.World; import org.spongepowered.asm.mixin.Mixin; @@ -18,7 +16,6 @@ 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 systems.brn.plasticgun.PlasticGun; import systems.brn.plasticgun.grenades.GrenadeItem; import java.util.Arrays; diff --git a/src/main/java/systems/brn/plasticgun/packets/ModDetect.java b/src/main/java/systems/brn/plasticgun/packets/ModDetect.java index fa8408d..0270a3e 100644 --- a/src/main/java/systems/brn/plasticgun/packets/ModDetect.java +++ b/src/main/java/systems/brn/plasticgun/packets/ModDetect.java @@ -1,11 +1,9 @@ package systems.brn.plasticgun.packets; -import net.minecraft.network.PacketByteBuf; import net.minecraft.network.RegistryByteBuf; import net.minecraft.network.codec.PacketCodec; import net.minecraft.network.packet.CustomPayload; -import net.minecraft.util.Identifier; import net.minecraft.util.Uuids; import java.util.UUID; diff --git a/src/main/java/systems/brn/plasticgun/shurikens/ShurikenItem.java b/src/main/java/systems/brn/plasticgun/shurikens/ShurikenItem.java index 5199c7a..5e4b75b 100644 --- a/src/main/java/systems/brn/plasticgun/shurikens/ShurikenItem.java +++ b/src/main/java/systems/brn/plasticgun/shurikens/ShurikenItem.java @@ -14,7 +14,6 @@ import net.minecraft.sound.SoundCategory; import net.minecraft.sound.SoundEvents; import net.minecraft.text.Text; import net.minecraft.util.Hand; -import net.minecraft.world.World; import systems.brn.plasticgun.lib.SimpleItem; import java.util.List; diff --git a/src/main/java/systems/brn/plasticgun/throwables/ThrowableProjectile.java b/src/main/java/systems/brn/plasticgun/throwables/ThrowableProjectile.java index 29939eb..f7e4914 100644 --- a/src/main/java/systems/brn/plasticgun/throwables/ThrowableProjectile.java +++ b/src/main/java/systems/brn/plasticgun/throwables/ThrowableProjectile.java @@ -13,8 +13,6 @@ import net.minecraft.world.World; import java.lang.reflect.Method; import java.util.List; -import static systems.brn.plasticgun.PlasticGun.BULLET_ENTITY_TYPE; -import static systems.brn.plasticgun.PlasticGun.clientsWithMod; import static systems.brn.plasticgun.lib.Util.setProjectileData; public class ThrowableProjectile extends PersistentProjectileEntity implements PolymerEntity {