Skip to content

Commit 6af6cf8

Browse files
1 parent 389b281 commit 6af6cf8

File tree

23 files changed

+896
-4
lines changed

23 files changed

+896
-4
lines changed

CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,14 @@
44
Ocean Village now added! Spawns only in deep ocean biomes. Explore the bottom of the sea to see this village's tragic ending!
55
Can be located with Dolphins
66

7+
#### Temples:
8+
Added Taiga Temple! Spawns in most taiga based biomes.
9+
10+
Added Ocean Temple! Spawns only in deep ocean biomes and can be found with Dolphins.
11+
12+
#### Pyramids:
13+
Made many Overworld Pyramids slightly more spaced out on their spawn attempts (slightly more uncommon)
14+
715
#### Bastions:
816
Underground Bastions are now a bit more common
917

src/main/java/com/telepathicgrunt/repurposedstructures/misc/lootmanager/StructureModdedLootImporter.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -165,12 +165,15 @@ private static Map<ResourceLocation, ResourceLocation> createMap() {
165165
tableMap.put(new ResourceLocation(RepurposedStructures.MODID, "chests/temples/soul"), new ResourceLocation("minecraft:chests/nether_bridge"));
166166
tableMap.put(new ResourceLocation(RepurposedStructures.MODID, "chests/temples/warped"), new ResourceLocation("minecraft:chests/nether_bridge"));
167167
tableMap.put(new ResourceLocation(RepurposedStructures.MODID, "chests/temples/wasteland"), new ResourceLocation("minecraft:chests/nether_bridge"));
168+
tableMap.put(new ResourceLocation(RepurposedStructures.MODID, "chests/temples/taiga"), new ResourceLocation("minecraft:chests/jungle_temple"));
169+
tableMap.put(new ResourceLocation(RepurposedStructures.MODID, "chests/temples/ocean"), new ResourceLocation("minecraft:chests/jungle_temple"));
168170
tableMap.put(new ResourceLocation(RepurposedStructures.MODID, "trapped_chests/temples/warped"), new ResourceLocation("minecraft:chests/nether_bridge"));
169171
tableMap.put(new ResourceLocation(RepurposedStructures.MODID, "dispensers/temples/basalt"), new ResourceLocation("minecraft:chests/jungle_temple_dispenser"));
170172
tableMap.put(new ResourceLocation(RepurposedStructures.MODID, "dispensers/temples/crimson"), new ResourceLocation("minecraft:chests/jungle_temple_dispenser"));
171173
tableMap.put(new ResourceLocation(RepurposedStructures.MODID, "dispensers/temples/soul"), new ResourceLocation("minecraft:chests/jungle_temple_dispenser"));
172174
tableMap.put(new ResourceLocation(RepurposedStructures.MODID, "dispensers/temples/warped"), new ResourceLocation("minecraft:chests/jungle_temple_dispenser"));
173175
tableMap.put(new ResourceLocation(RepurposedStructures.MODID, "dispensers/temples/wasteland"), new ResourceLocation("minecraft:chests/jungle_temple_dispenser"));
176+
tableMap.put(new ResourceLocation(RepurposedStructures.MODID, "dispensers/temples/taiga"), new ResourceLocation("minecraft:chests/jungle_temple_dispenser"));
174177

175178
tableMap.put(new ResourceLocation(RepurposedStructures.MODID, "chests/villages/badlands_house"), new ResourceLocation("minecraft:chests/village/village_desert_house"));
176179
tableMap.put(new ResourceLocation(RepurposedStructures.MODID, "chests/villages/birch_house"), new ResourceLocation("minecraft:chests/village/village_plains_house"));

src/main/resources/data/minecraft/tags/worldgen/structure/dolphin_located.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
"replace": false,
33
"values": [
44
"repurposed_structures:pyramid_ocean",
5-
"repurposed_structures:village_ocean"
5+
"repurposed_structures:village_ocean",
6+
"repurposed_structures:temple_ocean"
67
]
78
}

