Skip to content

Commit d5449cd

Browse files
Viola-SiemensViola-Siemens
authored
Merge pull request #104 from Polaris-Bears-MC/dev/Viola-Siemens
grower 和贴图修复
2 parents 482cf30 + ac20761 commit d5449cd

21 files changed

+78
-278
lines changed

‎src/main/java/org/polaris2023/wild_wind/common/init/ModBlocks.java

+2-3
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
import net.minecraft.world.level.block.*;
1010
import net.minecraft.world.level.block.entity.BlockEntity;
1111
import net.minecraft.world.level.block.entity.BlockEntityType;
12-
import net.minecraft.world.level.block.grower.TreeGrower;
1312
import net.minecraft.world.level.block.state.BlockBehaviour;
1413
import net.minecraft.world.level.block.state.properties.NoteBlockInstrument;
1514
import net.minecraft.world.level.material.MapColor;
@@ -445,13 +444,13 @@ public class ModBlocks {
445444
//TODO: TreeGrower
446445
@I18n(en_us = "Palm Sapling", zh_cn = "棕榈树苗", zh_tw = "棕櫚樹苗")
447446
public static final DeferredBlock<SaplingBlock> PALM_SAPLING =
448-
register("palm_sapling", props -> new SaplingBlock(TreeGrower.OAK, props), BlockBehaviour.Properties.ofFullCopy(Blocks.SPRUCE_SAPLING));
447+
register("palm_sapling", props -> new SaplingBlock(ModTreeGrowers.PALM, props), BlockBehaviour.Properties.ofFullCopy(Blocks.SPRUCE_SAPLING));
449448
@BasicBlockLocatedItem
450449
public static final DeferredItem<BlockItem> PALM_SAPLING_ITEM =
451450
register("palm_sapling", PALM_SAPLING);
452451
@I18n(en_us = "Baobab Sapling", zh_cn = "猴面包树苗", zh_tw = "猴麵包樹苗")
453452
public static final DeferredBlock<SaplingBlock> BAOBAB_SAPLING =
454-
register("baobab_sapling", props -> new SaplingBlock(TreeGrower.OAK, props), BlockBehaviour.Properties.ofFullCopy(Blocks.ACACIA_SAPLING));
453+
register("baobab_sapling", props -> new SaplingBlock(ModTreeGrowers.BAOBAB, props), BlockBehaviour.Properties.ofFullCopy(Blocks.ACACIA_SAPLING));
455454
@BasicBlockLocatedItem
456455
public static final DeferredItem<BlockItem> BAOBAB_SAPLING_ITEM =
457456
register("baobab_sapling", BAOBAB_SAPLING);

‎src/main/java/org/polaris2023/wild_wind/common/init/ModTreeGrowers.java

+29
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
package org.polaris2023.wild_wind.common.init;
2+
3+
import net.minecraft.data.worldgen.features.TreeFeatures;
4+
import net.minecraft.world.level.block.grower.TreeGrower;
5+
6+
import java.util.Optional;
7+
8+
public class ModTreeGrowers {
9+
public static final TreeGrower PALM = new TreeGrower(
10+
"palm",
11+
0.1F,
12+
Optional.empty(),
13+
Optional.empty(),
14+
Optional.of(TreeFeatures.OAK),
15+
Optional.of(TreeFeatures.FANCY_OAK),
16+
Optional.of(TreeFeatures.OAK_BEES_005),
17+
Optional.of(TreeFeatures.FANCY_OAK_BEES_005)
18+
);
19+
public static final TreeGrower BAOBAB = new TreeGrower(
20+
"baobab",
21+
0.1F,
22+
Optional.empty(),
23+
Optional.empty(),
24+
Optional.of(TreeFeatures.OAK),
25+
Optional.of(TreeFeatures.FANCY_OAK),
26+
Optional.of(TreeFeatures.OAK_BEES_005),
27+
Optional.of(TreeFeatures.FANCY_OAK_BEES_005)
28+
);
29+
}

‎src/main/resources/assets/wild_wind/models/block/sculk_jaw.json

+5-54
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{
2-
"credit": "By KeepMeow",
2+
"parent": "block/block",
33
"textures": {
4+
"particle": "wild_wind:block/sculk_catalyst_side",
45
"teeth": "wild_wind:block/sculk_jaw_teeth",
56
"top": "wild_wind:block/sculk_jaw_top",
6-
"bottom": "minecraft:block/sculk_catalyst_bottom",
7-
"particle": "minecraft:block/sculk_catalyst_side",
8-
"side": "minecraft:block/sculk_catalyst_side"
7+
"bottom": "wild_wind:block/sculk_catalyst_bottom",
8+
"side": "wild_wind:block/sculk_catalyst_side"
99
},
1010
"elements": [
1111
{
@@ -20,19 +20,6 @@
2020
"down": {"uv": [0, 0, 16, 16], "texture": "#bottom"}
2121
}
2222
},
23-
{
24-
"from": [0, 0, 0],
25-
"to": [16, 16, 16],
26-
"color": 8,
27-
"faces": {
28-
"north": {"uv": [0, 0, 16, 16], "texture": "#missing"},
29-
"east": {"uv": [0, 0, 16, 16], "texture": "#missing"},
30-
"south": {"uv": [0, 0, 16, 16], "texture": "#missing"},
31-
"west": {"uv": [0, 0, 16, 16], "texture": "#missing"},
32-
"up": {"uv": [0, 0, 16, 16], "texture": "#missing"},
33-
"down": {"uv": [0, 0, 16, 16], "texture": "#missing"}
34-
}
35-
},
3623
{
3724
"from": [2.75, 20.5, 0],
3825
"to": [7.75, 20.5, 16],
@@ -59,41 +46,5 @@
5946
"down": {"uv": [0, 0, 6, 16], "texture": "#teeth"}
6047
}
6148
}
62-
],
63-
"display": {
64-
"thirdperson_righthand": {
65-
"rotation": [-110, 45, -180],
66-
"translation": [0, 2.75, -1.25],
67-
"scale": [0.4, 0.4, 0.4]
68-
},
69-
"thirdperson_lefthand": {
70-
"rotation": [-110, 45, -180],
71-
"translation": [0, 2.75, -1.25],
72-
"scale": [0.4, 0.4, 0.4]
73-
},
74-
"firstperson_righthand": {
75-
"rotation": [0, 45, 0],
76-
"translation": [4.25, 0, -2.25],
77-
"scale": [0.4, 0.4, 0.4]
78-
},
79-
"firstperson_lefthand": {
80-
"rotation": [0, 45, 0],
81-
"translation": [4.25, 0, -2.25],
82-
"scale": [0.4, 0.4, 0.4]
83-
},
84-
"ground": {
85-
"translation": [0, 2, 0],
86-
"scale": [0.3, 0.3, 0.3]
87-
},
88-
"gui": {
89-
"rotation": [45, 45, 0],
90-
"scale": [0.6, 0.6, 0.6]
91-
},
92-
"head": {
93-
"rotation": [-90, 0, 0]
94-
},
95-
"fixed": {
96-
"scale": [0.5, 0.5, 0.5]
97-
}
98-
}
49+
]
9950
}

