Holler & Fog

src/generated/resources/.cache/002701d48eee4c36b62b24b011e74b0624793d05

@@ -1,4 +1,4 @@
-// 1.20.1	2024-10-24T15:02:18.4232762	oreganized Block States
+// 1.20.1	2024-10-25T13:00:50.0568446	oreganized Block States
 d85b0fb9e5cad1d9c4f22ed192b0fa621ee3373c assets/oreganized/blockstates/black_crystal_glass.json
 05bb006ff7f48557fe5c5333bc120f7206052717 assets/oreganized/blockstates/black_crystal_glass_pane.json
 5de0c522692198c3b8b01df17d8952035b80c8d9 assets/oreganized/blockstates/black_vigil_candle.json
@@ -9,6 +9,7 @@ d85b0fb9e5cad1d9c4f22ed192b0fa621ee3373c assets/oreganized/blockstates/black_cry
 8f4bdde9fa05052630cd12fb4da9889024377adf assets/oreganized/blockstates/brown_crystal_glass.json
 d59afe9c89ba1e614ce5943fdc8aa3d450585560 assets/oreganized/blockstates/brown_crystal_glass_pane.json
 17e53257c89e754a0e69726cf9311f2c682f3470 assets/oreganized/blockstates/brown_vigil_candle.json
+1bb1418117bc19542ba78cbb66a5fd3d23cac117 assets/oreganized/blockstates/burial_dirt.json
 3c5c1979dfdd7174c48384591f2628f19f75fad1 assets/oreganized/blockstates/chiseled_glance.json
 40088e383637c88f443a53fbafce9ade2ca40ddd assets/oreganized/blockstates/cut_lead.json
 493ed64157b69a2cd174f244e50d75ccec5b7531 assets/oreganized/blockstates/cyan_crystal_glass.json
@@ -228,6 +229,7 @@ d6bb8eb53138bc0091f9e73c3c8990e005b3926b assets/oreganized/models/block/brown_vi
 3a20c447376d131b2691256c961da470ce87a6f9 assets/oreganized/models/block/brown_vigil_candle_triple_ceiling.json
 d02f1462c0da981e9db0433370305d33fef769fa assets/oreganized/models/block/brown_vigil_candle_triple_ceiling_lit.json
 66d2fbfb6ffede8be2d217cb5e169a8e2a0f569d assets/oreganized/models/block/brown_vigil_candle_triple_lit.json
+6333e54a2b61b252d96e4c4f76cf85836e64bacc assets/oreganized/models/block/burial_dirt.json
 4f188c17f6b739d6090b40856dee05dae6b32316 assets/oreganized/models/block/chiseled_glance.json
 a9aeea1dec59b5c1594205bb9bc7034f30f447f0 assets/oreganized/models/block/cut_lead.json
 65035089ce2758727d5b6cbc94c1a51c92ce613d assets/oreganized/models/block/cyan_concrete_powder.json

src/generated/resources/.cache/4d87f6c700406347abbc935fa7e5d5e893a595b5

@@ -1,4 +1,4 @@
-// 1.20.1	2024-10-22T21:24:48.3830539	oreganized Item Models
+// 1.20.1	2024-10-25T13:00:50.0648453	oreganized Item Models
 18fcb236eeab67fa16a0014d9af5ba7dd6f9e7c8 assets/oreganized/models/item/black_crystal_glass.json
 30bbb36792cb2d3f0a8a399f25238120cdf7e659 assets/oreganized/models/item/black_crystal_glass_pane.json
 e79054a9c107cbd9357eebf3aacbcd7c27955b9b assets/oreganized/models/item/black_vigil_candle.json
@@ -9,6 +9,7 @@ b7158c4246d64e83d23470e470f46e2afc0999b1 assets/oreganized/models/item/bone_pile
 ca77522dcfcf982429256fd99ca0e9f2c195bd73 assets/oreganized/models/item/brown_crystal_glass.json
 cc365240dd7450add26aeaf5e0e689e985a4e5ad assets/oreganized/models/item/brown_crystal_glass_pane.json
 5ad09a7c21c27fa1710fd42e043558b61c872912 assets/oreganized/models/item/brown_vigil_candle.json
