Skip to content

Commit 652547f

Browse files
ExDrillExDrill
committed
new community texture!
1 parent be36815 commit 652547f

File tree

18 files changed

+65
-66
lines changed

18 files changed

+65
-66
lines changed

‎build.gradle‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,6 @@ dependencies {
3131
modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
3232

3333
// Dependencies
34-
modCompileOnly "com.terraformersmc:biolith-fabric:${project.biolith_version}"
35-
3634
modApi "com.github.glitchfiend:TerraBlender-fabric:${project.terrablender_version}"
3735

3836
modCompileOnly "maven.modrinth:farmers-delight-refabricated:${rootProject.farmers_delight_version}"

‎src/main/java/com/teamabode/verdance/Verdance.java‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,7 @@
66
import com.teamabode.verdance.core.misc.VerdanceBiomeModifications;
77
import com.teamabode.verdance.core.misc.VerdanceLootTableEvents;
88
import com.teamabode.verdance.core.misc.VerdanceStructurePoolModifiers;
9-
import com.teamabode.verdance.core.misc.VerdanceSurfaceRules;
109
import com.teamabode.verdance.core.registry.*;
11-
import com.terraformersmc.biolith.api.biome.BiomePlacement;
12-
import com.terraformersmc.biolith.api.surface.SurfaceGeneration;
1310
import net.fabricmc.api.ModInitializer;
1411
import net.fabricmc.fabric.api.itemgroup.v1.ItemGroupEvents;
1512
import net.fabricmc.fabric.api.object.builder.v1.trade.TradeOfferHelper;
@@ -21,11 +18,8 @@
2118
import net.minecraft.item.ItemGroups;
2219
import net.minecraft.item.Items;
2320
import net.minecraft.util.Identifier;
24-
import net.minecraft.village.TradeOffer;
2521
import net.minecraft.village.TradeOffers;
2622
import net.minecraft.village.VillagerProfession;
27-
import net.minecraft.world.biome.BiomeKeys;
28-
import net.minecraft.world.gen.surfacebuilder.MaterialRules;
2923
import org.slf4j.Logger;
3024
import org.slf4j.LoggerFactory;
3125

‎src/main/java/com/teamabode/verdance/core/integration/farmersdelight/registry/FDCompatBlocks.java‎

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,20 @@
99
import net.minecraft.item.Item;
1010
import net.minecraft.registry.Registries;
1111
import net.minecraft.registry.Registry;
12+
import net.minecraft.registry.RegistryKey;
13+
import net.minecraft.registry.RegistryKeys;
14+
15+
import java.util.function.Function;
1216

1317
public class FDCompatBlocks {
1418
public static final Block MULBERRY_CABINET = register(
1519
"mulberry_cabinet",
16-
new CompatCabinetBlock(AbstractBlock.Settings.copy(Blocks.BARREL))
20+
CompatCabinetBlock::new,
21+
AbstractBlock.Settings.copy(Blocks.BARREL)
1722
);
1823
public static final Block MULBERRY_CRATE = register(
1924
"mulberry_crate",
25+
Block::new,
2026
AbstractBlock.Settings.copy(Blocks.OAK_PLANKS)
2127
);
2228

@@ -25,13 +31,13 @@ public static void register() {
2531
}
2632

2733
// Registry Utils
28-
private static Block register(String name, AbstractBlock.Settings properties) {
29-
return register(name, new Block(properties));
30-
}
34+
private static Block register(String name, Function<AbstractBlock.Settings, Block> block, AbstractBlock.Settings settings) {
35+
var key = RegistryKey.of(RegistryKeys.BLOCK, Verdance.id(name));
36+
var registry = Registry.register(Registries.BLOCK, key, block.apply(settings.registryKey(key)));
37+
38+
var itemKey = RegistryKey.of(RegistryKeys.ITEM, Verdance.id(name));
39+
Registry.register(Registries.ITEM, itemKey, new BlockItem(registry, new Item.Settings().registryKey(itemKey)));
3140

32-
private static Block register(String name, Block block) {
33-
var registry = Registry.register(Registries.BLOCK, Verdance.id(name), block);
34-
Registry.register(Registries.ITEM, Verdance.id(name), new BlockItem(registry, new Item.Settings()));
3541
return registry;
3642
}
3743
}

‎src/main/java/com/teamabode/verdance/core/registry/VerdanceEntityTypes.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
public class VerdanceEntityTypes {
2323
public static final EntityType<SilkMothEntity> SILK_MOTH = register(
2424
"silk_moth",
25-
EntityType.Builder.create(SilkMothEntity::new, SpawnGroup.CREATURE).dimensions(0.7f, 0.7f).eyeHeight(0.35f)
25+
EntityType.Builder.create(SilkMothEntity::new, SpawnGroup.AXOLOTLS).dimensions(0.7f, 0.7f).eyeHeight(0.35f)
2626
);
2727

2828
public static final EntityType<SilkwormEntity> SILKWORM = register(

‎src/main/java/com/teamabode/verdance/datagen/server/tag/VerdanceItemTagProvider.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ protected void configure(RegistryWrapper.WrapperLookup arg) {
4141
}
4242

4343
private void silkMothFood() {
44+
4445
this.valueLookupBuilder(VerdanceItemTags.SILK_MOTH_FOOD)
4546
.forceAddTag(ItemTags.FLOWERS);
4647
}

‎src/main/resources/assets/minecraft/atlases/armor_trims.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
{
44
"type": "paletted_permutations",
55
"textures": [
6-
"verdance:trims/humanoid/community",
7-
"verdance:trims/humanoid_leggings/community"
6+
"verdance:trims/entity/humanoid/community",
7+
"verdance:trims/entity/humanoid_leggings/community"
88
],
99
"palette_key": "minecraft:trims/color_palettes/trim_palette",
1010
"permutations": {

‎src/main/resources/assets/verdance/lang/en_gb.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -86,16 +86,16 @@
8686
"block.verdance.orange_stucco_stairs": "Orange Stucco Stairs",
8787
"block.verdance.orange_stucco_wall": "Orange Stucco Wall",
8888
"block.verdance.pink_cushion": "Pink Cushion",
89-
"block.verdance.pink_flowering_shrub": "Pink Flowering Shrub",
89+
"block.verdance.pink_flowering_desert_bush": "Pink Flowering Desert Bush",
9090
"block.verdance.pink_stucco": "Pink Stucco",
9191
"block.verdance.pink_stucco_slab": "Pink Stucco Slab",
9292
"block.verdance.pink_stucco_stairs": "Pink Stucco Stairs",
9393
"block.verdance.pink_stucco_wall": "Pink Stucco Wall",
9494
"block.verdance.potted_mulberry_sapling": "Potted Mulberry Sapling",
95-
"block.verdance.potted_pink_flowering_shrub": "Potted Pink Flowering Shrub",
96-
"block.verdance.potted_shrub": "Potted Shrub",
95+
"block.verdance.potted_pink_flowering_desert_bush": "Potted Pink Flowering Desert Bush",
96+
"block.verdance.potted_desert_bush": "Potted Desert Bush",
9797
"block.verdance.potted_violet": "Potted Violet",
98-
"block.verdance.potted_yellow_flowering_shrub": "Potted Yellow Flowering Shrub",
98+
"block.verdance.potted_yellow_flowering_desert_bush": "Potted Yellow Flowering Desert Bush",
9999
"block.verdance.purple_cushion": "Purple Cushion",
100100
"block.verdance.purple_stucco": "Purple Stucco",
101101
"block.verdance.purple_stucco_slab": "Purple Stucco Slab",
@@ -106,7 +106,7 @@
106106
"block.verdance.red_stucco_slab": "Red Stucco Slab",
107107
"block.verdance.red_stucco_stairs": "Red Stucco Stairs",
108108
"block.verdance.red_stucco_wall": "Red Stucco Wall",
109-
"block.verdance.shrub": "Shrub",
109+
"block.verdance.desert_bush": "Desert Bush",
110110
"block.verdance.silkworm_eggs": "Silkworm Eggs",
111111
"block.verdance.stripped_mulberry_log": "Stripped Mulberry Log",
112112
"block.verdance.stripped_mulberry_wood": "Stripped Mulberry Wood",
@@ -117,7 +117,7 @@
117117
"block.verdance.white_stucco_stairs": "White Stucco Stairs",
118118
"block.verdance.white_stucco_wall": "White Stucco Wall",
119119
"block.verdance.yellow_cushion": "Yellow Cushion",
120-
"block.verdance.yellow_flowering_shrub": "Yellow Flowering Shrub",
120+
"block.verdance.yellow_flowering_desert_bush": "Yellow Flowering Desert Bush",
121121
"block.verdance.yellow_stucco": "Yellow Stucco",
122122
"block.verdance.yellow_stucco_slab": "Yellow Stucco Slab",
123123
"block.verdance.yellow_stucco_stairs": "Yellow Stucco Stairs",

‎src/main/resources/assets/verdance/lang/en_us.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -86,16 +86,16 @@
8686
"block.verdance.orange_stucco_stairs": "Orange Stucco Stairs",
8787
"block.verdance.orange_stucco_wall": "Orange Stucco Wall",
8888
"block.verdance.pink_cushion": "Pink Cushion",
89-
"block.verdance.pink_flowering_shrub": "Pink Flowering Shrub",
89+
"block.verdance.pink_flowering_desert_bush": "Pink Flowering Desert Bush",
9090
"block.verdance.pink_stucco": "Pink Stucco",
9191
"block.verdance.pink_stucco_slab": "Pink Stucco Slab",
9292
"block.verdance.pink_stucco_stairs": "Pink Stucco Stairs",
9393
"block.verdance.pink_stucco_wall": "Pink Stucco Wall",
9494
"block.verdance.potted_mulberry_sapling": "Potted Mulberry Sapling",
95-
"block.verdance.potted_pink_flowering_shrub": "Potted Pink Flowering Shrub",
96-
"block.verdance.potted_shrub": "Potted Shrub",
95+
"block.verdance.potted_pink_flowering_desert_bush": "Potted Pink Flowering Desert Bush",
96+
"block.verdance.potted_desert_bush": "Potted Desert Bush",
9797
"block.verdance.potted_violet": "Potted Violet",
98-
"block.verdance.potted_yellow_flowering_shrub": "Potted Yellow Flowering Shrub",
98+
"block.verdance.potted_yellow_flowering_desert_bush": "Potted Yellow Flowering Desert Bush",
9999
"block.verdance.purple_cushion": "Purple Cushion",
100100
"block.verdance.purple_stucco": "Purple Stucco",
101101
"block.verdance.purple_stucco_slab": "Purple Stucco Slab",
@@ -106,7 +106,7 @@
106106
"block.verdance.red_stucco_slab": "Red Stucco Slab",
107107
"block.verdance.red_stucco_stairs": "Red Stucco Stairs",
108108
"block.verdance.red_stucco_wall": "Red Stucco Wall",
109-
"block.verdance.shrub": "Shrub",
109+
"block.verdance.desert_bush": "Desert Bush",
110110
"block.verdance.silkworm_eggs": "Silkworm Eggs",
111111
"block.verdance.stripped_mulberry_log": "Stripped Mulberry Log",
112112
"block.verdance.stripped_mulberry_wood": "Stripped Mulberry Wood",
@@ -117,7 +117,7 @@
117117
"block.verdance.white_stucco_stairs": "White Stucco Stairs",
118118
"block.verdance.white_stucco_wall": "White Stucco Wall",
119119
"block.verdance.yellow_cushion": "Yellow Cushion",
120-
"block.verdance.yellow_flowering_shrub": "Yellow Flowering Shrub",
120+
"block.verdance.yellow_flowering_desert_bush": "Yellow Flowering Desert Bush",
121121
"block.verdance.yellow_stucco": "Yellow Stucco",
122122
"block.verdance.yellow_stucco_slab": "Yellow Stucco Slab",
123123
"block.verdance.yellow_stucco_stairs": "Yellow Stucco Stairs",

‎src/main/resources/assets/verdance/lang/es_ar.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -86,16 +86,16 @@
8686
"block.verdance.orange_stucco_stairs": "Escaleras de estuco naranja",
8787
"block.verdance.orange_stucco_wall": "Pared de estuco naranja",
8888
"block.verdance.pink_cushion": "Cojín rosa",
89-
"block.verdance.pink_flowering_shrub": "Arbusto florido rosa",
89+
"block.verdance.pink_flowering_desert_bush": "Arbusto de desierto florido rosa",
9090
"block.verdance.pink_stucco": "Estuco rosa",
9191
"block.verdance.pink_stucco_slab": "Baldosa de estuco rosa",
9292
"block.verdance.pink_stucco_stairs": "Escaleras de estuco rosa",
9393
"block.verdance.pink_stucco_wall": "Pared de estuco rosa",
9494
"block.verdance.potted_mulberry_sapling": "Maceta con brote de morera",
95-
"block.verdance.potted_pink_flowering_shrub": "Maceta con arbusto florido rosa",
96-
"block.verdance.potted_shrub": "Maceta con arbusto",
95+
"block.verdance.potted_pink_flowering_desert_bush": "Maceta con arbusto de desierto florido rosa",
96+
"block.verdance.potted_desert_bush": "Maceta con arbusto",
9797
"block.verdance.potted_violet": "Maceta con violeta",
98-
"block.verdance.potted_yellow_flowering_shrub": "Maceta con arbusto florido amarillo",
98+
"block.verdance.potted_yellow_flowering_desert_bush": "Maceta con arbusto de desierto florido amarillo",
9999
"block.verdance.purple_cushion": "Cojín violeta",
100100
"block.verdance.purple_stucco": "Estuco violeta",
101101
"block.verdance.purple_stucco_slab": "Baldosa de estuco violeta",
@@ -106,7 +106,7 @@
106106
"block.verdance.red_stucco_slab": "Baldosa de estuco rojo",
107107
"block.verdance.red_stucco_stairs": "Escaleras de estuco rojo",
108108
"block.verdance.red_stucco_wall": "Pared de estuco rojo",
109-
"block.verdance.shrub": "Arbusto",
109+
"block.verdance.desert_bush": "Arbusto de desierto",
110110
"block.verdance.silkworm_eggs": "Huevos de gusano de seda",
111111
"block.verdance.stripped_mulberry_log": "Tronco de morera sin corteza",
112112
"block.verdance.stripped_mulberry_wood": "Leño de morera sin corteza",
@@ -117,7 +117,7 @@
117117
"block.verdance.white_stucco_stairs": "Escaleras de estuco blanco",
118118
"block.verdance.white_stucco_wall": "Pared de estuco blanco",
119119
"block.verdance.yellow_cushion": "Cojín amarillo",
120-
"block.verdance.yellow_flowering_shrub": "Arbusto florido amarillo",
120+
"block.verdance.yellow_flowering_desert_bush": "Arbusto de desierto florido amarillo",
121121
"block.verdance.yellow_stucco": "Estuco amarillo",
122122
"block.verdance.yellow_stucco_slab": "Baldosa de estuco amarillo",
123123
"block.verdance.yellow_stucco_stairs": "Escaleras de estuco amarillo",

‎src/main/resources/assets/verdance/lang/es_es.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -86,16 +86,16 @@
8686
"block.verdance.orange_stucco_stairs": "Escaleras de estuco naranja",
8787
"block.verdance.orange_stucco_wall": "Muro de estuco naranja",
8888
"block.verdance.pink_cushion": "Cojín rosa",
89-
"block.verdance.pink_flowering_shrub": "Arbusto florecido rosa",
89+
"block.verdance.pink_flowering_desert_bush": "Arbusto de desierto florecido rosa",
9090
"block.verdance.pink_stucco": "Estuco rosa",
9191
"block.verdance.pink_stucco_slab": "Losa de estuco rosa",
9292
"block.verdance.pink_stucco_stairs": "Escaleras de estuco rosa",
9393
"block.verdance.pink_stucco_wall": "Muro de estuco rosa",
9494
"block.verdance.potted_mulberry_sapling": "Maceta con brote de morera",
95-
"block.verdance.potted_pink_flowering_shrub": "Maceta con arbusto florecido rosa",
96-
"block.verdance.potted_shrub": "Maceta con arbusto",
95+
"block.verdance.potted_pink_flowering_desert_bush": "Maceta con arbusto de desierto florecido rosa",
96+
"block.verdance.potted_desert_bush": "Maceta con arbusto de desierto",
9797
"block.verdance.potted_violet": "Maceta con violeta",
98-
"block.verdance.potted_yellow_flowering_shrub": "Maceta con arbusto florecido amarillo",
98+
"block.verdance.potted_yellow_flowering_desert_bush": "Maceta con arbusto de desierto florecido amarillo",
9999
"block.verdance.purple_cushion": "Cojín morado",
100100
"block.verdance.purple_stucco": "Estuco morado",
101101
"block.verdance.purple_stucco_slab": "Losa de estuco morado",
@@ -106,7 +106,7 @@
106106
"block.verdance.red_stucco_slab": "Losa de estuco rojo",
107107
"block.verdance.red_stucco_stairs": "Escaleras de estuco rojo",
108108
"block.verdance.red_stucco_wall": "Muro de estuco rojo",
109-
"block.verdance.shrub": "Arbusto",
109+
"block.verdance.desert_bush": "Arbusto de desierto",
110110
"block.verdance.silkworm_eggs": "Huevos de gusano de seda",
111111
"block.verdance.stripped_mulberry_log": "Tronco de morera sin corteza",
112112
"block.verdance.stripped_mulberry_wood": "Leño de morera sin corteza",
@@ -117,7 +117,7 @@
117117
"block.verdance.white_stucco_stairs": "Escaleras de estuco blanco",
118118
"block.verdance.white_stucco_wall": "Muro de estuco blanco",
119119
"block.verdance.yellow_cushion": "Cojín amarillo",
120-
"block.verdance.yellow_flowering_shrub": "Arbusto florecido amarillo",
120+
"block.verdance.yellow_flowering_desert_bush": "Arbusto de desierto florecido amarillo",
121121
"block.verdance.yellow_stucco": "Estuco amarillo",
122122
"block.verdance.yellow_stucco_slab": "Losa de estuco amarillo",
123123
"block.verdance.yellow_stucco_stairs": "Escaleras de estuco amarillo",

0 commit comments

Comments
 (0)