Skip to content

Commit ce68c01

Browse files
PssbleTrnglePssbleTrngle
authored
Merge pull request #60 from TeamGalena/tazer-halloween
2 parents 3013247 + 1115241 commit ce68c01

34 files changed

+705
-103
lines changed

‎src/generated/resources/.cache/002701d48eee4c36b62b24b011e74b0624793d05

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// 1.20.1 2024-10-24T15:02:18.4232762 oreganized Block States
1+
// 1.20.1 2024-10-25T13:00:50.0568446 oreganized Block States
22
d85b0fb9e5cad1d9c4f22ed192b0fa621ee3373c assets/oreganized/blockstates/black_crystal_glass.json
33
05bb006ff7f48557fe5c5333bc120f7206052717 assets/oreganized/blockstates/black_crystal_glass_pane.json
44
5de0c522692198c3b8b01df17d8952035b80c8d9 assets/oreganized/blockstates/black_vigil_candle.json
@@ -9,6 +9,7 @@ d85b0fb9e5cad1d9c4f22ed192b0fa621ee3373c assets/oreganized/blockstates/black_cry
99
8f4bdde9fa05052630cd12fb4da9889024377adf assets/oreganized/blockstates/brown_crystal_glass.json
1010
d59afe9c89ba1e614ce5943fdc8aa3d450585560 assets/oreganized/blockstates/brown_crystal_glass_pane.json
1111
17e53257c89e754a0e69726cf9311f2c682f3470 assets/oreganized/blockstates/brown_vigil_candle.json
12+
1bb1418117bc19542ba78cbb66a5fd3d23cac117 assets/oreganized/blockstates/burial_dirt.json
1213
3c5c1979dfdd7174c48384591f2628f19f75fad1 assets/oreganized/blockstates/chiseled_glance.json
1314
40088e383637c88f443a53fbafce9ade2ca40ddd assets/oreganized/blockstates/cut_lead.json
1415
493ed64157b69a2cd174f244e50d75ccec5b7531 assets/oreganized/blockstates/cyan_crystal_glass.json
@@ -228,6 +229,7 @@ d6bb8eb53138bc0091f9e73c3c8990e005b3926b assets/oreganized/models/block/brown_vi
228229
3a20c447376d131b2691256c961da470ce87a6f9 assets/oreganized/models/block/brown_vigil_candle_triple_ceiling.json
229230
d02f1462c0da981e9db0433370305d33fef769fa assets/oreganized/models/block/brown_vigil_candle_triple_ceiling_lit.json
230231
66d2fbfb6ffede8be2d217cb5e169a8e2a0f569d assets/oreganized/models/block/brown_vigil_candle_triple_lit.json
232+
6333e54a2b61b252d96e4c4f76cf85836e64bacc assets/oreganized/models/block/burial_dirt.json
231233
4f188c17f6b739d6090b40856dee05dae6b32316 assets/oreganized/models/block/chiseled_glance.json
232234
a9aeea1dec59b5c1594205bb9bc7034f30f447f0 assets/oreganized/models/block/cut_lead.json
233235
65035089ce2758727d5b6cbc94c1a51c92ce613d assets/oreganized/models/block/cyan_concrete_powder.json

‎src/generated/resources/.cache/4d87f6c700406347abbc935fa7e5d5e893a595b5

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// 1.20.1 2024-10-22T21:24:48.3830539 oreganized Item Models
1+
// 1.20.1 2024-10-25T13:00:50.0648453 oreganized Item Models
22
18fcb236eeab67fa16a0014d9af5ba7dd6f9e7c8 assets/oreganized/models/item/black_crystal_glass.json
33
30bbb36792cb2d3f0a8a399f25238120cdf7e659 assets/oreganized/models/item/black_crystal_glass_pane.json
44
e79054a9c107cbd9357eebf3aacbcd7c27955b9b assets/oreganized/models/item/black_vigil_candle.json
@@ -9,6 +9,7 @@ b7158c4246d64e83d23470e470f46e2afc0999b1 assets/oreganized/models/item/bone_pile
99
ca77522dcfcf982429256fd99ca0e9f2c195bd73 assets/oreganized/models/item/brown_crystal_glass.json
1010
cc365240dd7450add26aeaf5e0e689e985a4e5ad assets/oreganized/models/item/brown_crystal_glass_pane.json
1111
5ad09a7c21c27fa1710fd42e043558b61c872912 assets/oreganized/models/item/brown_vigil_candle.json
12+
daf453ebc13e1d60597b108b0912322efa406712 assets/oreganized/models/item/burial_dirt.json
1213
87ae9e55b9b93036e2004b186696da47cbc5ca81 assets/oreganized/models/item/bush_hammer.json
1314
9cb46711c71fcec37eae98916aa50acbe76cf96d assets/oreganized/models/item/chiseled_glance.json
1415
0873e5720c3f7d81c4ef7e3f3d333e14a87e6757 assets/oreganized/models/item/crossbow_lead_bolt.json