src/main/resources/data/repurposed_structures/advancements/temples.json

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,38 @@
9797
}
9898
]
9999
}
100+
},
101+
"in_temple_taiga": {
102+
"trigger": "minecraft:location",
103+
"conditions": {
104+
"player": [
105+
{
106+
"condition": "minecraft:entity_properties",
107+
"entity": "this",
108+
"predicate": {
109+
"location": {
110+
"structure": "repurposed_structures:temple_taiga"
111+
}
112+
}
113+
}
114+
]
115+
}
116+
},
117+
"in_temple_ocean": {
118+
"trigger": "minecraft:location",
119+
"conditions": {
120+
"player": [
121+
{
122+
"condition": "minecraft:entity_properties",
123+
"entity": "this",
124+
"predicate": {
125+
"location": {
126+
"structure": "repurposed_structures:temple_ocean"
127+
}
128+
}
129+
}
130+
]
131+
}
100132
}
101133
},
102134
"requirements": [
@@ -114,6 +146,12 @@
114146
],
115147
[
116148
"in_temple_nether_wasteland"
149+
],
150+
[
151+
"in_temple_taiga"
152+
],
153+
[
154+
"in_temple_ocean"
117155
]
118156
]
119157
}
Lines changed: 215 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,215 @@
1+
{
2+
"type": "minecraft:chest",
3+
"pools": [
4+
{
5+
"rolls": {
6+
"min": 6.0,
7+
"max": 17.0,
8+
"type": "minecraft:uniform"
9+
},
10+
"entries": [
11+
{
12+
"name": "minecraft:bone",
13+
"type": "minecraft:item",
14+
"weight": 18,
15+
"functions": [
16+
{
17+
"add": false,
18+
"count": {
19+
"type": "minecraft:uniform",
20+
"max": 6.0,
21+
"min": 4.0
22+
},
23+
"function": "minecraft:set_count"
24+
}
25+
]
26+
},
27+
{
28+
"name": "minecraft:clay_ball",
29+
"type": "minecraft:item",
30+
"weight": 15,
31+
"functions": [
32+
{
33+
"add": false,
34+
"count": {
35+
"type": "minecraft:uniform",
36+
"max": 7.0,
37+
"min": 4.0
38+
},
39+
"function": "minecraft:set_count"
40+
}
41+
]
42+
},
43+
{
44+
"name": "minecraft:lapis_lazuli",
45+
"type": "minecraft:item",
46+
"weight": 15,
47+
"functions": [
48+
{
49+
"add": false,
50+
"count": {
51+
"type": "minecraft:uniform",
52+
"max": 7.0,
53+
"min": 3.0
54+
},
55+
"function": "minecraft:set_count"
56+
}
57+
]
58+
},
59+
{
60+
"name": "minecraft:rotten_flesh",
61+
"type": "minecraft:item",
62+
"weight": 14,
63+
"functions": [
64+
{
65+
"add": false,
66+
"count": {
67+
"type": "minecraft:uniform",
68+
"max": 7.0,
69+
"min": 3.0
70+
},
71+
"function": "minecraft:set_count"
72+
}
73+
]
74+
},
75+
{
76+
"name": "minecraft:gold_ingot",
77+
"type": "minecraft:item",
78+
"weight": 10,
79+
"functions": [
80+
{
81+
"add": false,
82+
"count": {
83+
"type": "minecraft:uniform",
84+
"max": 7.0,
85+
"min": 2.0
86+
},
87+
"function": "minecraft:set_count"
88+
}
89+
]
90+
},
91+
{
92+
"name": "minecraft:diamond",
93+
"type": "minecraft:item",
94+
"weight": 3,
95+
"functions": [
96+
{
97+
"add": false,
98+
"count": {
99+
"type": "minecraft:uniform",
100+
"max": 3.0,
101+
"min": 1.0
102+
},
103+
"function": "minecraft:set_count"
104+
}
105+
]
106+
},
107+
{
108+
"type": "minecraft:item",
109+
"name": "minecraft:saddle",
110+
"weight": 3
111+
},
112+
{
113+
"name": "minecraft:emerald",
114+
"type": "minecraft:item",
115+
"weight": 3,
116+
"functions": [
117+
{
118+
"add": false,
119+
"count": {
120+
"type": "minecraft:uniform",
121+
"max": 3.0,
122+
"min": 1.0
123+
},
124+
"function": "minecraft:set_count"
125+
}
126+
]
127+
},
128+
{
129+
"name": "minecraft:scute",
130+
"type": "minecraft:item",
131+
"weight": 1
132+
},
133+
{
134+
"name": "minecraft:iron_horse_armor",
135+
"type": "minecraft:item",
136+
"weight": 1
137+
},
138+
{
139+
"name": "minecraft:golden_horse_armor",
140+
"type": "minecraft:item",
141+
"weight": 1
142+
},
143+
{
144+
"name": "minecraft:diamond_horse_armor",
145+
"type": "minecraft:item",
146+
"weight": 1
147+
},
148+
{
149+
"name": "minecraft:book",
150+
"type": "minecraft:item",
151+
"weight": 1,
152+
"functions": [
153+
{
154+
"function": "minecraft:enchant_with_levels",
155+
"levels": 30.0,
156+
"treasure": true
157+
}
158+
]
159+
}
160+
]
161+
},
162+
{
163+
"rolls": 1,
164+
"entries": [
165+
{
166+
"type": "minecraft:loot_table",
167+
"name": "repurposed_structures:chests/lucky_pool"
168+
}
169+
]
170+
},
171+
{
172+
"rolls": 0,
173+
"bonus_rolls": 1,
174+
"entries": [
175+
{
176+
"type": "minecraft:empty",
177+
"weight": 130
178+
},
179+
{
180+
"name": "minecraft:blue_banner",
181+
"type": "minecraft:item",
182+
"weight": 30,
183+
"functions": [
184+
{
185+
"function":"set_nbt",
186+
"tag":"{BlockEntityTag:{Patterns:[{Pattern:gra,Color:3},{Pattern:gra,Color:9},{Pattern:mc,Color:15},{Pattern:flo,Color:15},{Pattern:flo,Color:15},{Pattern:bri,Color:15},{Pattern:bri,Color:15},{Pattern:bo,Color:3},{Pattern:bo,Color:9},{Pattern:bo,Color:15},{Pattern:moj,Color:14},{Pattern:moj,Color:4}]}}"
187+
}
188+
]
189+
},
190+
{
191+
"name": "minecraft:comparator",
192+
"type": "minecraft:item",
193+
"weight": 10,
194+
"functions": [
195+
{
196+
"function": "minecraft:set_count",
197+
"count": 2
198+
}
199+
]
200+
},
201+
{
202+
"name": "minecraft:target",
203+
"type": "minecraft:item",
204+
"weight": 4,
205+
"functions": [
206+
{
207+
"function": "minecraft:set_count",
208+
"count": 2
209+
}
210+
]
211+
}
212+
]
213+
}
214+
]
215+
}

0 commit comments

Comments
 (0)