Skip to content

Commit df05e08

Browse files
WaterpickerWaterpicker
committed
Merge branch 'terastal-caves' into 1.7-port
2 parents 3569595 + a78b8af commit df05e08

770 files changed

Lines changed: 7347 additions & 2546 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎build.gradle.kts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ subprojects {
3434
mavenCentral()
3535
mavenLocal()
3636
maven("https://repo1.maven.org/maven2")
37+
maven("https://maven.minecraftforge.net/")
3738
maven("https://jitpack.io")
3839
maven("https://maven.generations.gg/snapshots")
3940
maven("https://maven.generations.gg/releases")

‎common/build.gradle.kts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ dependencies {
2121

2222
// implementation("gg.generations:RareCandy:${project.properties["rareCandy"]}"){isTransitive = false}
2323

24+
modCompileOnly("com.github.glitchfiend:TerraBlender-common:$minecraftVersion-${project.properties["terrablender_version"]}")
2425
modCompileOnly("mcp.mobius.waila:wthit-api:fabric-${project.properties["WTHIT"]}")
2526
modCompileOnly(fileTree(mapOf("dir" to "libs", "include" to "*.jar")))
2627

‎common/src/main/generated/resources/assets/generations_core/blockstates/tera_crystal_block.json‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"variants": {
3+
"": {
4+
"model": "generations_core:block/tera_crystal_block"
5+
}
6+
}
7+
}

‎common/src/main/generated/resources/assets/generations_core/blockstates/tera_infused_deepslate.json‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"variants": {
3+
"": {
4+
"model": "generations_core:block/tera_infused_deepslate"
5+
}
6+
}
7+
}

‎common/src/main/generated/resources/assets/generations_core/blockstates/tera_infused_deepslate_button.json‎