+daf453ebc13e1d60597b108b0912322efa406712 assets/oreganized/models/item/burial_dirt.json
 87ae9e55b9b93036e2004b186696da47cbc5ca81 assets/oreganized/models/item/bush_hammer.json
 9cb46711c71fcec37eae98916aa50acbe76cf96d assets/oreganized/models/item/chiseled_glance.json
 0873e5720c3f7d81c4ef7e3f3d333e14a87e6757 assets/oreganized/models/item/crossbow_lead_bolt.json

src/generated/resources/.cache/5bb646c3cee204f41a1b59a2c0d9083b5f7155b0

@@ -1,4 +1,4 @@
-// 1.20.1	2024-10-24T15:33:23.489208	Oreganized Block Tags
+// 1.20.1	2024-10-25T13:00:50.065928	Oreganized Block Tags
 7a2d68d81bc5ee59f9a2f4ba68ddb39bfd9c875d data/forge/tags/blocks/glass.json
 d96b4f83e03abe39a1b97d92b7818c8f6b2e5c68 data/forge/tags/blocks/glass_panes.json
 d062c23ad5308b7de0b2e86f6531ea724530f898 data/forge/tags/blocks/melts_lead.json
@@ -40,4 +40,4 @@ eaca08d04b1742f418e6bc0964dd32cf16035d88 data/oreganized/tags/blocks/mineable/sc
 cf3608bd187922aeb48c566c19e8482b0dca34c7 data/oreganized/tags/blocks/prevents_lead_cloud.json
 06c2e2e512966767a31df77e646e41c4c39e3dd3 data/oreganized/tags/blocks/silktouch_using_scribe.json
 3112fb4a1df2953e2c3572fa47f886bf8e5bd679 data/oreganized/tags/blocks/stone_types/glance.json
-d83fef2771b28de02bd241459bd9e94b38482fe9 data/oreganized/tags/blocks/vigil_candles.json
+de4e070ae6815e75f0e299d75ad3557f7660820f data/oreganized/tags/blocks/vigil_candles.json

src/generated/resources/assets/oreganized/blockstates/burial_dirt.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "oreganized:block/burial_dirt"
+    }
+  }
+}

src/generated/resources/assets/oreganized/lang/en_us.json

@@ -34,6 +34,7 @@
   "block.oreganized.brown_crystal_glass": "Brown Crystal Glass",
   "block.oreganized.brown_crystal_glass_pane": "Brown Crystal Glass Pane",
   "block.oreganized.brown_vigil_candle": "Brown Vigil Candle",
+  "block.oreganized.burial_dirt": "Burial Dirt",
   "block.oreganized.chiseled_glance": "Chiseled Glance",
   "block.oreganized.cut_lead": "Cut Lead",
   "block.oreganized.cyan_crystal_glass": "Cyan Crystal Glass",
@@ -135,6 +136,7 @@
   "death.attack.molten_lead": "%1$s refused to let go of the soaring hot metal",
   "effect.oreganized.stunning": "Brain Damage",
   "effect.oreganized.stunning.description": "Paralyzes the victim periodically with random intervals",
+  "entity.oreganized.holler": "Holler",
   "entity.oreganized.lead_bolt": "Lead Bolt",
   "entity.oreganized.shrapnel_bomb": "Shrapnel Bomb",
   "entity.oreganized.shrapnel_bomb_minecart": "Shrapnel Bomb Minecart",

src/generated/resources/assets/oreganized/models/block/burial_dirt.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:block/cube_all",
+  "textures": {
+    "all": "oreganized:block/burial_dirt"
+  }
+}

src/generated/resources/assets/oreganized/models/item/burial_dirt.json

@@ -0,0 +1,3 @@
+{
+  "parent": "oreganized:block/burial_dirt"
+}

