Paramaterised boomerang item/entity

ethanicusss · ethanicusss · commit fe92f1a82bef · 2025-04-28T00:52:29.000+01:00
Added curve property
Added shimmerang
diff --git a/src/main/java/com/github/ethanicuss/astraladditions/entities/boomerang/BoomerangEntity.java b/src/main/java/com/github/ethanicuss/astraladditions/entities/boomerang/BoomerangEntity.java
@@ -1,23 +1,31 @@
 package com.github.ethanicuss.astraladditions.entities.boomerang;
 
+import com.github.ethanicuss.astraladditions.AstralAdditions;
 import com.github.ethanicuss.astraladditions.registry.ModItems;
+import net.fabricmc.fabric.api.item.v1.FabricItem;
+import net.fabricmc.fabric.impl.registry.sync.FabricRegistry;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityType;
+import net.minecraft.entity.ItemEntity;
 import net.minecraft.entity.damage.DamageSource;
 import net.minecraft.entity.data.DataTracker;
 import net.minecraft.entity.data.TrackedData;
 import net.minecraft.entity.data.TrackedDataHandlerRegistry;
 import net.minecraft.entity.mob.GhastEntity;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.entity.projectile.thrown.ThrownItemEntity;
+import net.minecraft.inventory.Inventory;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.Items;
 import net.minecraft.particle.ParticleEffect;
 import net.minecraft.particle.ParticleTypes;
+import net.minecraft.util.Identifier;
 import net.minecraft.util.hit.EntityHitResult;
 import net.minecraft.util.hit.HitResult;
 import net.minecraft.util.math.Vec3d;
+import net.minecraft.util.registry.BuiltinRegistries;
+import net.minecraft.util.registry.Registry;
 import net.minecraft.world.World;
 
 import java.util.Objects;
