36.2

Closes #250

build.gradle

@@ -13,7 +13,7 @@ apply plugin: 'net.minecraftforge.gradle'
 apply plugin: 'eclipse'
 apply plugin: 'maven-publish'
 
-version = '36.1'
+version = '36.2'
 group = 'de.ellpeck.naturesaura' // http://maven.apache.org/guides/mini/guide-naming-conventions.html
 archivesBaseName = 'NaturesAura'
 

src/generated/resources/data/curios/tags/items/belt.json

@@ -1,7 +1,7 @@
 {
-    "replace": false,
+  "replace": false,
-    "values": [
+  "values": [
-        "naturesaura:aura_cache",
+    "naturesaura:aura_cache",
-        "naturesaura:aura_trove"
+    "naturesaura:aura_trove"
-    ]
+  ]
 }

src/generated/resources/data/curios/tags/items/charm.json

@@ -1,7 +1,7 @@
 {
-    "replace": false,
+  "replace": false,
-    "values": [
+  "values": [
-        "naturesaura:eye",
+    "naturesaura:eye",
-        "naturesaura:eye_improved"
+    "naturesaura:eye_improved"
-    ]
+  ]
 }

src/generated/resources/data/curios/tags/items/necklace.json

@@ -1,6 +1,6 @@
 {
-    "replace": false,
+  "replace": false,
-    "values": [
+  "values": [
-        "naturesaura:shockwave_creator"
+    "naturesaura:shockwave_creator"
-    ]
+  ]
 }

src/generated/resources/data/curios/tags/items/ring.json

@@ -1,6 +1,6 @@
 {
-    "replace": false,
+  "replace": false,
-    "values": [
+  "values": [
-        "naturesaura:death_ring"
+    "naturesaura:death_ring"
-    ]
+  ]
 }

src/generated/resources/data/forge/tags/blocks/dirt.json

@@ -1,6 +0,0 @@
-{
-    "replace": false,
-    "values": [
-        "naturesaura:nether_grass"
-    ]
-}

src/generated/resources/data/minecraft/tags/blocks/dirt.json

@@ -0,0 +1,6 @@
+{
+  "replace": false,
+  "values": [
+    "naturesaura:nether_grass"
+  ]
+}

src/generated/resources/data/naturesaura/tags/blocks/altar_stone.json

@@ -0,0 +1,6 @@
+{
+  "replace": false,
+  "values": [
+    "#minecraft:stone_bricks"
+  ]
+}

src/generated/resources/data/naturesaura/tags/blocks/altar_wood.json

@@ -0,0 +1,6 @@
+{
+  "replace": false,
+  "values": [
+    "#minecraft:planks"
+  ]
+}

src/generated/resources/data/naturesaura/tags/blocks/nether_altar_stone.json

@@ -0,0 +1,6 @@
+{
+  "replace": false,
+  "values": [
+    "minecraft:nether_bricks"
+  ]
+}

src/main/java/de/ellpeck/naturesaura/blocks/multi/Multiblocks.java

@@ -26,8 +26,8 @@ public final class Multiblocks {
             new ResourceLocation(NaturesAura.MOD_ID, "altar"),
             ALTAR_PATTERN,
             'C', Blocks.CHISELED_STONE_BRICKS,
-            'B', Blocks.STONE_BRICKS,
+            'B', Matcher.tag(Blocks.STONE_BRICKS, BlockTagProvider.ALTAR_STONE),
-            'W', Matcher.tag(Blocks.OAK_PLANKS, BlockTags.PLANKS),
+            'W', Matcher.tag(Blocks.OAK_PLANKS, BlockTagProvider.ALTAR_WOOD),
             'M', ModBlocks.GOLD_BRICK,
             '0', ModBlocks.NATURE_ALTAR,
             ' ', Matcher.wildcard());