‎src/generated/resources/.cache/5bb646c3cee204f41a1b59a2c0d9083b5f7155b0

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

‎src/generated/resources/.cache/86c4ba3fec62c329e6b7e74d87569e08181a0d37

-53
This file was deleted.

‎src/generated/resources/.cache/940881aeb46562922fcc484940bba42a0d973262

-2
This file was deleted.

‎src/generated/resources/.cache/fab176c00984ff045b6565b8b962718c23b968ec

-3
This file was deleted.

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

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"variants": {
3+
"": {
4+
"model": "oreganized:block/burial_dirt"
5+
}
6+
}
7+
}

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

+2
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
"block.oreganized.brown_crystal_glass": "Brown Crystal Glass",
3535
"block.oreganized.brown_crystal_glass_pane": "Brown Crystal Glass Pane",
3636
"block.oreganized.brown_vigil_candle": "Brown Vigil Candle",
37+
"block.oreganized.burial_dirt": "Burial Dirt",
3738
"block.oreganized.chiseled_glance": "Chiseled Glance",
3839
"block.oreganized.cut_lead": "Cut Lead",
3940
"block.oreganized.cyan_crystal_glass": "Cyan Crystal Glass",
@@ -135,6 +136,7 @@
135136
"death.attack.molten_lead": "%1$s refused to let go of the soaring hot metal",
136137
"effect.oreganized.stunning": "Brain Damage",
137138
"effect.oreganized.stunning.description": "Paralyzes the victim periodically with random intervals",
139+
"entity.oreganized.holler": "Holler",
138140
"entity.oreganized.lead_bolt": "Lead Bolt",
139141
"entity.oreganized.shrapnel_bomb": "Shrapnel Bomb",
140142
"entity.oreganized.shrapnel_bomb_minecart": "Shrapnel Bomb Minecart",

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

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"parent": "minecraft:block/cube_all",
3+
"textures": {
4+
"all": "oreganized:block/burial_dirt"
5+
}
6+
}

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

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"parent": "oreganized:block/burial_dirt"
3+
}

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

+58
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
{
2+
"type": "minecraft:block",
3+
"pools": [
4+
{
5+
"bonus_rolls": 0.0,
6+
"entries": [
7+
{
8+
"type": "minecraft:alternatives",
9+
"children": [
10+
{
11+
"type": "minecraft:item",
12+
"conditions": [
13+
{
14+
"condition": "minecraft:match_tool",
15+
"predicate": {
16+
"enchantments": [
17+
{
18+
"enchantment": "minecraft:silk_touch",
19+
"levels": {
20+
"min": 1
21+
}
22+
}
23+
]
24+
}
25+
}
26+
],
27+
"name": "oreganized:burial_dirt"
28+
},
29+
{
30+
"type": "minecraft:item",
31+
"conditions": [
32+
{
33+
"condition": "minecraft:inverted",
34+
"term": {
35+
"condition": "minecraft:match_tool",
36+
"predicate": {
37+
"enchantments": [
38+
{
39+
"enchantment": "minecraft:silk_touch",
40+
"levels": {
41+
"min": 1
42+
}
43+
}
44+
]
45+
}
46+
}
47+
}
48+
],
49+
"name": "minecraft:dirt"
50+
}
51+
]
52+
}
53+
],
54+
"rolls": 1.0
55+
}
56+
],
57+
"random_sequence": "oreganized:blocks/burial_dirt"
58+
}

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

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"type": "minecraft:entity",
3+
"random_sequence": "oreganized:entities/holler"
4+
}

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

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
{
22
"values": [
33
"oreganized:vigil_candle",
4-
"oreganized:cyan_vigil_candle",
5-
"oreganized:brown_vigil_candle",
4+
"oreganized:blue_vigil_candle",
5+
"oreganized:red_vigil_candle",
66
"oreganized:black_vigil_candle",
7+
"oreganized:gray_vigil_candle",
8+
"oreganized:yellow_vigil_candle",
9+
"oreganized:light_gray_vigil_candle",
710
"oreganized:green_vigil_candle",
811
"oreganized:lime_vigil_candle",
9-
"oreganized:magenta_vigil_candle",
10-
"oreganized:pink_vigil_candle",
11-
"oreganized:blue_vigil_candle",
1212
"oreganized:light_blue_vigil_candle",
13-
"oreganized:orange_vigil_candle",
14-
"oreganized:yellow_vigil_candle",
1513
"oreganized:white_vigil_candle",
16-
"oreganized:light_gray_vigil_candle",
17-
"oreganized:red_vigil_candle",
14+
"oreganized:pink_vigil_candle",
15+
"oreganized:orange_vigil_candle",
16+
"oreganized:magenta_vigil_candle",
1817
"oreganized:purple_vigil_candle",
19-
"oreganized:gray_vigil_candle"
18+
"oreganized:brown_vigil_candle",
19+
"oreganized:cyan_vigil_candle"
2020
]
2121
}

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