‎src/main/resources/assets/wild_wind/models/block/sculk_jaw_tendril_active.json

+4-70
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{
2-
"credit": "By KeepMeow",
2+
"parent": "block/block",
33
"textures": {
4+
"particle": "wild_wind:block/sculk_catalyst_side",
5+
"tendril": "wild_wind:block/sculk_jaw_tendril_active",
46
"teeth": "wild_wind:block/sculk_jaw_teeth",
57
"top": "wild_wind:block/sculk_jaw_top",
68
"bottom": "wild_wind:block/sculk_catalyst_bottom",
7-
"tendril": "wild_wind:block/sculk_jaw_tendril_active",
8-
"particle": "wild_wind:block/sculk_catalyst_side",
99
"side": "wild_wind:block/sculk_catalyst_side"
1010
},
1111
"elements": [
@@ -15,11 +15,7 @@
1515
"rotation": {"angle": 0, "axis": "y", "origin": [0, -3, 0]},
1616
"faces": {
1717
"north": {"uv": [0, 0, 16, 16], "texture": "#tendril"},
18-
"east": {"uv": [0, 0, 1, 16], "texture": "#missing"},
19-
"south": {"uv": [0, 0, 16, 16], "texture": "#tendril"},
20-
"west": {"uv": [0, 0, 1, 16], "texture": "#missing"},
21-
"up": {"uv": [0, 0, 1, 16], "texture": "#missing"},
22-
"down": {"uv": [0, 0, 1, 16], "texture": "#missing"}
18+
"south": {"uv": [0, 0, 16, 16], "texture": "#tendril"}
2319
}
2420
},
2521
{
@@ -34,19 +30,6 @@
3430
"down": {"uv": [0, 0, 16, 16], "texture": "#bottom"}
3531
}
3632
},
37-
{
38-
"from": [0, 0, 0],
39-
"to": [16, 16, 16],
40-
"color": 3,
41-
"faces": {
42-
"north": {"uv": [0, 0, 16, 16], "texture": "#missing"},
43-
"east": {"uv": [0, 0, 16, 16], "texture": "#missing"},
44-
"south": {"uv": [0, 0, 16, 16], "texture": "#missing"},
45-
"west": {"uv": [0, 0, 16, 16], "texture": "#missing"},
46-
"up": {"uv": [0, 0, 16, 16], "texture": "#missing"},
47-
"down": {"uv": [0, 0, 16, 16], "texture": "#missing"}
48-
}
49-
},
5033
{
5134
"from": [2.75, 20.5, 0],
5235
"to": [7.75, 20.5, 16],
@@ -73,54 +56,5 @@
7356
"down": {"uv": [0, 0, 6, 16], "texture": "#teeth"}
7457
}
7558
}
76-
],
77-
"display": {
78-
"thirdperson_righthand": {
79-
"rotation": [-110, 45, -180],
80-
"translation": [0, 2.75, -1.25],
81-
"scale": [0.4, 0.4, 0.4]
82-
},
83-
"thirdperson_lefthand": {
84-
"rotation": [-110, 45, -180],
85-
"translation": [0, 2.75, -1.25],
86-
"scale": [0.4, 0.4, 0.4]
87-
},
88-
"firstperson_righthand": {
89-
"rotation": [0, 45, 0],
90-
"translation": [4.25, 0, -2.25],
91-
"scale": [0.4, 0.4, 0.4]
92-
},
93-
"firstperson_lefthand": {
94-
"rotation": [0, 45, 0],
95-
"translation": [4.25, 0, -2.25],
96-
"scale": [0.4, 0.4, 0.4]
97-
},
98-
"ground": {
99-
"translation": [0, 2, 0],
100-
"scale": [0.3, 0.3, 0.3]
101-
},
102-
"gui": {
103-
"rotation": [45, 45, 0],
104-
"scale": [0.6, 0.6, 0.6]
105-
},
106-
"head": {
107-
"rotation": [-90, 0, 0]
108-
},
109-
"fixed": {
110-
"scale": [0.5, 0.5, 0.5]
111-
}
112-
},
113-
"groups": [
114-
0,
115-
{
116-
"name": "group",
117-
"origin": [8, 8, 8],
118-
"color": 0,
119-
"children": []
120-
},
121-
1,
122-
2,
123-
3,
124-
4
12559
]
12660
}