Lines changed: 118 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,118 @@
1+
{
2+
"variants": {
3+
"face=ceiling,facing=east,powered=false": {
4+
"model": "generations_core:block/tera_infused_deepslate_button",
5+
"x": 180,
6+
"y": 270
7+
},
8+
"face=ceiling,facing=east,powered=true": {
9+
"model": "generations_core:block/tera_infused_deepslate_button_pressed",
10+
"x": 180,
11+
"y": 270
12+
},
13+
"face=ceiling,facing=north,powered=false": {
14+
"model": "generations_core:block/tera_infused_deepslate_button",
15+
"x": 180,
16+
"y": 180
17+
},
18+
"face=ceiling,facing=north,powered=true": {
19+
"model": "generations_core:block/tera_infused_deepslate_button_pressed",
20+
"x": 180,
21+
"y": 180
22+
},
23+
"face=ceiling,facing=south,powered=false": {
24+
"model": "generations_core:block/tera_infused_deepslate_button",
25+
"x": 180
26+
},
27+
"face=ceiling,facing=south,powered=true": {
28+
"model": "generations_core:block/tera_infused_deepslate_button_pressed",
29+
"x": 180
30+
},
31+
"face=ceiling,facing=west,powered=false": {
32+
"model": "generations_core:block/tera_infused_deepslate_button",
33+
"x": 180,
34+
"y": 90
35+
},
36+
"face=ceiling,facing=west,powered=true": {
37+
"model": "generations_core:block/tera_infused_deepslate_button_pressed",
38+
"x": 180,
39+
"y": 90
40+
},
41+
"face=floor,facing=east,powered=false": {
42+
"model": "generations_core:block/tera_infused_deepslate_button",
43+
"y": 90
44+
},
45+
"face=floor,facing=east,powered=true": {
46+
"model": "generations_core:block/tera_infused_deepslate_button_pressed",
47+
"y": 90
48+
},
49+
"face=floor,facing=north,powered=false": {
50+
"model": "generations_core:block/tera_infused_deepslate_button"
51+
},
52+
"face=floor,facing=north,powered=true": {
53+
"model": "generations_core:block/tera_infused_deepslate_button_pressed"
54+
},
55+
"face=floor,facing=south,powered=false": {
56+
"model": "generations_core:block/tera_infused_deepslate_button",
57+
"y": 180
58+
},
59+
"face=floor,facing=south,powered=true": {
60+
"model": "generations_core:block/tera_infused_deepslate_button_pressed",
61+
"y": 180
62+
},
63+
"face=floor,facing=west,powered=false": {
64+
"model": "generations_core:block/tera_infused_deepslate_button",
65+
"y": 270
66+
},
67+
"face=floor,facing=west,powered=true": {
68+
"model": "generations_core:block/tera_infused_deepslate_button_pressed",
69+
"y": 270
70+
},
71+
"face=wall,facing=east,powered=false": {
72+
"model": "generations_core:block/tera_infused_deepslate_button",
73+
"uvlock": true,
74+
"x": 90,
75+
"y": 90
76+
},
77+
"face=wall,facing=east,powered=true": {
78+
"model": "generations_core:block/tera_infused_deepslate_button_pressed",
79+
"uvlock": true,
80+
"x": 90,
81+
"y": 90
82+
},
83+
"face=wall,facing=north,powered=false": {
84+
"model": "generations_core:block/tera_infused_deepslate_button",
85+
"uvlock": true,
86+
"x": 90
87+
},
88+
"face=wall,facing=north,powered=true": {
89+
"model": "generations_core:block/tera_infused_deepslate_button_pressed",
90+
"uvlock": true,
91+
"x": 90
92+
},
93+
"face=wall,facing=south,powered=false": {
94+
"model": "generations_core:block/tera_infused_deepslate_button",
95+
"uvlock": true,
96+
"x": 90,
97+
"y": 180
98+
},
99+
"face=wall,facing=south,powered=true": {
100+
"model": "generations_core:block/tera_infused_deepslate_button_pressed",
101+
"uvlock": true,
102+
"x": 90,
103+
"y": 180
104+
},
105+
"face=wall,facing=west,powered=false": {
106+
"model": "generations_core:block/tera_infused_deepslate_button",
107+
"uvlock": true,
108+
"x": 90,
109+
"y": 270
110+
},
111+
"face=wall,facing=west,powered=true": {
112+
"model": "generations_core:block/tera_infused_deepslate_button_pressed",
113+
"uvlock": true,
114+
"x": 90,
115+
"y": 270
116+
}
117+
}
118+
}

‎common/src/main/generated/resources/assets/generations_core/blockstates/tera_infused_deepslate_pressure_plate.json‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
{
2+
"variants": {
3+
"powered=false": {
4+
"model": "generations_core:block/tera_infused_deepslate_pressure_plate"
5+
},
6+
"powered=true": {
7+
"model": "generations_core:block/tera_infused_deepslate_pressure_plate_down"
8+
}
9+
}
10+
}

‎common/src/main/generated/resources/assets/generations_core/blockstates/tera_infused_deepslate_slab.json‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
{
2+
"variants": {
3+
"type=bottom": {
4+
"model": "generations_core:block/tera_infused_deepslate_slab"
5+
},
6+
"type=double": {
7+
"model": "generations_core:block/tera_infused_deepslate"
8+
},
9+
"type=top": {
10+
"model": "generations_core:block/tera_infused_deepslate_slab_top"
11+
}
12+
}
13+
}

‎common/src/main/generated/resources/assets/generations_core/blockstates/tera_infused_deepslate_stairs.json‎