@@ -27,8 +35,12 @@ public class BoomerangEntity extends ThrownItemEntity {
 
     private static final TrackedData<Boolean> HIT = DataTracker.registerData(BoomerangEntity.class, TrackedDataHandlerRegistry.BOOLEAN);
     private static final TrackedData<Integer> AGE = DataTracker.registerData(BoomerangEntity.class, TrackedDataHandlerRegistry.INTEGER);
+    private static final TrackedData<Float> DAMAGE = DataTracker.registerData(BoomerangEntity.class, TrackedDataHandlerRegistry.FLOAT);
     private static final TrackedData<Integer> MAX_AGE = DataTracker.registerData(BoomerangEntity.class, TrackedDataHandlerRegistry.INTEGER);
+    private static final TrackedData<Float> SPEED = DataTracker.registerData(BoomerangEntity.class, TrackedDataHandlerRegistry.FLOAT);
+    private static final TrackedData<Float> CURVE = DataTracker.registerData(BoomerangEntity.class, TrackedDataHandlerRegistry.FLOAT);
     private static final TrackedData<String> OWNER = DataTracker.registerData(BoomerangEntity.class, TrackedDataHandlerRegistry.STRING);
+    private static final TrackedData<String> ITEM = DataTracker.registerData(BoomerangEntity.class, TrackedDataHandlerRegistry.STRING);
 
     public BoomerangEntity(EntityType<? extends Entity> entityType, World world) {
         super((EntityType<? extends ThrownItemEntity>)entityType, world);
@@ -56,14 +68,32 @@ public void handleStatus(byte status) {
     public void setOwner(String UUID){
         this.getDataTracker().set(OWNER, UUID);
     }
+    public void setRangItem(String rangItem){
+        this.getDataTracker().set(ITEM, rangItem);
+    }
+    public ItemStack getRangItem(){
+        return Registry.ITEM.get(new Identifier(AstralAdditions.MOD_ID, this.dataTracker.get(ITEM))).getDefaultStack();
+    }
+    public void setMaxAge(int maxAge){
+        this.getDataTracker().set(MAX_AGE, maxAge);
+    }
+    public void setRangDamage(float damage){
+        this.getDataTracker().set(DAMAGE, damage);
+    }
+    public void setRangSpeed(float speed){
+        this.getDataTracker().set(SPEED, speed);
+    }
+    public void setCurve(float curve){
+        this.getDataTracker().set(CURVE, curve);
+    }
 
     @Override
     public void tick() {
         if (this.getDataTracker().get(HIT)) {
             if (!Objects.equals(this.getDataTracker().get(OWNER), "")) {
                 PlayerEntity p = world.getPlayerByUuid(UUID.fromString(this.getDataTracker().get(OWNER)));
                 if (p != null){
-                    double strength = 2.5;
+                    double strength = this.getDataTracker().get(SPEED)+0.5f;
                     double xdiff = this.getX() - p.getX();
                     double zdiff = this.getZ() - p.getZ();
                     double dist;
@@ -96,18 +126,23 @@ public void tick() {
             }
         }
         else{
-            this.getDataTracker().set(AGE, this.getDataTracker().get(AGE)+1);
+            float xspeed = (float)this.getVelocity().getX();
+            float yspeed = (float)this.getVelocity().getZ();
+            float angle = (float)(Math.toDegrees(Math.atan(xspeed/yspeed))) - this.getDataTracker().get(CURVE);
+            if (yspeed < 0){angle += 180; System.out.println("brah");}
+            this.setVelocity(Math.sqrt(Math.pow(xspeed, 2)+Math.pow(yspeed, 2))*Math.sin(Math.toRadians(angle)), (float)this.getVelocity().getY(), Math.sqrt(Math.pow(xspeed, 2)+Math.pow(yspeed, 2))*Math.cos(Math.toRadians(angle)));
             if (this.getDataTracker().get(AGE) > this.getDataTracker().get(MAX_AGE)){
                 this.getDataTracker().set(HIT, true);
             }
         }
         if (this.getDataTracker().get(AGE) > this.getDataTracker().get(MAX_AGE)*3){
             PlayerEntity p = world.getPlayerByUuid(UUID.fromString(this.getDataTracker().get(OWNER)));
             if (p != null){
-                p.giveItemStack(ModItems.DIAMOND_BOOMER.getDefaultStack());
+                world.spawnEntity(new ItemEntity(world, p.getX(), p.getY() + 1, p.getZ(), this.getRangItem()));
                 this.discard();
             }
         }
+        this.getDataTracker().set(AGE, this.getDataTracker().get(AGE)+1);
         super.tick();
     }
 
@@ -116,13 +151,20 @@ protected void onEntityHit(EntityHitResult entityHitResult) {
         super.onEntityHit(entityHitResult);
         Entity entity = entityHitResult.getEntity();
         if (!Objects.equals(entity.getUuidAsString(), this.getDataTracker().get(OWNER))) {
-            entity.damage(DamageSource.thrownProjectile(this, this.getOwner()), 6);
-            entity.addVelocity(0.0f, 0.3f, 0.0f);
+            entity.damage(DamageSource.thrownProjectile(this, this.getOwner()), this.getDataTracker().get(DAMAGE));
+            entity.addVelocity(0.0f, 0.01f*this.getDataTracker().get(SPEED), 0.0f);
         }
         else{
             PlayerEntity p = world.getPlayerByUuid(UUID.fromString(this.getDataTracker().get(OWNER)));
             if (p != null){
-                p.giveItemStack(ModItems.DIAMOND_BOOMER.getDefaultStack());
+                ItemStack i = this.getRangItem();
+                if (i != null) {
+                    if (p.getInventory().getStack(p.getInventory().selectedSlot).isEmpty()) {
+                        p.getInventory().setStack(p.getInventory().selectedSlot, i);
+                    } else {
+                        world.spawnEntity(new ItemEntity(world, p.getX(), p.getY() + 1, p.getZ(), i));
+                    }
+                }
                 this.discard();
             }
         }
@@ -144,6 +186,10 @@ protected void initDataTracker() {
         this.dataTracker.startTracking(HIT, false);
         this.dataTracker.startTracking(OWNER, "");
         this.dataTracker.startTracking(AGE, 0);
+        this.dataTracker.startTracking(DAMAGE, 1.0f);
         this.dataTracker.startTracking(MAX_AGE, 8);
+        this.dataTracker.startTracking(SPEED, 1.0f);
+        this.dataTracker.startTracking(CURVE, 0.0f);
+        this.dataTracker.startTracking(ITEM, "minecraft:dirt");
     }
 }
diff --git a/src/main/java/com/github/ethanicuss/astraladditions/entities/boomerang/BoomerangEntityRenderer.java b/src/main/java/com/github/ethanicuss/astraladditions/entities/boomerang/BoomerangEntityRenderer.java
@@ -4,13 +4,17 @@
 import com.github.ethanicuss.astraladditions.entities.cometball.CometballEntity;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
+import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.render.OverlayTexture;
 import net.minecraft.client.render.RenderLayer;
 import net.minecraft.client.render.VertexConsumer;
 import net.minecraft.client.render.VertexConsumerProvider;
 import net.minecraft.client.render.entity.EntityRenderer;
 import net.minecraft.client.render.entity.EntityRendererFactory;
+import net.minecraft.client.render.model.json.ModelTransformation;
 import net.minecraft.client.util.math.MatrixStack;
+import net.minecraft.item.ItemStack;
+import net.minecraft.item.Items;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Matrix3f;
@@ -20,7 +24,7 @@
 @Environment(value= EnvType.CLIENT)
 public class BoomerangEntityRenderer
         extends EntityRenderer<BoomerangEntity> {
-    private static final Identifier TEXTURE = new Identifier(AstralAdditions.MOD_ID, "textures/entity/cometball/cometball.png");
+    private static final Identifier TEXTURE = new Identifier(AstralAdditions.MOD_ID, "textures/item/fragile_item.png");
     private static RenderLayer LAYER = RenderLayer.getEntityCutoutNoCull(TEXTURE);
 
     public BoomerangEntityRenderer(EntityRendererFactory.Context context) {
@@ -33,8 +37,8 @@ protected int getBlockLight(BoomerangEntity dragonFireballEntity, BlockPos block
     }
 
     @Override
-    public void render(BoomerangEntity dragonFireballEntity, float f, float g, MatrixStack matrixStack, VertexConsumerProvider vertexConsumerProvider, int i) {
-        matrixStack.push();
+    public void render(BoomerangEntity entity, float f, float g, MatrixStack matrixStack, VertexConsumerProvider vertexConsumerProvider, int i) {
+        /*matrixStack.push();
         matrixStack.scale(1.0f, 1.0f, 1.0f);
         matrixStack.multiply(this.dispatcher.getRotation());
         matrixStack.multiply(Vec3f.POSITIVE_Y.getDegreesQuaternion(180.0f));
@@ -47,7 +51,17 @@ public void render(BoomerangEntity dragonFireballEntity, float f, float g, Matri
         produceVertex(vertexConsumer, matrix4f, matrix3f, i, 1.0f, 1, 1, 0);
         produceVertex(vertexConsumer, matrix4f, matrix3f, i, 0.0f, 1, 0, 0);
         matrixStack.pop();
-        super.render(dragonFireballEntity, f, g, matrixStack, vertexConsumerProvider, i);
+        super.render(dragonFireballEntity, f, g, matrixStack, vertexConsumerProvider, i);*/
+        ItemStack itemStack = entity.getRangItem();
+        if (itemStack != ItemStack.EMPTY || itemStack.isOf(Items.AIR)) {
+            matrixStack.push();
+            matrixStack.translate(0.0, -0.1, 0.0);
+            matrixStack.multiply(Vec3f.POSITIVE_Y.getDegreesQuaternion((entity.getWorld().getTime())*20));
+            matrixStack.multiply(Vec3f.POSITIVE_X.getDegreesQuaternion(90));
+            matrixStack.scale(1.5f, 1.0f, 1.5f);
+            MinecraftClient.getInstance().getItemRenderer().renderItem(itemStack, ModelTransformation.Mode.FIXED, i, 0, matrixStack, vertexConsumerProvider, 0);
+            matrixStack.pop();
+        }
     }
 
     private static void produceVertex(VertexConsumer vertexConsumer, Matrix4f positionMatrix, Matrix3f normalMatrix, int light, float x, int y, int textureU, int textureV) {
diff --git a/src/main/java/com/github/ethanicuss/astraladditions/items/BoomerangItem.java b/src/main/java/com/github/ethanicuss/astraladditions/items/BoomerangItem.java
@@ -3,25 +3,44 @@
 import com.github.ethanicuss.astraladditions.entities.ModEntities;
 import com.github.ethanicuss.astraladditions.entities.boomerang.BoomerangEntity;
 import com.github.ethanicuss.astraladditions.entities.cometball.CometballEntity;
+import net.minecraft.client.item.TooltipContext;
 import net.minecraft.entity.damage.DamageSource;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NbtCompound;
 import net.minecraft.particle.ParticleTypes;
 import net.minecraft.sound.SoundCategory;
 import net.minecraft.sound.SoundEvents;
 import net.minecraft.stat.Stats;
+import net.minecraft.text.LiteralText;
+import net.minecraft.text.Text;
+import net.minecraft.util.Formatting;
 import net.minecraft.util.Hand;
+import net.minecraft.util.StringHelper;
 import net.minecraft.util.TypedActionResult;
 import net.minecraft.util.math.MathHelper;
 import net.minecraft.util.math.Vec3d;
 import net.minecraft.world.World;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.List;
+import java.util.Objects;
 
 public class BoomerangItem
         extends Item {
 
-    public BoomerangItem(Item.Settings settings) {
+    public int DISTANCE = 0;
+    public float SPEED = 0;
+    public float DAMAGE = 0;
+    public float CURVE = 0;
+
+    public BoomerangItem(Item.Settings settings, float damage, int distance, float speed, float curve) {
         super(settings);
+        this.DAMAGE = damage;
+        this.DISTANCE = distance;
+        this.SPEED = speed;
+        this.CURVE = curve;
     }
 
     @Override
@@ -31,10 +50,15 @@ public TypedActionResult<ItemStack> use(World world, PlayerEntity user, Hand han
         if (!world.isClient) {
             BoomerangEntity snowballEntity = new BoomerangEntity(ModEntities.BOOMERANG, user.getWorld());
             snowballEntity.setOwner(user);
-
             snowballEntity.updatePosition(user.getX(), user.getEyeY(), user.getZ());
-            snowballEntity.setItem(itemStack);
-            snowballEntity.setVelocity(user, user.getPitch(), user.getYaw(), 0.0f, 1.8f, 0.5f);
+
+            snowballEntity.setRangItem(this.asItem().toString());
+            snowballEntity.setRangDamage(this.DAMAGE);
+            snowballEntity.setMaxAge(this.DISTANCE);
+            snowballEntity.setRangSpeed(this.SPEED);
+            snowballEntity.setCurve(this.CURVE);
+            snowballEntity.setVelocity(user, user.getPitch(), user.getYaw()-this.CURVE*5, 0.0f, this.SPEED, 0.5f);
+
             snowballEntity.setOwner(user.getUuidAsString());
             world.spawnEntity(snowballEntity);
         }
@@ -46,4 +70,15 @@ public TypedActionResult<ItemStack> use(World world, PlayerEntity user, Hand han
 
         return TypedActionResult.success(itemStack, world.isClient());
     }
+
+    @Override
+    public void appendTooltip(ItemStack itemStack, @Nullable World world, List<Text> tooltip, TooltipContext context) {
+        if (itemStack.hasNbt()) {
+            NbtCompound nbtCompound = itemStack.getNbt();
+            tooltip.add(new LiteralText("Damage: " + this.DAMAGE).formatted(Formatting.BLUE));
+            tooltip.add(new LiteralText("Speed: " + this.SPEED).formatted(Formatting.BLUE));
+            tooltip.add(new LiteralText("Duration: " + this.DISTANCE).formatted(Formatting.BLUE));
+            tooltip.add(new LiteralText("Curve: " + this.CURVE).formatted(Formatting.BLUE));
+        }
+    }
 }
diff --git a/src/main/java/com/github/ethanicuss/astraladditions/registry/ModItems.java b/src/main/java/com/github/ethanicuss/astraladditions/registry/ModItems.java
@@ -48,7 +48,8 @@ public class ModItems {
     public static final Item CHROMATIC_VACUUM = new ChromaticVacuumItem(new FabricItemSettings().group(ItemGroup.TOOLS).maxCount(1).maxDamage(512));
     public static final Item ASTRAL_HOE = new AstralHoeItem(new FabricItemSettings().group(ItemGroup.COMBAT).maxCount(1).rarity(Rarity.RARE).maxDamage(1536));
     public static final Item SOULSTEAL_DAGGER = new SoulstealDaggerItem(new FabricItemSettings().group(ItemGroup.COMBAT).maxCount(1).rarity(Rarity.RARE).maxDamage(768));
-    public static final Item DIAMOND_BOOMER = new BoomerangItem(new FabricItemSettings().group(ItemGroup.COMBAT).maxCount(4).rarity(Rarity.RARE));
+    public static final Item DIAMOND_BOOMER = new BoomerangItem(new FabricItemSettings().group(ItemGroup.COMBAT).maxCount(1).rarity(Rarity.RARE), 6.0f, 12, 1.2f, 0.0f);
+    public static final Item SHIMMERANG = new BoomerangItem(new FabricItemSettings().group(ItemGroup.COMBAT).maxCount(1).rarity(Rarity.RARE), 8.0f, 8, 2.0f, 5.0f);
     public static void registerItems() {
         Registry.register(Registry.ITEM, new Identifier(AstralAdditions.MOD_ID, "cometball"), COMETBALL);
         Registry.register(Registry.ITEM, new Identifier(AstralAdditions.MOD_ID, "pylon"), PYLON);
@@ -79,6 +80,7 @@ public static void registerItems() {
         Registry.register(Registry.ITEM, new Identifier(AstralAdditions.MOD_ID, "astral_hoe"), ASTRAL_HOE);
         Registry.register(Registry.ITEM, new Identifier(AstralAdditions.MOD_ID, "soulsteal_dagger"), SOULSTEAL_DAGGER);
         Registry.register(Registry.ITEM, new Identifier(AstralAdditions.MOD_ID, "diamond_boomer"), DIAMOND_BOOMER);
+        Registry.register(Registry.ITEM, new Identifier(AstralAdditions.MOD_ID, "shimmerang"), SHIMMERANG);
         addSacrificeItem(AWAKENED_SHIMMER_HEART, ModEntities.SHIMMER_BLAZE);
     }
     private static List<Item> sacrificableItems = new ArrayList<Item>();
diff --git a/src/main/resources/assets/astraladditions/models/item/shimmerang.json b/src/main/resources/assets/astraladditions/models/item/shimmerang.json
diff --git a/src/main/resources/assets/astraladditions/textures/item/shimmerang.png b/src/main/resources/assets/astraladditions/textures/item/shimmerang.png