‎src/main/resources/assets/wild_wind/models/block/sculk_jaw_tendril_extend.json

+6-59
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{
2-
"credit": "By KeepMeow",
2+
"parent": "block/block",
33
"textures": {
4-
"4": "wild_wind:block/sculk_jaw_tendril_extend",
4+
"particle": "wild_wind:block/sculk_catalyst_side",
5+
"tendril": "wild_wind:block/sculk_jaw_tendril_extend",
56
"teeth": "wild_wind:block/sculk_jaw_teeth",
67
"top": "wild_wind:block/sculk_jaw_top",
78
"bottom": "wild_wind:block/sculk_catalyst_bottom",
8-
"particle": "wild_wind:block/sculk_catalyst_side",
99
"side": "wild_wind:block/sculk_catalyst_side"
1010
},
1111
"elements": [
@@ -14,12 +14,8 @@
1414
"to": [15.75, 32, 8],
1515
"rotation": {"angle": 0, "axis": "y", "origin": [0, -3, 0]},
1616
"faces": {
17-
"north": {"uv": [0, 0, 16, 16], "texture": "#4"},
18-
"east": {"uv": [0, 0, 1, 16], "texture": "#missing"},
19-
"south": {"uv": [0, 0, 16, 16], "texture": "#4"},
20-
"west": {"uv": [0, 0, 1, 16], "texture": "#missing"},
21-
"up": {"uv": [0, 0, 1, 16], "texture": "#missing"},
22-
"down": {"uv": [0, 0, 1, 16], "texture": "#missing"}
17+
"north": {"uv": [0, 0, 16, 16], "texture": "#tendril"},
18+
"south": {"uv": [0, 0, 16, 16], "texture": "#tendril"}
2319
}
2420
},
2521
{
@@ -34,19 +30,6 @@
3430
"down": {"uv": [0, 0, 16, 16], "texture": "#bottom"}
3531
}
3632
},
37-
{
38-
"from": [0, 0, 0],
39-
"to": [16, 16, 16],
40-
"color": 3,
41-
"faces": {
42-
"north": {"uv": [0, 0, 16, 16], "texture": "#missing"},
43-
"east": {"uv": [0, 0, 16, 16], "texture": "#missing"},
44-
"south": {"uv": [0, 0, 16, 16], "texture": "#missing"},
45-
"west": {"uv": [0, 0, 16, 16], "texture": "#missing"},
46-
"up": {"uv": [0, 0, 16, 16], "texture": "#missing"},
47-
"down": {"uv": [0, 0, 16, 16], "texture": "#missing"}
48-
}
49-
},
5033
{
5134
"from": [2.75, 20.5, 0],
5235
"to": [7.75, 20.5, 16],
@@ -73,41 +56,5 @@
7356
"down": {"uv": [0, 0, 6, 16], "texture": "#teeth"}
7457
}
7558
}
76-
],
77-
"display": {
78-
"thirdperson_righthand": {
79-
"rotation": [-110, 45, -180],
80-
"translation": [0, 2.75, -1.25],
81-
"scale": [0.4, 0.4, 0.4]
82-
},
83-
"thirdperson_lefthand": {
84-
"rotation": [-110, 45, -180],
85-
"translation": [0, 2.75, -1.25],
86-
"scale": [0.4, 0.4, 0.4]
87-
},
88-
"firstperson_righthand": {
89-
"rotation": [0, 45, 0],
90-
"translation": [4.25, 0, -2.25],
91-
"scale": [0.4, 0.4, 0.4]
92-
},
93-
"firstperson_lefthand": {
94-
"rotation": [0, 45, 0],
95-
"translation": [4.25, 0, -2.25],
96-
"scale": [0.4, 0.4, 0.4]
97-
},
98-
"ground": {
99-
"translation": [0, 2, 0],
100-
"scale": [0.3, 0.3, 0.3]
101-
},
102-
"gui": {
103-
"rotation": [45, 45, 0],
104-
"scale": [0.6, 0.6, 0.6]
105-
},
106-
"head": {
107-
"rotation": [-90, 0, 0]
108-
},
109-
"fixed": {
110-
"scale": [0.5, 0.5, 0.5]
111-
}
112-
}
59+
]
11360
}

