- Spider Jockeys realized that the skeletons also belong to you and can die properly

- Servers now no longer crash

Author: Deadlydiamond98

common/src/main/java/com/github/teamfusion/summonerscrolls/common/entity/summons/spider/SpiderJockeySummon.java

@@ -14,20 +14,32 @@
 import org.jetbrains.annotations.Nullable;
 
 public class SpiderJockeySummon extends SpiderSummon {
+
+    private SkeletonSummon skeletonSummon;
+
     public SpiderJockeySummon(EntityType<? extends BaseSummonedEntity> entityType, Level level) {
         super(entityType, level);
     }
 
+    @Override
+    public void tick() {
+        if (this.skeletonSummon != null && this.skeletonSummon.getOwnerUUID() != this.getOwnerUUID()) {
+            this.skeletonSummon.setOwnerUUID(getOwnerUUID());
+            this.skeletonSummon.setDespawnDelay(getDespawnDelay());
+        }
+        super.tick();
+    }
+
     @Override
     public @Nullable SpawnGroupData finalizeSpawn(ServerLevelAccessor serverLevelAccessor, DifficultyInstance difficultyInstance, MobSpawnType mobSpawnType, @Nullable SpawnGroupData spawnGroupData, @Nullable CompoundTag compoundTag) {
 
         SkeletonSummon skeleton = SummonerEntityTypes.SKELETON_SUMMON.get().create(this.level());
-        skeleton.setOwnerUUID(getOwnerUUID());
-        skeleton.setDespawnDelay(600);
         skeleton.moveTo(this.getX(), this.getY(), this.getZ(), this.getYRot(), 0);
         skeleton.finalizeSpawn(serverLevelAccessor, difficultyInstance, mobSpawnType, null, null);
         skeleton.startRiding(this);
 
+        this.skeletonSummon = skeleton;
+
         return super.finalizeSpawn(serverLevelAccessor, difficultyInstance, mobSpawnType, spawnGroupData, compoundTag);
     }
 }

common/src/main/java/com/github/teamfusion/summonerscrolls/common/recipe/AnvilScrollRecipe.java

@@ -1,5 +1,6 @@
 package com.github.teamfusion.summonerscrolls.common.recipe;
 
+import com.github.teamfusion.summonerscrolls.SummonerScrolls;
 import com.google.gson.JsonObject;
 import net.minecraft.core.RegistryAccess;
 import net.minecraft.nbt.CompoundTag;
@@ -83,6 +84,7 @@ public static class Serializer implements RecipeSerializer<AnvilScrollRecipe> {
         public static final String ID = "anvil_scroll";
 
         public AnvilScrollRecipe fromJson(ResourceLocation resourceLocation, JsonObject jsonObject) {
+
             Ingredient ingredient = Ingredient.fromJson(GsonHelper.getNonNull(jsonObject, "scroll"));
             Ingredient ingredient2 = Ingredient.fromJson(GsonHelper.getNonNull(jsonObject, "upgrade"));
             ItemStack itemStack = ShapedRecipe.itemStackFromJson(GsonHelper.getAsJsonObject(jsonObject, "result"));
@@ -99,6 +101,7 @@ public AnvilScrollRecipe fromNetwork(ResourceLocation resourceLocation, Friendly
         }
 
         public void toNetwork(FriendlyByteBuf friendlyByteBuf, AnvilScrollRecipe anvilScrollRecipe) {
+
             anvilScrollRecipe.scroll.toNetwork(friendlyByteBuf);
             anvilScrollRecipe.upgrade.toNetwork(friendlyByteBuf);
             friendlyByteBuf.writeItem(anvilScrollRecipe.result);

common/src/main/java/com/github/teamfusion/summonerscrolls/common/registry/SummonerRecipes.java

@@ -19,7 +19,7 @@ public class SummonerRecipes {
 
     public static final Supplier<RecipeSerializer<AnvilScrollRecipe>> ANVIL_SCROLL_SERIALIZER = RECIPE_SERIALIZERS.register(
             AnvilScrollRecipe.Serializer.ID,
-            AnvilScrollRecipe.Serializer::new
+            () -> AnvilScrollRecipe.Serializer.INSTANCE
     );
 
     public static final Supplier<RecipeType<AnvilScrollRecipe>> ANVIL_SCROLL_TYPE =

common/src/main/java/com/github/teamfusion/summonerscrolls/mixin/client/ShulkerBulletRendererMixin.java

@@ -28,7 +28,6 @@
 public class ShulkerBulletRendererMixin {
 
     @Shadow @Final private ShulkerBulletModel<ShulkerBullet> model;
-    @Shadow @Final private static RenderType RENDER_TYPE;
     @Unique
     private static final ResourceLocation SUMMON_TEXTURE = new ResourceLocation(SummonerScrolls.MOD_ID, "textures/entity/projectiles/spark_summon.png");
 

gradle.properties

@@ -6,7 +6,7 @@ enabled_platforms=fabric,forge
 output_datagen=src/main/generated
 
 archives_base_name=summonerscrolls
-mod_version=1.0.1
+mod_version=1.0.2
 maven_group=com.github.teamfusion.summonerscrolls
 
 architectury_version=9.1.12