Merged 7.0.5 release

Majrusz · Feb 6, 2024 · e8bdc83 · e8bdc83
2 parents 75e8e7a + 6d795ab
commit e8bdc83
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 18 deletions.
diff --git a/changelog.md b/changelog.md
@@ -1 +1,5 @@
-- fixed compatibility crash with Chrysalis (reported by @Paxx3, @ZacGames)
+- fixed random crashes when starting the game (reported by @Kazuya)
+- fixed bug with spawn point features not working properly with Respawn Anchors
+- fixed bug with item damage modifications not working properly (reported by @Camawama)
+- fixed compatibility issue that caused 1 item to be taken from the stack when hitting mobs (reported by @Camawama)
+- optimized spawn point features
diff --git a/common/src/main/java/com/majruszlibrary/level/LevelHelper.java b/common/src/main/java/com/majruszlibrary/level/LevelHelper.java
@@ -62,20 +62,14 @@ public static boolean isMobGriefingEnabled( Level level ) {
 	public static Optional< SpawnPoint > getSpawnPoint( ServerPlayer player ) {
 		BlockPos respawnPosition = player.getRespawnPosition();
 		ServerLevel level = player.server.getLevel( player.getRespawnDimension() );
-		Vec3 position = null;
 		if( level == null ) {
 			return Optional.empty();
 		}
 
+		Vec3 position;
 		if( respawnPosition != null ) {
-			float angle = player.getRespawnAngle();
-			Optional< Vec3 > spawnPosition = Player.findRespawnPositionAndUseSpawnBlock( level, respawnPosition, angle, true, true );
-			if( spawnPosition.isPresent() ) {
-				position = spawnPosition.get();
-			}
-		}
-
-		if( position == null ) {
+			position = AnyPos.from( respawnPosition ).vec3();
+		} else {
 			level = player.server.getLevel( Level.OVERWORLD );
 			position = AnyPos.from( level.getSharedSpawnPos() ).vec3();
 		}
@@ -219,7 +213,11 @@ public SpawnPoint( ServerLevel level, Vec3 position ) {
 		}
 
 		public void teleport( ServerPlayer player ) {
-			player.teleportTo( this.level, this.position.x, this.position.y, this.position.z, player.getYRot(), player.getXRot() );
+			float angle = player.getRespawnAngle();
+			Optional< Vec3 > spawnPosition = Player.findRespawnPositionAndUseSpawnBlock( this.level, AnyPos.from( this.position ).block(), angle, true, true );
+			Vec3 position = spawnPosition.orElse( this.position );
+
+			player.teleportTo( this.level, position.x, position.y, position.z, player.getYRot(), player.getXRot() );
 		}
 	}
 }
diff --git a/common/src/main/java/com/majruszlibrary/mixin/MixinItemStack.java b/common/src/main/java/com/majruszlibrary/mixin/MixinItemStack.java
@@ -31,9 +31,15 @@ public abstract class MixinItemStack {
 	)
 	private void hurt( int damage, RandomSource source, ServerPlayer player, CallbackInfoReturnable< Boolean > callback ) {
 		ItemStack itemStack = ( ItemStack )( Object )this;
-		itemStack.setDamageValue( itemStack.getDamageValue() + Events.dispatch( new OnItemDamaged( player, itemStack, damage ) ).getExtraDamage() );
+		if( !itemStack.isDamageableItem() ) {
+			return;
+		}
 
-		callback.setReturnValue( itemStack.getDamageValue() >= itemStack.getMaxDamage() );
+		int extraDamage = Events.dispatch( new OnItemDamaged( player, itemStack, damage ) ).getExtraDamage();
+		if( extraDamage != 0 ) {
+			itemStack.setDamageValue( itemStack.getDamageValue() + extraDamage );
+			callback.setReturnValue( itemStack.getDamageValue() >= itemStack.getMaxDamage() );
+		}
 	}
 
 	@Inject(

diff --git a/forge/src/main/java/com/majruszlibrary/registry/RegistryForge.java b/forge/src/main/java/com/majruszlibrary/registry/RegistryForge.java
@@ -63,7 +63,7 @@ public < Type > void register( RegistryObject< Type > object ) {
 	@Override
 	public void register( RegistryCallbacks callbacks ) {
 		IEventBus eventBus = FMLJavaModLoadingContext.get().getModEventBus();
-		eventBus.addListener( ( FMLCommonSetupEvent event )->{
+		eventBus.addListener( ( FMLCommonSetupEvent event )->event.enqueueWork( ()->{
 			callbacks.execute( Custom.Advancements.class, IMixinCriteriaTriggers::register );
 			callbacks.execute( Custom.PotionRecipe.class, new Custom.PotionRecipe() {
 				@Override
@@ -86,7 +86,7 @@ public ItemStack getOutput( ItemStack input, ItemStack ingredient ) {
 					} );
 				}
 			} );
-		} );
+		} ) );
 		eventBus.addListener( ( EntityAttributeCreationEvent event )->{
 			callbacks.execute( Custom.Attributes.class, event::put );
 		} );
@@ -102,11 +102,11 @@ public < Type extends Mob > void register( EntityType< Type > entityType, SpawnP
 		} );
 
 		Side.runOnClient( ()->()->{
-			eventBus.addListener( ( final FMLClientSetupEvent event )->{
+			eventBus.addListener( ( final FMLClientSetupEvent event )->event.enqueueWork( ()->{
 				callbacks.execute( Custom.ItemProperties.class, ItemProperties::register );
 				callbacks.execute( Custom.ModelLayers.class, ForgeHooksClient::registerLayerDefinition );
 				callbacks.execute( Custom.Renderers.class, EntityRenderers::register );
-			} );
+			} ) );
 			eventBus.addListener( ( final RegisterParticleProvidersEvent event )->{
 				callbacks.execute( Custom.Particles.class, new CustomParticles( event ) );
 			} );

diff --git a/gradle.properties b/gradle.properties
@@ -7,7 +7,7 @@ minecraft_version=1.20.1
 # Mod
 mod_id=majruszlibrary
 mod_archives_name=majrusz-library
-mod_version=7.0.4
+mod_version=7.0.5
 mod_display_name=Majrusz Library
 mod_description=Library with common code for my other modifications.
 mod_authors=Majrusz