@@ -35,7 +35,7 @@ public final class Multiblocks {
             new ResourceLocation(NaturesAura.MOD_ID, "nether_altar"),
             ALTAR_PATTERN,
             'C', Blocks.RED_NETHER_BRICKS,
-            'B', Blocks.NETHER_BRICKS,
+            'B', Matcher.tag(Blocks.NETHER_BRICKS, BlockTagProvider.NETHER_ALTAR_STONE),
             'W', Matcher.tag(Blocks.CRIMSON_PLANKS, BlockTagProvider.NETHER_ALTAR_WOOD),
             'M', ModBlocks.GOLD_NETHER_BRICK,
             '0', ModBlocks.NATURE_ALTAR.defaultBlockState().setValue(BlockNatureAltar.NETHER, true),

src/main/java/de/ellpeck/naturesaura/compat/patchouli/PatchouliCompat.java

@@ -110,7 +110,7 @@ public class PatchouliCompat implements ICompat {
                         event.getMouseX(), event.getMouseY(), gui.getMinecraft().font);
         } else if (now.getMonth() == Month.JUNE) {
             var x = gui.width / 2 + 272 / 2;
-            var y = gui.height / 2 - 180 / 2 + 16;
+            var y = gui.height / 2 + 32;
 
             RenderSystem.setShader(GameRenderer::getPositionTexShader);
             RenderSystem.setShaderTexture(0, ClientEvents.BOOK_GUI);
@@ -118,7 +118,7 @@ public class PatchouliCompat implements ICompat {
 
             if (event.getMouseX() >= x && event.getMouseY() >= y && event.getMouseX() < x + 45 && event.getMouseY() < y + 26)
                 gui.renderComponentTooltip(event.getPoseStack(),
-                        Collections.singletonList(new TextComponent("§6Happy §4P§6r§ei§2d§9e§5!")),
+                        Collections.singletonList(new TextComponent("\u00A76Happy \u00A74P\u00A76r\u00A7ei\u00A72d\u00A79e\u00A75!")),
                         event.getMouseX(), event.getMouseY(), gui.getMinecraft().font);
         }
 

src/main/java/de/ellpeck/naturesaura/data/BlockTagProvider.java

@@ -15,7 +15,10 @@ import org.jetbrains.annotations.Nullable;
 
 public class BlockTagProvider extends BlockTagsProvider {
 
+    public static final TagKey<Block> ALTAR_WOOD = BlockTags.create(new ResourceLocation(NaturesAura.MOD_ID, "altar_wood"));
+    public static final TagKey<Block> ALTAR_STONE = BlockTags.create(new ResourceLocation(NaturesAura.MOD_ID, "altar_stone"));
     public static final TagKey<Block> NETHER_ALTAR_WOOD = BlockTags.create(new ResourceLocation(NaturesAura.MOD_ID, "nether_altar_wood"));
+    public static final TagKey<Block> NETHER_ALTAR_STONE = BlockTags.create(new ResourceLocation(NaturesAura.MOD_ID, "nether_altar_stone"));
 
     public BlockTagProvider(DataGenerator gen, @Nullable ExistingFileHelper existingFileHelper) {
         super(gen, NaturesAura.MOD_ID, existingFileHelper);
@@ -31,6 +34,10 @@ public class BlockTagProvider extends BlockTagsProvider {
         this.tag(BlockTags.SLABS).add(ModBlocks.ANCIENT_SLAB, ModBlocks.INFUSED_SLAB, ModBlocks.INFUSED_BRICK_SLAB);
         this.tag(BlockTags.DIRT).add(ModBlocks.NETHER_GRASS);
         this.tag(BlockTags.SMALL_FLOWERS).add(ModBlocks.END_FLOWER, ModBlocks.AURA_BLOOM);
+        this.tag(ALTAR_WOOD).addTag(BlockTags.PLANKS);
+        this.tag(ALTAR_STONE).addTag(BlockTags.STONE_BRICKS);
         this.tag(NETHER_ALTAR_WOOD).add(Blocks.CRIMSON_PLANKS, Blocks.WARPED_PLANKS);
+        this.tag(NETHER_ALTAR_STONE).add(Blocks.NETHER_BRICKS);
+
     }
 }

src/main/java/de/ellpeck/naturesaura/entities/EntityEffectInhibitor.java

@@ -136,8 +136,8 @@ public class EntityEffectInhibitor extends Entity implements IVisualizable {
     @Override
     public boolean hurt(DamageSource source, float amount) {
         if (source instanceof EntityDamageSource && !this.level.isClientSide) {
-            this.kill();
             this.spawnAtLocation(this.getDrop(), 0F);
+            this.kill();
             return true;
         } else {
             return super.hurt(source, amount);