Merge branch 'Elenterius:mc1.20.1/prod' into mc1.20.1/feat-acid-cauldron

CHANGELOG.md

@@ -1,3 +1,29 @@
+## [8.3.0](https://github.com/Elenterius/Biomancy/compare/1.20.1-v2.8.2.0...1.20.1-v2.8.3.0) (2024-07-01)
+
+
+### Features
+
+* add Korean (South Korean) translation by Mexwell12 ([2521dcf](https://github.com/Elenterius/Biomancy/commit/2521dcf21c354fa87b9416a5a01bba1da0315574))
+
+
+### Bug Fixes
+
+* try to fix StackOverflow caused by Biomancy's ScaleModifier implementation (Pehkui integration) ([712cad0](https://github.com/Elenterius/Biomancy/commit/712cad09c25f4ea86cf3f316fe179bd33dc8d135)), closes [#133](https://github.com/Elenterius/Biomancy/issues/133)
+
+## [8.2.0](https://github.com/Elenterius/Biomancy/compare/1.20.1-v2.8.1.0...1.20.1-v2.8.2.0) (2024-06-17)
+
+
+### Features
+
+* add russian translation by VladYslaV ([a9312a9](https://github.com/Elenterius/Biomancy/commit/a9312a96330f7d2cb4f5741ce0a959ee0d3a37fd))
+
+
+### Bug Fixes
+
+* fix durability display of living armor items ([b72bb72](https://github.com/Elenterius/Biomancy/commit/b72bb72f318a829cfe8f516f4205bee8d44a8b1a))
+* remove ability to stack Caustic Gunblade items ([59483f4](https://github.com/Elenterius/Biomancy/commit/59483f456dbffd0b0256c98780ce8e12c8e86552))
+* remove unintentional fleshtongue obfuscation of Chrysalis error messages ([bc58ba2](https://github.com/Elenterius/Biomancy/commit/bc58ba2e8412be3ff22c83843d39a519d1e30477))
+
 ## [8.1.0](https://github.com/Elenterius/Biomancy/compare/1.20.1-v2.8.0.0...1.20.1-v2.8.1.0) (2024-05-30)
 
 
@@ -168,37 +194,3 @@
 * fix fertilizer not being consumed and converting dirt into the wrong grass block ([9806d3f](https://github.com/Elenterius/Biomancy/commit/9806d3f0aa9237be118e501c6e1988dd5d2edb41))
 * fix missing acid fluid blockstate model file spamming the logs with errors ([d69ecc7](https://github.com/Elenterius/Biomancy/commit/d69ecc75d14bc15e49cc08fc7b0a1ce9f1f6d093))
 
-## [4.3.0](https://github.com/Elenterius/Biomancy/compare/1.20.1-v2.4.2.0...1.20.1-v2.4.3.0) (2024-02-08)
-
-
-### Features
-
-* Add Pirate-speak lingo. ([010f186](https://github.com/Elenterius/Biomancy/commit/010f18649751b49d5f81dbf5b03f75bf551e3905))
-* disable bio-forge recipe progression in the configs by default (temporary measure until progression rework happens) ([80fe7c1](https://github.com/Elenterius/Biomancy/commit/80fe7c14bf82a188eda6d81093b4e81092eb2da7))
-* make 1.20 Items decomposable ([794a2b3](https://github.com/Elenterius/Biomancy/commit/794a2b3cde5b87d8acee1bf4b2ba08904f27ddd7))
-* make Alex's Caves items decomposable ([9cf7c77](https://github.com/Elenterius/Biomancy/commit/9cf7c77f89eee6e1209b44b72bfab2f6ab5c1c88))
-* make Alex's Caves items digestible ([de8d89d](https://github.com/Elenterius/Biomancy/commit/de8d89d7e5e36f334d798e8c8ffb095adb71b63c))
-* make more Alex's Mobs Items decomposable ([af5c0c2](https://github.com/Elenterius/Biomancy/commit/af5c0c2aedeb4fa6893597ace855c528798e22f3))
-* make moss, dripleaves and hanging roots digestible ([1178799](https://github.com/Elenterius/Biomancy/commit/11787999a30be484b56576b99bfd464fc25408cd))
-* make turtle & sniffer egg digestible ([14b29c8](https://github.com/Elenterius/Biomancy/commit/14b29c80def904c63c211f37ccd0dc7feabad7a8))
-
-
-### Bug Fixes
-
-* exclude non-living entities from entity tags ([1584145](https://github.com/Elenterius/Biomancy/commit/1584145de547dc5eaef38018328e1ae819eff0bf))
-
-## [4.2.0](https://github.com/Elenterius/Biomancy/compare/1.20.1-v2.4.1.0...1.20.1-v2.4.2.0) (2024-01-22)
-
-
-### Features
-
-* **injector:** change cancel and clear icons in the wheel menu ([78a2475](https://github.com/Elenterius/Biomancy/commit/78a2475d558ab35d8be40c568ef236f2797f3c40))
-* **injector:** change item label color to white in the wheel menu ([1bc4a00](https://github.com/Elenterius/Biomancy/commit/1bc4a00816a65447469c7e04f775630f12925a26))
-* **injector:** tweak serum colors ([56376a3](https://github.com/Elenterius/Biomancy/commit/56376a393ef39c70212b1abf724bebe013118c68))
-
-
-### Bug Fixes
-
-* **injector:** fix mismatching serum colors between item and injector model ([5bd8d96](https://github.com/Elenterius/Biomancy/commit/5bd8d9684d1db70771365ce0621508744ce43278))
-* **jei:** fix bad text color in the biomancy recipe previews ([08dc86a](https://github.com/Elenterius/Biomancy/commit/08dc86a22a2b873ed3807d16aa94c7f9230601e9))
-

mod_version.json

@@ -1,4 +1,4 @@
 {
   "major": "2",
-  "semantic": "8.1.0"
+  "semantic": "8.3.0"
 }

src/main/java/com/github/elenterius/biomancy/init/ModItems.java

@@ -97,7 +97,7 @@ public final class ModItems {
 	public static final RegistryObject<ExtractorItem> ESSENCE_EXTRACTOR = registerItem("extractor", props -> new ExtractorItem(props.durability(200).rarity(ModRarities.RARE)));
 	public static final RegistryObject<InjectorItem> INJECTOR = registerItem("injector", props -> new InjectorItem(props.durability(200).rarity(ModRarities.RARE)));
 	public static final RegistryObject<RavenousClawsItem> RAVENOUS_CLAWS = registerItem("ravenous_claws", props -> new RavenousClawsItem(ModTiers.BIOFLESH, 3.5f, 4, 250, props.rarity(ModRarities.VERY_RARE)));
-	public static final RegistryObject<CausticGunbladeItem> CAUSTIC_GUNBLADE = registerItem("caustic_gunblade", props -> new CausticGunbladeItem(200, props.rarity(ModRarities.VERY_RARE)));
+	public static final RegistryObject<CausticGunbladeItem> CAUSTIC_GUNBLADE = registerItem("caustic_gunblade", props -> new CausticGunbladeItem(200, props.stacksTo(1).rarity(ModRarities.VERY_RARE)));
 	public static final RegistryObject<DevArmCannonItem> DEV_ARM_CANNON = registerItem("dev_arm_cannon", props -> new DevArmCannonItem(props.stacksTo(1).durability(ModTiers.BIOFLESH.getUses()).rarity(ModRarities.ULTRA_RARE)));
 
 	//# Shield

src/main/java/com/github/elenterius/biomancy/integration/pehkui/PehkuiCompat.java

@@ -52,12 +52,7 @@ public float getScale(LivingEntity livingEntity) {
 
 	}
 
-	private static final ScaleModifier SCALE_MODIFIER = registerScaleModifier("scale", () -> new ScaleModifier() {
-		@Override
-		public float modifyScale(final ScaleData scaleData, float modifiedScale, final float delta) {
-			return SCALE_TYPE.getScaleData(scaleData.getEntity()).getScale(delta) * modifiedScale;
-		}
-	});
+	private static final ScaleModifier SCALE_MODIFIER = registerScaleModifier("scale", () -> new TypedScaleModifier(() -> PehkuiCompat.SCALE_TYPE));
 
 	private static final ScaleType SCALE_TYPE = registerScaleType("size", builder -> builder.affectsDimensions().addDependentModifier(SCALE_MODIFIER));
 

src/main/java/com/github/elenterius/biomancy/item/ChrysalisBlockItem.java

@@ -61,13 +61,13 @@ public InteractionResult interactLivingEntity(ItemStack stack, Player player, Li
 		if (player.level().isClientSide()) return InteractionResult.PASS;
 
 		if (!isEmpty(stack)) {
-			player.displayClientMessage(TextComponentUtil.getMsgText("already_full").withStyle(TextStyles.PRIMORDIAL_RUNES_RED), true);
+			player.displayClientMessage(TextComponentUtil.getFailureMsgText("already_full"), true);
 			return InteractionResult.PASS;
 		}
 
 		boolean isValidTarget = isValidEntity(interactionTarget) && (!MobUtil.isBoss(interactionTarget) || player.isCreative()); // blame creative player if something breaks due to storing boss mobs
 		if (!isValidTarget) {
-			player.displayClientMessage(TextComponentUtil.getMsgText("mob_too_old").withStyle(TextStyles.PRIMORDIAL_RUNES_RED), true);
+			player.displayClientMessage(TextComponentUtil.getFailureMsgText("mob_too_old"), true);
 			return InteractionResult.PASS;
 		}
 

src/main/java/com/github/elenterius/biomancy/item/armor/LivingArmorItem.java

@@ -9,6 +9,7 @@
 import com.google.common.collect.Multimap;
 import net.minecraft.network.chat.Component;
 import net.minecraft.sounds.SoundEvent;
+import net.minecraft.util.Mth;
 import net.minecraft.world.entity.EquipmentSlot;
 import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.entity.SlotAccess;
@@ -103,7 +104,7 @@ protected void playSound(Player player, SoundEvent soundEvent) {
 
 	@Override
 	public boolean isDamageable(ItemStack stack) {
-		return true;
+		return hasNutrients(stack);
 	}
 
 	@Override
@@ -118,12 +119,13 @@ public void setDamage(ItemStack stack, int damage) {
 
 	@Override
 	public int getDamage(ItemStack stack) {
-		return 0;
+		int max = getMaxNutrients(stack);
+		return Mth.clamp(max - getNutrients(stack), 0, max);
 	}
 
 	@Override
 	public int getMaxDamage(ItemStack stack) {
-		return Integer.MAX_VALUE;
+		return getMaxNutrients(stack);
 	}
 
 	@Override

src/main/java/com/github/elenterius/biomancy/item/shield/LivingShieldItem.java

@@ -134,21 +134,6 @@ public boolean isDamageable(ItemStack stack) {
 		return false;
 	}
 
-	@Override
-	public void setDamage(ItemStack stack, int damage) {
-		//do nothing
-	}
-
-	@Override
-	public int getDamage(ItemStack stack) {
-		return 0;
-	}
-
-	@Override
-	public int getMaxDamage(ItemStack stack) {
-		return 0;
-	}
-
 	@Override
 	public boolean canBeDepleted() {
 		return false;