‎src/main/resources/assets/wild_wind/models/block/sculk_jaw_tendril_inactive.json

+4-21
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{
2-
"credit": "By KeepMeow",
2+
"parent": "block/block",
33
"textures": {
4+
"particle": "wild_wind:block/sculk_catalyst_side",
5+
"tendril": "wild_wind:block/sculk_jaw_tendril_inactive",
46
"teeth": "wild_wind:block/sculk_jaw_teeth",
57
"top": "wild_wind:block/sculk_jaw_top",
68
"bottom": "wild_wind:block/sculk_catalyst_bottom",
7-
"tendril": "wild_wind:block/sculk_jaw_tendril_inactive",
8-
"particle": "wild_wind:block/sculk_catalyst_side",
99
"side": "wild_wind:block/sculk_catalyst_side"
1010
},
1111
"elements": [
@@ -21,30 +21,13 @@
2121
"down": {"uv": [0, 0, 16, 16], "texture": "#bottom"}
2222
}
2323
},
24-
{
25-
"from": [0, 0, 0],
26-
"to": [16, 16, 16],
27-
"color": 8,
28-
"faces": {
29-
"north": {"uv": [0, 0, 16, 16], "texture": "#missing"},
30-
"east": {"uv": [0, 0, 16, 16], "texture": "#missing"},
31-
"south": {"uv": [0, 0, 16, 16], "texture": "#missing"},
32-
"west": {"uv": [0, 0, 16, 16], "texture": "#missing"},
33-
"up": {"uv": [0, 0, 16, 16], "texture": "#missing"},
34-
"down": {"uv": [0, 0, 16, 16], "texture": "#missing"}
35-
}
36-
},
3724
{
3825
"from": [-0.25, 16, 8],
3926
"to": [15.75, 32, 8],
4027
"rotation": {"angle": 0, "axis": "y", "origin": [0, -3, 0]},
4128
"faces": {
4229
"north": {"uv": [0, 0, 16, 16], "texture": "#tendril"},
43-
"east": {"uv": [0, 0, 1, 16], "texture": "#missing"},
44-
"south": {"uv": [0, 0, 16, 16], "texture": "#tendril"},
45-
"west": {"uv": [0, 0, 1, 16], "texture": "#missing"},
46-
"up": {"uv": [0, 0, 1, 16], "texture": "#missing"},
47-
"down": {"uv": [0, 0, 1, 16], "texture": "#missing"}
30+
"south": {"uv": [0, 0, 16, 16], "texture": "#tendril"}
4831
}
4932
},
5033
{

0 commit comments

Comments
 (0)