src/generated/resources/data/oreganized/loot_tables/blocks/burial_dirt.json

@@ -0,0 +1,58 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "bonus_rolls": 0.0,
+      "entries": [
+        {
+          "type": "minecraft:alternatives",
+          "children": [
+            {
+              "type": "minecraft:item",
+              "conditions": [
+                {
+                  "condition": "minecraft:match_tool",
+                  "predicate": {
+                    "enchantments": [
+                      {
+                        "enchantment": "minecraft:silk_touch",
+                        "levels": {
+                          "min": 1
+                        }
+                      }
+                    ]
+                  }
+                }
+              ],
+              "name": "oreganized:burial_dirt"
+            },
+            {
+              "type": "minecraft:item",
+              "conditions": [
+                {
+                  "condition": "minecraft:inverted",
+                  "term": {
+                    "condition": "minecraft:match_tool",
+                    "predicate": {
+                      "enchantments": [
+                        {
+                          "enchantment": "minecraft:silk_touch",
+                          "levels": {
+                            "min": 1
+                          }
+                        }
+                      ]
+                    }
+                  }
+                }
+              ],
+              "name": "minecraft:dirt"
+            }
+          ]
+        }
+      ],
+      "rolls": 1.0
+    }
+  ],
+  "random_sequence": "oreganized:blocks/burial_dirt"
+}

src/generated/resources/data/oreganized/loot_tables/entities/holler.json

@@ -0,0 +1,4 @@
+{
+  "type": "minecraft:entity",
+  "random_sequence": "oreganized:entities/holler"
+}

src/generated/resources/data/oreganized/tags/blocks/vigil_candles.json

@@ -1,21 +1,21 @@
 {
   "values": [
     "oreganized:vigil_candle",
-    "oreganized:cyan_vigil_candle",
-    "oreganized:brown_vigil_candle",
+    "oreganized:blue_vigil_candle",
+    "oreganized:red_vigil_candle",
     "oreganized:black_vigil_candle",
+    "oreganized:gray_vigil_candle",
+    "oreganized:yellow_vigil_candle",
+    "oreganized:light_gray_vigil_candle",
     "oreganized:green_vigil_candle",
     "oreganized:lime_vigil_candle",
-    "oreganized:magenta_vigil_candle",
-    "oreganized:pink_vigil_candle",
-    "oreganized:blue_vigil_candle",
     "oreganized:light_blue_vigil_candle",
-    "oreganized:orange_vigil_candle",
-    "oreganized:yellow_vigil_candle",
     "oreganized:white_vigil_candle",
-    "oreganized:light_gray_vigil_candle",
-    "oreganized:red_vigil_candle",
+    "oreganized:pink_vigil_candle",
+    "oreganized:orange_vigil_candle",
+    "oreganized:magenta_vigil_candle",
     "oreganized:purple_vigil_candle",
-    "oreganized:gray_vigil_candle"
+    "oreganized:brown_vigil_candle",
+    "oreganized:cyan_vigil_candle"
   ]
 }

src/main/java/galena/oreganized/Oreganized.java

@@ -9,6 +9,7 @@
 import galena.oreganized.compat.supplementaries.AmendmentsCompat;
 import galena.oreganized.content.block.LeadOreBlock;
 import galena.oreganized.content.block.MoltenLeadCauldronBlock;
+import galena.oreganized.content.entity.holler.Holler;
 import galena.oreganized.content.entity.LeadBoltEntity;
 import galena.oreganized.data.OAdvancements;
 import galena.oreganized.data.OBiomeTags;
@@ -53,6 +54,7 @@
 import net.minecraft.server.packs.PackType;
 import net.minecraft.server.packs.metadata.pack.PackMetadataSection;
 import net.minecraft.tags.FluidTags;
+import net.minecraft.world.entity.SpawnPlacements;
 import net.minecraft.world.entity.npc.VillagerProfession;
 import net.minecraft.world.entity.projectile.AbstractArrow;
 import net.minecraft.world.entity.projectile.Projectile;