+17
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import galena.oreganized.compat.supplementaries.AmendmentsCompat;
1010
import galena.oreganized.content.block.LeadOreBlock;
1111
import galena.oreganized.content.block.MoltenLeadCauldronBlock;
12+
import galena.oreganized.content.entity.holler.Holler;
1213
import galena.oreganized.content.entity.LeadBoltEntity;
1314
import galena.oreganized.data.OAdvancements;
1415
import galena.oreganized.data.OBiomeTags;
@@ -53,6 +54,7 @@
5354
import net.minecraft.server.packs.PackType;
5455
import net.minecraft.server.packs.metadata.pack.PackMetadataSection;
5556
import net.minecraft.tags.FluidTags;
57+
import net.minecraft.world.entity.SpawnPlacements;
5658
import net.minecraft.world.entity.npc.VillagerProfession;
5759
import net.minecraft.world.entity.projectile.AbstractArrow;
5860
import net.minecraft.world.entity.projectile.Projectile;
@@ -69,6 +71,7 @@
6971
import net.minecraft.world.level.block.Blocks;
7072
import net.minecraft.world.level.block.DispenserBlock;
7173
import net.minecraft.world.level.block.FireBlock;
74+
import net.minecraft.world.level.levelgen.Heightmap;
7275
import net.minecraft.world.level.levelgen.structure.pools.StructurePoolElement;
7376
import net.minecraft.world.level.levelgen.structure.pools.StructureTemplatePool;
7477
import net.minecraftforge.common.BasicItemListing;
@@ -79,6 +82,8 @@
7982
import net.minecraftforge.common.util.MutableHashedLinkedMap;
8083
import net.minecraftforge.data.event.GatherDataEvent;
8184
import net.minecraftforge.event.BuildCreativeModeTabContentsEvent;
85+
import net.minecraftforge.event.entity.EntityAttributeCreationEvent;
86+
import net.minecraftforge.event.entity.SpawnPlacementRegisterEvent;
8287
import net.minecraftforge.event.village.VillagerTradesEvent;
8388
import net.minecraftforge.eventbus.api.IEventBus;
8489
import net.minecraftforge.eventbus.api.SubscribeEvent;
@@ -131,6 +136,8 @@ public Oreganized() {
131136
modBus.addListener(this::clientSetup);
132137
modBus.addListener(this::gatherData);
133138
modBus.addListener(this::buildCreativeModeTabContents);
139+
modBus.addListener(this::registerAttributes);
140+
modBus.addListener(this::registerSpawnPlacements);
134141
forgeBus.addListener(this::injectVillagerTrades);
135142

136143
LOOT_MODIFIERS.register("add_item", () -> AddItemLootModifier.CODEC);
@@ -171,6 +178,15 @@ public Oreganized() {
171178
//context.registerConfig(ModConfig.Type.CLIENT, OreganizedConfig.CLIENT_SPEC);
172179
}
173180

181+
private void registerAttributes(EntityAttributeCreationEvent event) {
182+
event.put(OEntityTypes.HOLLER.get(), Holler.createAttributes().build());
183+
}
184+
185+
private void registerSpawnPlacements(SpawnPlacementRegisterEvent event) {
186+
event.register(OEntityTypes.HOLLER.get(), SpawnPlacements.Type.ON_GROUND, Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, Holler::checkHollerSpawnRules, SpawnPlacementRegisterEvent.Operation.REPLACE);
187+
}
188+
189+
174190
private void injectVillagerTrades(VillagerTradesEvent event) {
175191
if (event.getType() == VillagerProfession.MASON) {
176192
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
381397
putAfter(entries, Blocks.ICE, OBlocks.GROOVED_ICE);
382398
putAfter(entries, Blocks.PACKED_ICE, OBlocks.GROOVED_PACKED_ICE);
383399
putAfter(entries, Blocks.BLUE_ICE, OBlocks.GROOVED_BLUE_ICE);
400+
putAfter(entries, Blocks.FARMLAND, OBlocks.BURIAL_DIRT);
384401
putAfter(entries, Blocks.BONE_BLOCK, OBlocks.BONE_PILE);
385402
}
386403
if (tab == CreativeModeTabs.REDSTONE_BLOCKS) {

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

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
package galena.oreganized.client;
2+
3+
import com.google.common.collect.Sets;
4+
import galena.oreganized.Oreganized;
5+
import net.minecraft.client.model.geom.ModelLayerLocation;
6+
import net.minecraft.resources.ResourceLocation;
7+
import net.minecraftforge.api.distmarker.Dist;
8+
import net.minecraftforge.api.distmarker.OnlyIn;
9+
10+
import java.util.Set;
11+
12+
@OnlyIn(Dist.CLIENT)
13+
public class OModelLayers {
14+
15+
public static final ModelLayerLocation HOLLER = new ModelLayerLocation(new ResourceLocation(Oreganized.MOD_ID, "holler"), "main");
16+
}

0 commit comments

Comments
 (0)