Merge branch '1.19.x' into 1.19.x-ender-air-bottling-fix

Xplat/src/main/java/vazkii/botania/client/model/TeruTeruBozuModel.java

@@ -42,7 +42,7 @@ public static MeshDefinition createMesh() {
 				PartPose.offsetAndRotation(0.0F, 14.5F, 0.0F, 0.1745F, 0.0F, 0.0F));
 		root.addOrReplaceChild("happy_face", CubeListBuilder.create().texOffs(0, 0)
 				.addBox(-4.0F, -6.0F, -4.0F, 8, 8, 8),
-				PartPose.offsetAndRotation(0.0F, 14.5F, 0.0F, 0.1745F, 0.0F, 0.0F));
+				PartPose.offsetAndRotation(0.0F, 14.5F, 0.0F, -0.1745F, 0.0F, 0.0F));
 		root.addOrReplaceChild("thread", CubeListBuilder.create().texOffs(32, 16)
 				.addBox(-3.0F, 2.0F, -3.0F, 6, 1, 6),
 				PartPose.offset(0.0F, 14.0F, 0.0F));

Xplat/src/main/java/vazkii/botania/data/ItemModelProvider.java

@@ -11,6 +11,7 @@
 import com.google.gson.Gson;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
+import com.google.gson.JsonPrimitive;
 import com.mojang.datafixers.util.Pair;
 
 import net.minecraft.core.Registry;
@@ -466,9 +467,12 @@ private void registerItemBlocks(Set<BlockItem> itemBlocks, BiConsumer<ResourceLo
 
 		takeAll(itemBlocks, BotaniaBlocks.avatar.asItem(), BotaniaBlocks.bellows.asItem(),
 				BotaniaBlocks.brewery.asItem(), BotaniaBlocks.corporeaIndex.asItem(), BotaniaBlocks.gaiaPylon.asItem(),
-				BotaniaBlocks.hourglass.asItem(), BotaniaBlocks.manaPylon.asItem(), BotaniaBlocks.naturaPylon.asItem(), BotaniaBlocks.teruTeruBozu.asItem())
+				BotaniaBlocks.hourglass.asItem(), BotaniaBlocks.manaPylon.asItem(), BotaniaBlocks.naturaPylon.asItem())
 						.forEach(i -> builtinEntity(i, consumer));
 
+		takeAll(itemBlocks, BotaniaBlocks.teruTeruBozu.asItem())
+				.forEach(i -> builtinEntity(i, consumer, 2.5));
+
 		takeAll(itemBlocks, i -> i instanceof MysticalPetalItem).forEach(i -> {
 			ModelTemplates.FLAT_ITEM.create(ModelLocationUtils.getModelLocation(i), TextureMapping.layer0(TextureMapping.getItemTexture(i)), consumer);
 		});
@@ -543,10 +547,22 @@ private void registerItemBlocks(Set<BlockItem> itemBlocks, BiConsumer<ResourceLo
 	private static final JsonElement BUILTIN_ENTITY_DISPLAY = new Gson().fromJson(BUILTIN_ENTITY_DISPLAY_STR, JsonElement.class);
 
 	protected void builtinEntity(Item i, BiConsumer<ResourceLocation, Supplier<JsonElement>> consumer) {
+		builtinEntity(i, consumer, 0.0);
+	}
+
+	protected void builtinEntity(Item i, BiConsumer<ResourceLocation, Supplier<JsonElement>> consumer, double handYOffset) {
+		final JsonElement display;
+		if (handYOffset == 0.0) {
+			display = BUILTIN_ENTITY_DISPLAY;
+		} else {
+			display = BUILTIN_ENTITY_DISPLAY.deepCopy();
+			display.getAsJsonObject().getAsJsonObject("firstperson_righthand")
+					.getAsJsonArray("translation").set(1, new JsonPrimitive(handYOffset));
+		}
 		consumer.accept(ModelLocationUtils.getModelLocation(i), () -> {
 			JsonObject json = new JsonObject();
 			json.addProperty("parent", "minecraft:builtin/entity");
-			json.add("display", BUILTIN_ENTITY_DISPLAY);
+			json.add("display", display);
 			return json;
 		});
 	}

Xplat/src/main/resources/assets/botania/lang/en_us.json

@@ -2309,7 +2309,7 @@
 
   "botania.entry.arcanerose": "Rosa Arcana",
   "botania.tagline.arcanerose": "Mana from experience",
-  "botania.page.arcanerose0": "$(thing)Experience Points$(0) contain a magic of their own. The $(item)Rosa Arcana$(0) can tap into this magic, absorbing the experience of nearby players and turning it into $(thing)Mana$(0).$(p)It can also synthesize mana from experience orbs and enchanted items in the world; however, this method nets you a bit less mana for the same experience.",
+  "botania.page.arcanerose0": "$(thing)Experience Points$(0) contain a magic of their own. The $(item)Rosa Arcana$(0) can tap into this magic, absorbing the experience of nearby players and turning it into $(thing)Mana$(0).$(p)It can also synthesize mana from experience orbs and enchanted items in the world.",
   "botania.page.arcanerose1": "$(o)When this flower is planted, toss a coin$().",
 
   "botania.entry.munchdew": "Munchdew",

web/changelog.md

@@ -20,6 +20,7 @@ and start a new "Upcoming" section.
 
 * Add: The Worldshaper's Sextant can now generate spheres as well (Wormbo)
 * Change: The Worldshaper's Sextant provides more control over the exact shape of circles by having the radius selection snap to the block grind instead of only allowing integers (Wormbo)
+* Fix: Made Teru Teru Bozu truely happy during clear weather again (Wormbo)
 * Fix: Using an empty bottle in the end will not attempt to pick up Ender Air if the player is aiming at a liquid (Wormbo)
 
 ---