@@ -69,6 +71,7 @@
 import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.block.DispenserBlock;
 import net.minecraft.world.level.block.FireBlock;
+import net.minecraft.world.level.levelgen.Heightmap;
 import net.minecraft.world.level.levelgen.structure.pools.StructurePoolElement;
 import net.minecraft.world.level.levelgen.structure.pools.StructureTemplatePool;
 import net.minecraftforge.common.BasicItemListing;
@@ -79,6 +82,8 @@
 import net.minecraftforge.common.util.MutableHashedLinkedMap;
 import net.minecraftforge.data.event.GatherDataEvent;
 import net.minecraftforge.event.BuildCreativeModeTabContentsEvent;
+import net.minecraftforge.event.entity.EntityAttributeCreationEvent;
+import net.minecraftforge.event.entity.SpawnPlacementRegisterEvent;
 import net.minecraftforge.event.village.VillagerTradesEvent;
 import net.minecraftforge.eventbus.api.IEventBus;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
@@ -131,6 +136,8 @@ public Oreganized() {
         modBus.addListener(this::clientSetup);
         modBus.addListener(this::gatherData);
         modBus.addListener(this::buildCreativeModeTabContents);
+        modBus.addListener(this::registerAttributes);
+        modBus.addListener(this::registerSpawnPlacements);
         forgeBus.addListener(this::injectVillagerTrades);
 
         LOOT_MODIFIERS.register("add_item", () -> AddItemLootModifier.CODEC);
@@ -171,6 +178,15 @@ public Oreganized() {
         //context.registerConfig(ModConfig.Type.CLIENT, OreganizedConfig.CLIENT_SPEC);
     }
 
+    private void registerAttributes(EntityAttributeCreationEvent event) {
+        event.put(OEntityTypes.HOLLER.get(), Holler.createAttributes().build());
+    }
+
+    private void registerSpawnPlacements(SpawnPlacementRegisterEvent event) {
+        event.register(OEntityTypes.HOLLER.get(), SpawnPlacements.Type.ON_GROUND, Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, Holler::checkHollerSpawnRules, SpawnPlacementRegisterEvent.Operation.REPLACE);
+    }
+
+
     private void injectVillagerTrades(VillagerTradesEvent event) {
         if (event.getType() == VillagerProfession.MASON) {
             event.getTrades().get(5).add(new BasicItemListing(14, new ItemStack(OBlocks.GARGOYLE.get()), 5, 30, 0.05F));
@@ -381,6 +397,7 @@ public void buildCreativeModeTabContents(BuildCreativeModeTabContentsEvent event
             putAfter(entries, Blocks.ICE, OBlocks.GROOVED_ICE);
             putAfter(entries, Blocks.PACKED_ICE, OBlocks.GROOVED_PACKED_ICE);
             putAfter(entries, Blocks.BLUE_ICE, OBlocks.GROOVED_BLUE_ICE);
+            putAfter(entries, Blocks.FARMLAND, OBlocks.BURIAL_DIRT);
             putAfter(entries, Blocks.BONE_BLOCK, OBlocks.BONE_PILE);
         }
         if (tab == CreativeModeTabs.REDSTONE_BLOCKS) {

src/main/java/galena/oreganized/client/OModelLayers.java

@@ -0,0 +1,16 @@
+package galena.oreganized.client;
+
+import com.google.common.collect.Sets;
+import galena.oreganized.Oreganized;
+import net.minecraft.client.model.geom.ModelLayerLocation;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraftforge.api.distmarker.Dist;
+import net.minecraftforge.api.distmarker.OnlyIn;
+
+import java.util.Set;
+
+@OnlyIn(Dist.CLIENT)
+public class OModelLayers {
+
+    public static final ModelLayerLocation HOLLER = new ModelLayerLocation(new ResourceLocation(Oreganized.MOD_ID, "holler"), "main");
+}