diff --git a/gradle.properties b/gradle.properties index 569f2fa1..362d8c53 100644 --- a/gradle.properties +++ b/gradle.properties @@ -15,6 +15,6 @@ # Dependencies # currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api patchouli_version = 48-FABRIC - fabric_version = 0.29.1+1.16 + fabric_version = 0.29.2+1.16 canvas_version = 1.0.+ rei_version = 5.8.10 \ No newline at end of file diff --git a/src/main/java/ru/betterend/mixin/common/EntityMixin.java b/src/main/java/ru/betterend/mixin/common/EntityMixin.java index 3710312a..f398271c 100644 --- a/src/main/java/ru/betterend/mixin/common/EntityMixin.java +++ b/src/main/java/ru/betterend/mixin/common/EntityMixin.java @@ -8,6 +8,7 @@ import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; +import net.fabricmc.fabric.api.entity.event.v1.ServerEntityWorldChangeEvents; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityType; import net.minecraft.server.world.ServerWorld; @@ -69,10 +70,11 @@ public abstract class EntityMixin implements TeleportingEntity { } this.removed = true; this.world.getProfiler().pop(); - ((ServerWorld) this.world).resetIdleTimeout(); + ((ServerWorld) world).resetIdleTimeout(); destination.resetIdleTimeout(); this.world.getProfiler().pop(); this.beExitPos = null; + ServerEntityWorldChangeEvents.AFTER_ENTITY_CHANGE_WORLD.invoker().afterChangeWorld(Entity.class.cast(this), entity, (ServerWorld) world, (ServerWorld) entity.world); info.setReturnValue(entity); info.cancel(); } diff --git a/src/main/java/ru/betterend/recipe/InfusionRecipes.java b/src/main/java/ru/betterend/recipe/InfusionRecipes.java index b4d3b97e..d7120fec 100644 --- a/src/main/java/ru/betterend/recipe/InfusionRecipes.java +++ b/src/main/java/ru/betterend/recipe/InfusionRecipes.java @@ -348,7 +348,7 @@ public class InfusionRecipes { .setOutput(createEnchantedBook(Enchantments.SILK_TOUCH, 1)) .addCatalyst(0, EndItems.ENCHANTED_PETAL) .addCatalyst(2, Blocks.COBWEB) - .addCatalyst(4, Blocks.COBWEB) + .addCatalyst(4, EndItems.ETERNAL_CRYSTAL) .addCatalyst(6, Blocks.COBWEB) .addCatalyst(1, Items.LAPIS_LAZULI) .addCatalyst(3, Items.LAPIS_LAZULI) diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index f7500c1d..d1cd1e96 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -39,7 +39,7 @@ "depends": { "fabricloader": ">=0.10.0", - "fabric": ">=0.26.0", + "fabric": ">=0.29.0", "minecraft": ">=1.16.3" } }