Lines changed: 209 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,209 @@
1+
{
2+
"variants": {
3+
"facing=east,half=bottom,shape=inner_left": {
4+
"model": "generations_core:block/tera_infused_deepslate_stairs_inner",
5+
"uvlock": true,
6+
"y": 270
7+
},
8+
"facing=east,half=bottom,shape=inner_right": {
9+
"model": "generations_core:block/tera_infused_deepslate_stairs_inner"
10+
},
11+
"facing=east,half=bottom,shape=outer_left": {
12+
"model": "generations_core:block/tera_infused_deepslate_stairs_outer",
13+
"uvlock": true,
14+
"y": 270
15+
},
16+
"facing=east,half=bottom,shape=outer_right": {
17+
"model": "generations_core:block/tera_infused_deepslate_stairs_outer"
18+
},
19+
"facing=east,half=bottom,shape=straight": {
20+
"model": "generations_core:block/tera_infused_deepslate_stairs"
21+
},
22+
"facing=east,half=top,shape=inner_left": {
23+
"model": "generations_core:block/tera_infused_deepslate_stairs_inner",
24+
"uvlock": true,
25+
"x": 180
26+
},
27+
"facing=east,half=top,shape=inner_right": {
28+
"model": "generations_core:block/tera_infused_deepslate_stairs_inner",
29+
"uvlock": true,
30+
"x": 180,
31+
"y": 90
32+
},
33+
"facing=east,half=top,shape=outer_left": {
34+
"model": "generations_core:block/tera_infused_deepslate_stairs_outer",
35+
"uvlock": true,
36+
"x": 180
37+
},
38+
"facing=east,half=top,shape=outer_right": {
39+
"model": "generations_core:block/tera_infused_deepslate_stairs_outer",
40+
"uvlock": true,
41+
"x": 180,
42+
"y": 90
43+
},
44+
"facing=east,half=top,shape=straight": {
45+
"model": "generations_core:block/tera_infused_deepslate_stairs",
46+
"uvlock": true,
47+
"x": 180
48+
},
49+
"facing=north,half=bottom,shape=inner_left": {
50+
"model": "generations_core:block/tera_infused_deepslate_stairs_inner",
51+
"uvlock": true,
52+
"y": 180
53+
},
54+
"facing=north,half=bottom,shape=inner_right": {
55+
"model": "generations_core:block/tera_infused_deepslate_stairs_inner",
56+
"uvlock": true,
57+
"y": 270
58+
},
59+
"facing=north,half=bottom,shape=outer_left": {
60+
"model": "generations_core:block/tera_infused_deepslate_stairs_outer",
61+
"uvlock": true,
62+
"y": 180
63+
},
64+
"facing=north,half=bottom,shape=outer_right": {
65+
"model": "generations_core:block/tera_infused_deepslate_stairs_outer",
66+
"uvlock": true,
67+
"y": 270
68+
},
69+
"facing=north,half=bottom,shape=straight": {
70+
"model": "generations_core:block/tera_infused_deepslate_stairs",
71+
"uvlock": true,
72+
"y": 270
73+
},
74+
"facing=north,half=top,shape=inner_left": {
75+
"model": "generations_core:block/tera_infused_deepslate_stairs_inner",
76+
"uvlock": true,
77+
"x": 180,
78+
"y": 270
79+
},
80+
"facing=north,half=top,shape=inner_right": {
81+
"model": "generations_core:block/tera_infused_deepslate_stairs_inner",
82+
"uvlock": true,
83+
"x": 180
84+
},
85+
"facing=north,half=top,shape=outer_left": {
86+
"model": "generations_core:block/tera_infused_deepslate_stairs_outer",
87+
"uvlock": true,
88+
"x": 180,
89+
"y": 270
90+
},
91+
"facing=north,half=top,shape=outer_right": {
92+
"model": "generations_core:block/tera_infused_deepslate_stairs_outer",
93+
"uvlock": true,
94+
"x": 180
95+
},
96+
"facing=north,half=top,shape=straight": {
97+
"model": "generations_core:block/tera_infused_deepslate_stairs",
98+
"uvlock": true,
99+
"x": 180,
100+
"y": 270
101+
},
102+
"facing=south,half=bottom,shape=inner_left": {
103+
"model": "generations_core:block/tera_infused_deepslate_stairs_inner"
104+
},
105+
"facing=south,half=bottom,shape=inner_right": {
106+
"model": "generations_core:block/tera_infused_deepslate_stairs_inner",
107+
"uvlock": true,
108+
"y": 90
109+
},
110+
"facing=south,half=bottom,shape=outer_left": {
111+
"model": "generations_core:block/tera_infused_deepslate_stairs_outer"
112+
},
113+
"facing=south,half=bottom,shape=outer_right": {
114+
"model": "generations_core:block/tera_infused_deepslate_stairs_outer",
115+
"uvlock": true,
116+
"y": 90
117+
},
118+
"facing=south,half=bottom,shape=straight": {
119+
"model": "generations_core:block/tera_infused_deepslate_stairs",
120+
"uvlock": true,
121+
"y": 90
122+
},
123+
"facing=south,half=top,shape=inner_left": {
124+
"model": "generations_core:block/tera_infused_deepslate_stairs_inner",
125+
"uvlock": true,
126+
"x": 180,
127+
"y": 90
128+
},
129+
"facing=south,half=top,shape=inner_right": {
130+
"model": "generations_core:block/tera_infused_deepslate_stairs_inner",
131+
"uvlock": true,
132+
"x": 180,
133+
"y": 180
134+
},
135+
"facing=south,half=top,shape=outer_left": {
136+
"model": "generations_core:block/tera_infused_deepslate_stairs_outer",
137+
"uvlock": true,
138+
"x": 180,
139+
"y": 90
140+
},
141+
"facing=south,half=top,shape=outer_right": {
142+
"model": "generations_core:block/tera_infused_deepslate_stairs_outer",
143+
"uvlock": true,
144+
"x": 180,
145+
"y": 180
146+
},
147+
"facing=south,half=top,shape=straight": {
148+
"model": "generations_core:block/tera_infused_deepslate_stairs",
149+
"uvlock": true,
150+
"x": 180,
151+
"y": 90
152+
},
153+
"facing=west,half=bottom,shape=inner_left": {
154+
"model": "generations_core:block/tera_infused_deepslate_stairs_inner",
155+
"uvlock": true,
156+
"y": 90
157+
},
158+
"facing=west,half=bottom,shape=inner_right": {
159+
"model": "generations_core:block/tera_infused_deepslate_stairs_inner",
160+
"uvlock": true,
161+
"y": 180
162+
},
163+
"facing=west,half=bottom,shape=outer_left": {
164+
"model": "generations_core:block/tera_infused_deepslate_stairs_outer",
165+
"uvlock": true,
166+
"y": 90
167+
},
168+
"facing=west,half=bottom,shape=outer_right": {
169+
"model": "generations_core:block/tera_infused_deepslate_stairs_outer",
170+
"uvlock": true,
171+
"y": 180
172+
},
173+
"facing=west,half=bottom,shape=straight": {
174+
"model": "generations_core:block/tera_infused_deepslate_stairs",
175+
"uvlock": true,
176+
"y": 180
177+
},
178+
"facing=west,half=top,shape=inner_left": {
179+
"model": "generations_core:block/tera_infused_deepslate_stairs_inner",
180+
"uvlock": true,
181+
"x": 180,
182+
"y": 180
183+
},
184+
"facing=west,half=top,shape=inner_right": {
185+
"model": "generations_core:block/tera_infused_deepslate_stairs_inner",
186+
"uvlock": true,
187+
"x": 180,
188+
"y": 270
189+
},
190+
"facing=west,half=top,shape=outer_left": {
191+
"model": "generations_core:block/tera_infused_deepslate_stairs_outer",
192+
"uvlock": true,
193+
"x": 180,
194+
"y": 180
195+
},
196+
"facing=west,half=top,shape=outer_right": {
197+
"model": "generations_core:block/tera_infused_deepslate_stairs_outer",
198+
"uvlock": true,
199+
"x": 180,
200+
"y": 270
201+
},
202+
"facing=west,half=top,shape=straight": {
203+
"model": "generations_core:block/tera_infused_deepslate_stairs",
204+
"uvlock": true,
205+
"x": 180,
206+
"y": 180
207+
}
208+
}
209+
}

0 commit comments

Comments
 (0)