diff --git a/client/src/main/java/com/terraformersmc/traverse/TraverseClient.java b/client/src/main/java/com/terraformersmc/traverse/TraverseClient.java index 005ffe4..b4db437 100644 --- a/client/src/main/java/com/terraformersmc/traverse/TraverseClient.java +++ b/client/src/main/java/com/terraformersmc/traverse/TraverseClient.java @@ -2,10 +2,10 @@ import com.terraformersmc.terraform.boat.api.client.TerraformBoatClientHelper; import com.terraformersmc.traverse.block.TraverseBlocks; +import com.terraformersmc.traverse.boat.TraverseBoats; import net.fabricmc.api.ClientModInitializer; import net.fabricmc.fabric.api.blockrenderlayer.v1.BlockRenderLayerMap; import net.minecraft.client.render.RenderLayer; -import net.minecraft.util.Identifier; public class TraverseClient implements ClientModInitializer { @Override @@ -15,7 +15,7 @@ public void onInitializeClient() { } private static void registerEntityRenderers() { - TerraformBoatClientHelper.registerModelLayers(Identifier.of(Traverse.MOD_ID, "fir"), false); + TerraformBoatClientHelper.registerModelLayers(TraverseBoats.FIR); } private static void registerRenderLayers() { diff --git a/client/src/main/resources/assets/traverse/lang/cs_cz.json b/client/src/main/resources/assets/traverse/lang/cs_cz.json index eabf0fa..f8482c9 100644 --- a/client/src/main/resources/assets/traverse/lang/cs_cz.json +++ b/client/src/main/resources/assets/traverse/lang/cs_cz.json @@ -1,54 +1,85 @@ { - "itemGroup.traverse.items": "Předměty Traverse", - "tag.item.traverse.fir_logs": "Jedlové kmeny", - - "biome.traverse.arid_highlands": "Vyprahlá vysočina", - "biome.traverse.autumnal_woods": "Podzimní les", - "biome.traverse.coniferous_forest": "Jehličnatý les", - "biome.traverse.desert_shrubland": "Pouštní křoviny", - "biome.traverse.lush_swamp": "Bujná bažina", - "biome.traverse.flatlands": "Plošina", - "biome.traverse.mini_jungle": "Malá džungle", - "biome.traverse.rolling_hills": "Kulaté kopce", - "biome.traverse.snowy_coniferous_forest": "Zasnežený jehličnatý les", - "biome.traverse.woodlands": "Les", - - "block.traverse.red_autumnal_leaves": "Červené podzimní listy", - "block.traverse.brown_autumnal_leaves": "Hnědé podzimní listy", - "block.traverse.orange_autumnal_leaves": "Oranžové podzimní listy", - "block.traverse.yellow_autumnal_leaves": "Žluté podzimní listy", - - "block.traverse.red_autumnal_sapling": "Červená podzimní sazenice", - "block.traverse.brown_autumnal_sapling": "Hnědá podzimní sazenice", - "block.traverse.orange_autumnal_sapling": "Oranžová podzimní sazenice", - "block.traverse.yellow_autumnal_sapling": "Žlutá podzimní sazenice", - - "block.traverse.potted_red_autumnal_sapling": "Červená podzimní sazenice v kvetináči", - "block.traverse.potted_brown_autumnal_sapling": "Hnědá sazenice v kvetináči", - "block.traverse.potted_orange_autumnal_sapling": "Oranžová podzimní sazenice v kvetináči", - "block.traverse.potted_yellow_autumnal_sapling": "Žlutá podzimní sazenice v kvetináči", - - "block.traverse.fir_log": "Jedlový kmen", - "block.traverse.stripped_fir_log": "Oloupaný jedlový kmen", - "block.traverse.stripped_fir_wood": "Oloupané jedlové dřevo", - "block.traverse.fir_wood": "Jedlové dřevo", - "block.traverse.fir_leaves": "Jedlové listy", - "block.traverse.fir_sapling": "Jedlová sazenice", - "block.traverse.potted_fir_sapling": "Jedlová sazenice v kvetináči", - "block.traverse.fir_planks": "Jedlová prkna", - "block.traverse.fir_stairs": "Jedlové schody", - "block.traverse.fir_slab": "Jedlový půlblok", - "block.traverse.fir_sign": "Jedlová cedule", - "block.traverse.fir_hanging_sign": "Jedlová závěsná cedule", - "block.traverse.fir_button": "Jedlové tlačítko", - "block.traverse.fir_pressure_plate": "Jedlová nášlapná deska", - "block.traverse.fir_fence": "Jedlový plot", - "block.traverse.fir_fence_gate": "Jedlová branka", - "block.traverse.fir_door": "Jedlové dveře", - "block.traverse.fir_trapdoor": "Jedlový poklop", - "item.traverse.fir_boat": "Jedlový člun", - "item.traverse.fir_chest_boat": "Jedlový člun s truhlou", - "tag.item.c.planks_that_burn": "Prkna co hoří", - "tag.item.c.stripped_logs": "Oloupané kmeny", - "tag.item.c.stripped_wood": "Oloupané dřevo" + "biome.traverse.arid_highlands": "Vyprahlá vysočina", + "biome.traverse.autumnal_woods": "Podzimní les", + "biome.traverse.coniferous_forest": "Jehličnatý les", + "biome.traverse.desert_shrubland": "Pouštní křoviny", + "biome.traverse.lush_swamp": "Bujná bažina", + "biome.traverse.flatlands": "Plošina", + "biome.traverse.mini_jungle": "Malá džungle", + "biome.traverse.rolling_hills": "Kulaté kopce", + "biome.traverse.snowy_coniferous_forest": "Zasnežený jehličnatý les", + "biome.traverse.woodlands": "Les", + + "block.traverse.red_autumnal_leaves": "Červené podzimní listy", + "block.traverse.brown_autumnal_leaves": "Hnědé podzimní listy", + "block.traverse.orange_autumnal_leaves": "Oranžové podzimní listy", + "block.traverse.yellow_autumnal_leaves": "Žluté podzimní listy", + + "block.traverse.red_autumnal_sapling": "Červená podzimní sazenice", + "block.traverse.brown_autumnal_sapling": "Hnědá podzimní sazenice", + "block.traverse.orange_autumnal_sapling": "Oranžová podzimní sazenice", + "block.traverse.yellow_autumnal_sapling": "Žlutá podzimní sazenice", + + "block.traverse.potted_red_autumnal_sapling": "Červená podzimní sazenice v kvetináči", + "block.traverse.potted_brown_autumnal_sapling": "Hnědá sazenice v kvetináči", + "block.traverse.potted_orange_autumnal_sapling": "Oranžová podzimní sazenice v kvetináči", + "block.traverse.potted_yellow_autumnal_sapling": "Žlutá podzimní sazenice v kvetináči", + + "block.traverse.fir_log": "Jedlový kmen", + "block.traverse.stripped_fir_log": "Oloupaný jedlový kmen", + "block.traverse.stripped_fir_wood": "Oloupané jedlové dřevo", + "block.traverse.fir_wood": "Jedlové dřevo", + "block.traverse.fir_leaves": "Jedlové listy", + "block.traverse.fir_sapling": "Jedlová sazenice", + "block.traverse.potted_fir_sapling": "Jedlová sazenice v kvetináči", + "block.traverse.fir_planks": "Jedlová prkna", + "block.traverse.fir_stairs": "Jedlové schody", + "block.traverse.fir_slab": "Jedlový půlblok", + "block.traverse.fir_sign": "Jedlová cedule", + "block.traverse.fir_hanging_sign": "Jedlová závěsná cedule", + "block.traverse.fir_button": "Jedlové tlačítko", + "block.traverse.fir_pressure_plate": "Jedlová nášlapná deska", + "block.traverse.fir_fence": "Jedlový plot", + "block.traverse.fir_fence_gate": "Jedlová branka", + "block.traverse.fir_door": "Jedlové dveře", + "block.traverse.fir_trapdoor": "Jedlový poklop", + + "itemGroup.traverse.items": "Předměty Traverse", + "item.traverse.red_autumnal_leaves": "Červené podzimní listy", + "item.traverse.brown_autumnal_leaves": "Hnědé podzimní listy", + "item.traverse.orange_autumnal_leaves": "Oranžové podzimní listy", + "item.traverse.yellow_autumnal_leaves": "Žluté podzimní listy", + + "item.traverse.red_autumnal_sapling": "Červená podzimní sazenice", + "item.traverse.brown_autumnal_sapling": "Hnědá podzimní sazenice", + "item.traverse.orange_autumnal_sapling": "Oranžová podzimní sazenice", + "item.traverse.yellow_autumnal_sapling": "Žlutá podzimní sazenice", + + "item.traverse.fir_log": "Jedlový kmen", + "item.traverse.stripped_fir_log": "Oloupaný jedlový kmen", + "item.traverse.stripped_fir_wood": "Oloupané jedlové dřevo", + "item.traverse.fir_wood": "Jedlové dřevo", + "item.traverse.fir_leaves": "Jedlové listy", + "item.traverse.fir_sapling": "Jedlová sazenice", + "item.traverse.potted_fir_sapling": "Jedlová sazenice v kvetináči", + "item.traverse.fir_planks": "Jedlová prkna", + "item.traverse.fir_stairs": "Jedlové schody", + "item.traverse.fir_slab": "Jedlový půlblok", + "item.traverse.fir_sign": "Jedlová cedule", + "item.traverse.fir_hanging_sign": "Jedlová závěsná cedule", + "item.traverse.fir_button": "Jedlové tlačítko", + "item.traverse.fir_pressure_plate": "Jedlová nášlapná deska", + "item.traverse.fir_fence": "Jedlový plot", + "item.traverse.fir_fence_gate": "Jedlová branka", + "item.traverse.fir_door": "Jedlové dveře", + "item.traverse.fir_trapdoor": "Jedlový poklop", + + "item.traverse.fir_boat": "Jedlový člun", + "item.traverse.fir_chest_boat": "Jedlový člun s truhlou", + + "tag.item.traverse.fir_logs": "Jedlové kmeny", + + "tag.item.c.planks_that_burn": "Prkna co hoří", + "tag.item.c.stripped_logs": "Oloupané kmeny", + "tag.item.c.stripped_woods": "Oloupané dřevo" } diff --git a/client/src/main/resources/assets/traverse/lang/en_us.json b/client/src/main/resources/assets/traverse/lang/en_us.json index e78ea7d..fe23760 100644 --- a/client/src/main/resources/assets/traverse/lang/en_us.json +++ b/client/src/main/resources/assets/traverse/lang/en_us.json @@ -44,12 +44,45 @@ "block.traverse.fir_door": "Fir Door", "block.traverse.fir_trapdoor": "Fir Trapdoor", + "entity.traverse.fir_boat": "Fir Boat", + "entity.traverse.fir_chest_boat": "Fir Boat with Chest", + "itemGroup.traverse.items": "Traverse Items", + "item.traverse.red_autumnal_leaves": "Red Autumnal Leaves", + "item.traverse.brown_autumnal_leaves": "Brown Autumnal Leaves", + "item.traverse.orange_autumnal_leaves": "Orange Autumnal Leaves", + "item.traverse.yellow_autumnal_leaves": "Yellow Autumnal Leaves", + + "item.traverse.red_autumnal_sapling": "Red Autumnal Sapling", + "item.traverse.brown_autumnal_sapling": "Brown Autumnal Sapling", + "item.traverse.orange_autumnal_sapling": "Orange Autumnal Sapling", + "item.traverse.yellow_autumnal_sapling": "Yellow Autumnal Sapling", + + "item.traverse.fir_log": "Fir Log", + "item.traverse.stripped_fir_log": "Stripped Fir Log", + "item.traverse.stripped_fir_wood": "Stripped Fir Wood", + "item.traverse.fir_wood": "Fir Wood", + "item.traverse.fir_leaves": "Fir Leaves", + "item.traverse.fir_sapling": "Fir Sapling", + "item.traverse.potted_fir_sapling": "Potted Fir Sapling", + "item.traverse.fir_planks": "Fir Planks", + "item.traverse.fir_stairs": "Fir Stairs", + "item.traverse.fir_slab": "Fir Slab", + "item.traverse.fir_sign": "Fir Sign", + "item.traverse.fir_hanging_sign": "Fir Hanging Sign", + "item.traverse.fir_button": "Fir Button", + "item.traverse.fir_pressure_plate": "Fir Pressure Plate", + "item.traverse.fir_fence": "Fir Fence", + "item.traverse.fir_fence_gate": "Fir Fence Gate", + "item.traverse.fir_door": "Fir Door", + "item.traverse.fir_trapdoor": "Fir Trapdoor", + "item.traverse.fir_boat": "Fir Boat", "item.traverse.fir_chest_boat": "Fir Boat with Chest", "tag.item.traverse.fir_logs": "Fir Logs", + "tag.item.c.planks_that_burn": "Planks that Burn", "tag.item.c.stripped_logs": "Stripped Logs", - "tag.item.c.stripped_wood": "Stripped Wood" + "tag.item.c.stripped_woods": "Stripped Woods" } diff --git a/client/src/main/resources/assets/traverse/lang/es_ar.json b/client/src/main/resources/assets/traverse/lang/es_ar.json index c36a5cc..4695b60 100644 --- a/client/src/main/resources/assets/traverse/lang/es_ar.json +++ b/client/src/main/resources/assets/traverse/lang/es_ar.json @@ -1,6 +1,4 @@ { - "itemGroup.traverse.items": "Objetos de Traverse", - "biome.traverse.arid_highlands": "Tierras elevadas áridas", "biome.traverse.autumnal_woods": "Bosque otoñal", "biome.traverse.coniferous_forest": "Bosque de coníferas", @@ -43,5 +41,35 @@ "block.traverse.fir_fence_gate": "Puerta de valla de abeto gigante", "block.traverse.fir_door": "Puerta de abeto gigante", "block.traverse.fir_trapdoor": "Escotilla de abeto gigante", + + "itemGroup.traverse.items": "Objetos de Traverse", + "item.traverse.red_autumnal_leaves": "Hojas otoñales rojas", + "item.traverse.brown_autumnal_leaves": "Hojas otoñales marrones", + "item.traverse.orange_autumnal_leaves": "Hojas otoñales naranjas", + "item.traverse.yellow_autumnal_leaves": "Hojas otoñales amarillas", + + "item.traverse.red_autumnal_sapling": "Brote otoñal rojo", + "item.traverse.brown_autumnal_sapling": "Brote otoñal marrón", + "item.traverse.orange_autumnal_sapling": "Brote otoñal naranja", + "item.traverse.yellow_autumnal_sapling": "Brote otoñal amarillo", + + "item.traverse.fir_log": "Tronco de abeto gigante", + "item.traverse.stripped_fir_log": "Tronco de abeto gigante sin corteza", + "item.traverse.stripped_fir_wood": "Leño de abeto gigante sin corteza", + "item.traverse.fir_wood": "Leño de abeto gigante", + "item.traverse.fir_leaves": "Hojas de abeto gigante", + "item.traverse.fir_sapling": "Brote de abeto gigante", + "item.traverse.potted_fir_sapling": "Maceta con brote de abeto gigante", + "item.traverse.fir_planks": "Madera de abeto gigante", + "item.traverse.fir_stairs": "Escaleras de abeto gigante", + "item.traverse.fir_slab": "Baldosa de abeto gigante", + "item.traverse.fir_sign": "Cartel de abeto gigante", + "item.traverse.fir_button": "Botón de abeto gigante", + "item.traverse.fir_pressure_plate": "Placa de presón de abeto gigante", + "item.traverse.fir_fence": "Valla de abeto gigante", + "item.traverse.fir_fence_gate": "Puerta de valla de abeto gigante", + "item.traverse.fir_door": "Puerta de abeto gigante", + "item.traverse.fir_trapdoor": "Escotilla de abeto gigante", + "item.traverse.fir_boat": "Bote de abeto gigante" } diff --git a/client/src/main/resources/assets/traverse/lang/es_es.json b/client/src/main/resources/assets/traverse/lang/es_es.json index e412b18..4f2df1f 100644 --- a/client/src/main/resources/assets/traverse/lang/es_es.json +++ b/client/src/main/resources/assets/traverse/lang/es_es.json @@ -1,6 +1,4 @@ { - "itemGroup.traverse.items": "Objetos de Traverse", - "biome.traverse.arid_highlands": "Tierras elevadas áridas", "biome.traverse.autumnal_woods": "Bosque otoñal", "biome.traverse.coniferous_forest": "Bosque de coníferas", @@ -43,5 +41,35 @@ "block.traverse.fir_fence_gate": "Puerta de valla de abeto gigante", "block.traverse.fir_door": "Puerta de abeto gigante", "block.traverse.fir_trapdoor": "Trampilla de abeto gigante", + + "itemGroup.traverse.items": "Objetos de Traverse", + "item.traverse.red_autumnal_leaves": "Hojas otoñales rojas", + "item.traverse.brown_autumnal_leaves": "Hojas otoñales marrones", + "item.traverse.orange_autumnal_leaves": "Hojas otoñales naranjas", + "item.traverse.yellow_autumnal_leaves": "Hojas otoñales amarillas", + + "item.traverse.red_autumnal_sapling": "Brote otoñal rojo", + "item.traverse.brown_autumnal_sapling": "Brote otoñal marrón", + "item.traverse.orange_autumnal_sapling": "Brote otoñal naranja", + "item.traverse.yellow_autumnal_sapling": "Brote otoñal amarillo", + + "item.traverse.fir_log": "Tronco de abeto gigante", + "item.traverse.stripped_fir_log": "Tronco de abeto gigante sin corteza", + "item.traverse.stripped_fir_wood": "Leño de abeto gigante sin corteza", + "item.traverse.fir_wood": "Leño de abeto gigante", + "item.traverse.fir_leaves": "Hojas de abeto gigante", + "item.traverse.fir_sapling": "Brote de abeto gigante", + "item.traverse.potted_fir_sapling": "Maceta con brote de abeto gigante", + "item.traverse.fir_planks": "Madera de abeto gigante", + "item.traverse.fir_stairs": "Escaleras de abeto gigante", + "item.traverse.fir_slab": "Losa de abeto gigante", + "item.traverse.fir_sign": "Cartel de abeto gigante", + "item.traverse.fir_button": "Botón de abeto gigante", + "item.traverse.fir_pressure_plate": "Placa de presón de abeto gigante", + "item.traverse.fir_fence": "Valla de abeto gigante", + "item.traverse.fir_fence_gate": "Puerta de valla de abeto gigante", + "item.traverse.fir_door": "Puerta de abeto gigante", + "item.traverse.fir_trapdoor": "Trampilla de abeto gigante", + "item.traverse.fir_boat": "Barca de abeto gigante" } diff --git a/client/src/main/resources/assets/traverse/lang/es_mx.json b/client/src/main/resources/assets/traverse/lang/es_mx.json index 25d2465..5222742 100644 --- a/client/src/main/resources/assets/traverse/lang/es_mx.json +++ b/client/src/main/resources/assets/traverse/lang/es_mx.json @@ -1,6 +1,4 @@ { - "itemGroup.traverse.items": "Objetos de Traverse", - "biome.traverse.arid_highlands": "Tierras elevadas áridas", "biome.traverse.autumnal_woods": "Bosque otoñal", "biome.traverse.coniferous_forest": "Bosque de coníferas", @@ -43,5 +41,35 @@ "block.traverse.fir_fence_gate": "Puerta de valla de abeto gigante", "block.traverse.fir_door": "Puerta de abeto gigante", "block.traverse.fir_trapdoor": "Trampilla de abeto gigante", + + "itemGroup.traverse.items": "Objetos de Traverse", + "item.traverse.red_autumnal_leaves": "Hojas otoñales rojas", + "item.traverse.brown_autumnal_leaves": "Hojas otoñales cafés", + "item.traverse.orange_autumnal_leaves": "Hojas otoñales naranjas", + "item.traverse.yellow_autumnal_leaves": "Hojas otoñales amarillas", + + "item.traverse.red_autumnal_sapling": "Retoño otoñal rojo", + "item.traverse.brown_autumnal_sapling": "Retoño otoñal café", + "item.traverse.orange_autumnal_sapling": "Retoño otoñal naranja", + "item.traverse.yellow_autumnal_sapling": "Retoño otoñal amarillo", + + "item.traverse.fir_log": "Tronco de abeto gigante", + "item.traverse.stripped_fir_log": "Tronco de abeto gigante sin corteza", + "item.traverse.stripped_fir_wood": "Leño de abeto gigante sin corteza", + "item.traverse.fir_wood": "Leño de abeto gigante", + "item.traverse.fir_leaves": "Hojas de abeto gigante", + "item.traverse.fir_sapling": "Retoño de abeto gigante", + "item.traverse.potted_fir_sapling": "Maceta con retoño de abeto gigante", + "item.traverse.fir_planks": "Madera de abeto gigante", + "item.traverse.fir_stairs": "Escaleras de abeto gigante", + "item.traverse.fir_slab": "Losa de abeto gigante", + "item.traverse.fir_sign": "Letrero de abeto gigante", + "item.traverse.fir_button": "Botón de abeto gigante", + "item.traverse.fir_pressure_plate": "Placa de presón de abeto gigante", + "item.traverse.fir_fence": "Valla de abeto gigante", + "item.traverse.fir_fence_gate": "Puerta de valla de abeto gigante", + "item.traverse.fir_door": "Puerta de abeto gigante", + "item.traverse.fir_trapdoor": "Trampilla de abeto gigante", + "item.traverse.fir_boat": "Bote de abeto gigante" } diff --git a/client/src/main/resources/assets/traverse/lang/fr_fr.json b/client/src/main/resources/assets/traverse/lang/fr_fr.json index 7c21777..8e0dea7 100644 --- a/client/src/main/resources/assets/traverse/lang/fr_fr.json +++ b/client/src/main/resources/assets/traverse/lang/fr_fr.json @@ -1,6 +1,4 @@ { - "itemGroup.traverse.items": "Objets de Traverse", - "biome.traverse.arid_highlands": "Hautes terres arides", "biome.traverse.autumnal_woods": "Bois automnaux", "biome.traverse.coniferous_forest": "Forêt de conifères", @@ -43,5 +41,35 @@ "block.traverse.fir_fence_gate": "Portillon en épicéa", "block.traverse.fir_door": "Porte en épicéa", "block.traverse.fir_trapdoor": "Trappe en épicéa", + + "itemGroup.traverse.items": "Objets de Traverse", + "item.traverse.red_autumnal_leaves": "Feuilles automnales rouges", + "item.traverse.brown_autumnal_leaves": "Feuilles automnales brunes", + "item.traverse.orange_autumnal_leaves": "Feuilles automnales oranges", + "item.traverse.yellow_autumnal_leaves": "Feuilles automnales jaunes", + + "item.traverse.red_autumnal_sapling": "Pousse automnale rouge", + "item.traverse.brown_autumnal_sapling": "Pousse automnale brune", + "item.traverse.orange_autumnal_sapling": "Pousse automnale orange", + "item.traverse.yellow_autumnal_sapling": "Pousse automnale jaune", + + "item.traverse.fir_log": "Bûche d'épicéa", + "item.traverse.stripped_fir_log": "Bûche d'épicéa écorcée", + "item.traverse.stripped_fir_wood": "Bois d'épicéa écorcé", + "item.traverse.fir_wood": "Bois d'épicéa", + "item.traverse.fir_leaves": "Feuilles d'épicéa", + "item.traverse.fir_sapling": "Pousse d'épicéa", + "item.traverse.potted_fir_sapling": "Pousse d'épicéa en pot", + "item.traverse.fir_planks": "Planches d'épicéa", + "item.traverse.fir_stairs": "Escalier en épicéa", + "item.traverse.fir_slab": "Dalle en épicéa", + "item.traverse.fir_sign": "Pancarte en épicéa", + "item.traverse.fir_button": "Bouton en épicéa", + "item.traverse.fir_pressure_plate": "Plaque de pression en épicéa", + "item.traverse.fir_fence": "Barrière en épicéa", + "item.traverse.fir_fence_gate": "Portillon en épicéa", + "item.traverse.fir_door": "Porte en épicéa", + "item.traverse.fir_trapdoor": "Trappe en épicéa", + "item.traverse.fir_boat": "Bateau en épicéa" } diff --git a/client/src/main/resources/assets/traverse/lang/it_it.json b/client/src/main/resources/assets/traverse/lang/it_it.json index dbe8fa1..ecb05bd 100644 --- a/client/src/main/resources/assets/traverse/lang/it_it.json +++ b/client/src/main/resources/assets/traverse/lang/it_it.json @@ -1,6 +1,4 @@ { - "itemGroup.traverse.items": "Oggetti di Traverse", - "biome.traverse.arid_highlands": "Altopiani aridi", "biome.traverse.autumnal_woods": "Boschi autunnali", "biome.traverse.coniferous_forest": "Foresta di conifere", @@ -43,5 +41,35 @@ "block.traverse.fir_fence_gate": "Cancelletto di cedro", "block.traverse.fir_door": "Porta di cedro", "block.traverse.fir_trapdoor": "Botola di cedro", + + "itemGroup.traverse.items": "Oggetti di Traverse", + "item.traverse.red_autumnal_leaves": "Foglie autunnali rosse", + "item.traverse.brown_autumnal_leaves": "Foglie autunnali marroni", + "item.traverse.orange_autumnal_leaves": "Foglie autunnali arancioni", + "item.traverse.yellow_autumnal_leaves": "Foglie autunnali gialle", + + "item.traverse.red_autumnal_sapling": "Arboscello autunnale rosso", + "item.traverse.brown_autumnal_sapling": "Arboscello autunnale marrone", + "item.traverse.orange_autumnal_sapling": "Arboscello autunnale arancione", + "item.traverse.yellow_autumnal_sapling": "Arboscello autunnale giallo", + + "item.traverse.fir_log": "Tronco di cedro", + "item.traverse.stripped_fir_log": "Tronco di cedro scortecciato", + "item.traverse.stripped_fir_wood": "Legno di cedro scortecciato", + "item.traverse.fir_wood": "Legno di cedro", + "item.traverse.fir_leaves": "Foglie di cedro", + "item.traverse.fir_sapling": "Arboscello di cedro", + "item.traverse.potted_fir_sapling": "Arboscello di cedro nel vaso", + "item.traverse.fir_planks": "Assi di cedro", + "item.traverse.fir_stairs": "Scalini di cedro", + "item.traverse.fir_slab": "Lastra di cedro", + "item.traverse.fir_sign": "Cartello di cedro", + "item.traverse.fir_button": "Pulsante di cedro", + "item.traverse.fir_pressure_plate": "Pedana a pressione di cedro", + "item.traverse.fir_fence": "Staccionata di cedro", + "item.traverse.fir_fence_gate": "Cancelletto di cedro", + "item.traverse.fir_door": "Porta di cedro", + "item.traverse.fir_trapdoor": "Botola di cedro", + "item.traverse.fir_boat": "Barca di cedro" } diff --git a/client/src/main/resources/assets/traverse/lang/pl_pl.json b/client/src/main/resources/assets/traverse/lang/pl_pl.json index a6652e8..2b253c7 100644 --- a/client/src/main/resources/assets/traverse/lang/pl_pl.json +++ b/client/src/main/resources/assets/traverse/lang/pl_pl.json @@ -1,6 +1,4 @@ { - "itemGroup.traverse.items": "Traverse Items", - "biome.traverse.arid_highlands": "Jałowe wyżyny", "biome.traverse.autumnal_woods": "Jesienne lasy", "biome.traverse.coniferous_forest": "Las iglasty", @@ -43,5 +41,35 @@ "block.traverse.fir_fence_gate": "Jodłowa furtka", "block.traverse.fir_door": "Jodłowe drzwi", "block.traverse.fir_trapdoor": "Jodłowa klapa", + + "itemGroup.traverse.items": "Traverse Items", + "item.traverse.red_autumnal_leaves": "Czerwone jesienne liście", + "item.traverse.brown_autumnal_leaves": "Brązowe jesienne liście", + "item.traverse.orange_autumnal_leaves": "Pomarańczowe jesienne liście", + "item.traverse.yellow_autumnal_leaves": "Żółte jesienne liście", + + "item.traverse.red_autumnal_sapling": "Czerwona jesienna sadzonka", + "item.traverse.brown_autumnal_sapling": "Brązowa jesienna sadzonka", + "item.traverse.orange_autumnal_sapling": "Pomarańczowa jesienna sadzonka", + "item.traverse.yellow_autumnal_sapling": "Żółta jesienna sadzonka", + + "item.traverse.fir_log": "Jodłowy pień", + "item.traverse.stripped_fir_log": "Okorowany jodłowy pień", + "item.traverse.stripped_fir_wood": "Okorowane jodłowe drewno", + "item.traverse.fir_wood": "Jodłowe drewno", + "item.traverse.fir_leaves": "Jodłowe liście", + "item.traverse.fir_sapling": "Sadzonka jodły", + "item.traverse.potted_fir_sapling": "Doniczkowa jodłowa sadzonka", + "item.traverse.fir_planks": "Jodłowe deski", + "item.traverse.fir_stairs": "Jodłowe schody", + "item.traverse.fir_slab": "Jodłowa płyta", + "item.traverse.fir_sign": "Jodłowa tabliczka", + "item.traverse.fir_button": "Jodłowy przycisk", + "item.traverse.fir_pressure_plate": "Jodłowa płyta naciskowa", + "item.traverse.fir_fence": "Jodłowy płot", + "item.traverse.fir_fence_gate": "Jodłowa furtka", + "item.traverse.fir_door": "Jodłowe drzwi", + "item.traverse.fir_trapdoor": "Jodłowa klapa", + "item.traverse.fir_boat": "Jodłowa łódka" } diff --git a/client/src/main/resources/assets/traverse/lang/pt_br.json b/client/src/main/resources/assets/traverse/lang/pt_br.json index babaa91..df6ca69 100644 --- a/client/src/main/resources/assets/traverse/lang/pt_br.json +++ b/client/src/main/resources/assets/traverse/lang/pt_br.json @@ -1,6 +1,4 @@ { - "itemGroup.traverse.items": "Traverse", - "biome.traverse.arid_highlands": "Altiplano árido", "biome.traverse.autumnal_woods": "Bosque sasonal", "biome.traverse.coniferous_forest": "Floresta de coníferas", @@ -43,5 +41,35 @@ "block.traverse.fir_fence_gate": "Portão de abeto", "block.traverse.fir_door": "Porta de abeto", "block.traverse.fir_trapdoor": "Alçapão de abeto", + + "itemGroup.traverse.items": "Traverse", + "item.traverse.red_autumnal_leaves": "Folhas sasonais vermelhas", + "item.traverse.brown_autumnal_leaves": "Folhas sasonais marrons", + "item.traverse.orange_autumnal_leaves": "Folhas sasonais laranjas", + "item.traverse.yellow_autumnal_leaves": "Folhas sasonais amarelas", + + "item.traverse.red_autumnal_sapling": "Muda sasonal vermelha", + "item.traverse.brown_autumnal_sapling": "Muda sasonal marrom", + "item.traverse.orange_autumnal_sapling": "Muda sasonal laranja", + "item.traverse.yellow_autumnal_sapling": "Muda sasonal amarela", + + "item.traverse.fir_log": "Tronco de abeto", + "item.traverse.stripped_fir_log": "Tronco de abeto descascado", + "item.traverse.stripped_fir_wood": "Madeira de abeto descascada", + "item.traverse.fir_wood": "Madeira de abeto", + "item.traverse.fir_leaves": "Folhas de abeto", + "item.traverse.fir_sapling": "Muda de abeto", + "item.traverse.potted_fir_sapling": "Muda de abeto envasada", + "item.traverse.fir_planks": "Tábuas de abeto", + "item.traverse.fir_stairs": "Escadas de abeto", + "item.traverse.fir_slab": "Laje de abeto", + "item.traverse.fir_sign": "Placa dea beto", + "item.traverse.fir_button": "Botão de abeto", + "item.traverse.fir_pressure_plate": "Placa de pressão de abeto", + "item.traverse.fir_fence": "Cerca de abeto", + "item.traverse.fir_fence_gate": "Portão de abeto", + "item.traverse.fir_door": "Porta de abeto", + "item.traverse.fir_trapdoor": "Alçapão de abeto", + "item.traverse.fir_boat": "Bote de abeto" } diff --git a/client/src/main/resources/assets/traverse/lang/ru_ru.json b/client/src/main/resources/assets/traverse/lang/ru_ru.json index 8160842..1d494b5 100644 --- a/client/src/main/resources/assets/traverse/lang/ru_ru.json +++ b/client/src/main/resources/assets/traverse/lang/ru_ru.json @@ -1,6 +1,4 @@ { - "itemGroup.traverse.items": "Предметы Traverse", - "biome.traverse.arid_highlands": "Засушливое нагорье", "biome.traverse.autumnal_woods": "Осенние леса", "biome.traverse.coniferous_forest": "Хвойный лес", @@ -45,10 +43,43 @@ "block.traverse.fir_fence_gate": "Калитка из пихты", "block.traverse.fir_door": "Дверь из пихты", "block.traverse.fir_trapdoor": "Люк из пихты", + + "itemGroup.traverse.items": "Предметы Traverse", + "item.traverse.red_autumnal_leaves": "Красные осенние листья", + "item.traverse.brown_autumnal_leaves": "Коричневые осенние листья", + "item.traverse.orange_autumnal_leaves": "Оранжевые осенние листья", + "item.traverse.yellow_autumnal_leaves": "Желтые осенние листья", + + "item.traverse.red_autumnal_sapling": "Саженец красного осеннего дерева", + "item.traverse.brown_autumnal_sapling": "Саженец коричневого осеннего дерева", + "item.traverse.orange_autumnal_sapling": "Саженец оранжевого осеннего дерева", + "item.traverse.yellow_autumnal_sapling": "Саженец желтого осеннего дерева", + + "item.traverse.fir_log": "Бревно пихты", + "item.traverse.stripped_fir_log": "Обтёсанное бревно пихты", + "item.traverse.stripped_fir_wood": "Обтёсанная древесина пихты", + "item.traverse.fir_wood": "Древесина пихты", + "item.traverse.fir_leaves": "Листья пихты", + "item.traverse.fir_sapling": "Саженец пихты", + "item.traverse.potted_fir_sapling": "Саженец пихты в горшке", + "item.traverse.fir_planks": "Доски пихты", + "item.traverse.fir_stairs": "Ступеньки из пихты", + "item.traverse.fir_slab": "Плита из пихты", + "item.traverse.fir_sign": "Табличка из пихты", + "item.traverse.fir_hanging_sign": "Подвесная табличка из пихты", + "item.traverse.fir_button": "Кнопка из пихты", + "item.traverse.fir_pressure_plate": "Нажимная плита из пихты", + "item.traverse.fir_fence": "Забор из пихты", + "item.traverse.fir_fence_gate": "Калитка из пихты", + "item.traverse.fir_door": "Дверь из пихты", + "item.traverse.fir_trapdoor": "Люк из пихты", + "item.traverse.fir_boat": "Лодка из пихты", "item.traverse.fir_chest_boat": "Грузовая лодка из пихты", + "tag.item.traverse.fir_logs": "Брёвна пихты", + "tag.item.c.planks_that_burn": "Горючие доски", "tag.item.c.stripped_logs": "Обтёсанные брёвна", - "tag.item.c.stripped_wood": "Обтёсанная древесина" + "tag.item.c.stripped_woods": "Обтёсанная древесина" } diff --git a/client/src/main/resources/assets/traverse/lang/tr_tr.json b/client/src/main/resources/assets/traverse/lang/tr_tr.json index b375b2f..3a911c0 100644 --- a/client/src/main/resources/assets/traverse/lang/tr_tr.json +++ b/client/src/main/resources/assets/traverse/lang/tr_tr.json @@ -1,6 +1,4 @@ { - "itemGroup.traverse.items": "Traverse Eşyaları", - "biome.traverse.arid_highlands": "Kurak Yaylalar", "biome.traverse.autumnal_woods": "Sonbahar Ormanı", "biome.traverse.coniferous_forest": "İğne Yapraklılar Ormanı", @@ -43,5 +41,35 @@ "block.traverse.fir_fence_gate": "Köknar Çit Kapısı", "block.traverse.fir_door": "Köknar Kapı", "block.traverse.fir_trapdoor": "Köknar Tuzak Kapısı", + + "itemGroup.traverse.items": "Traverse Eşyaları", + "item.traverse.red_autumnal_leaves": "Kırmızı Sonbahar Yaprakları", + "item.traverse.brown_autumnal_leaves": "Kahverengi Sonbahar Yaprakları", + "item.traverse.orange_autumnal_leaves": "Turuncu Sonbahar Yaprakları", + "item.traverse.yellow_autumnal_leaves": "Sarı Sonbahar Yaprakları", + + "item.traverse.red_autumnal_sapling": "Kırmızı Sonbahar Fidanı", + "item.traverse.brown_autumnal_sapling": "Kahverengi Sonbahar Fidanı", + "item.traverse.orange_autumnal_sapling": "Turuncu Sonbahar Fidanı", + "item.traverse.yellow_autumnal_sapling": "Sarı Sonbahar Fidanı", + + "item.traverse.fir_log": "Köknar Kütüğü", + "item.traverse.stripped_fir_log": "Soyulmuş Köknar Kütüğü", + "item.traverse.stripped_fir_wood": "Soyulmuş Köknar Odunu", + "item.traverse.fir_wood": "Köknar Odunu", + "item.traverse.fir_leaves": "Köknar Yaprakları", + "item.traverse.fir_sapling": "Köknar Fidanı", + "item.traverse.potted_fir_sapling": "Köknar Fidanı Saksısı", + "item.traverse.fir_planks": "Köknar Tahta", + "item.traverse.fir_stairs": "Köknar Merdiven", + "item.traverse.fir_slab": "Köknar Basamak", + "item.traverse.fir_sign": "Köknar Tabela", + "item.traverse.fir_button": "Köknar Düğme", + "item.traverse.fir_pressure_plate": "Köknar Basınç Plakası", + "item.traverse.fir_fence": "Köknar Çit", + "item.traverse.fir_fence_gate": "Köknar Çit Kapısı", + "item.traverse.fir_door": "Köknar Kapı", + "item.traverse.fir_trapdoor": "Köknar Tuzak Kapısı", + "item.traverse.fir_boat": "Köknar Tekne" } diff --git a/client/src/main/resources/assets/traverse/lang/uk_ua.json b/client/src/main/resources/assets/traverse/lang/uk_ua.json index c0bddaf..f9d580a 100644 --- a/client/src/main/resources/assets/traverse/lang/uk_ua.json +++ b/client/src/main/resources/assets/traverse/lang/uk_ua.json @@ -1,5 +1,4 @@ { - "itemGroup.traverse.items": "Предмети Traverse", "biome.traverse.arid_highlands": "Посушливі височини", "biome.traverse.autumnal_woods": "Осінній ліс", "biome.traverse.coniferous_forest": "Хвойний ліс", @@ -10,18 +9,22 @@ "biome.traverse.rolling_hills": "Пагорби", "biome.traverse.snowy_coniferous_forest": "Засніжений хвойний ліс", "biome.traverse.woodlands": "Лісиста місцевість", + "block.traverse.red_autumnal_leaves": "Червоне осіннє листя", "block.traverse.brown_autumnal_leaves": "Коричневе осіннє листя", "block.traverse.orange_autumnal_leaves": "Помаранчеве осіннє листя", "block.traverse.yellow_autumnal_leaves": "Жовте осіннє листя", + "block.traverse.red_autumnal_sapling": "Червоний осінній паросток", "block.traverse.brown_autumnal_sapling": "Коричневий осінній паросток", "block.traverse.orange_autumnal_sapling": "Помаранчевий осінній паросток", "block.traverse.yellow_autumnal_sapling": "Жовтий осінній паросток", + "block.traverse.potted_red_autumnal_sapling": "Червоний осінній паросток у горщику", "block.traverse.potted_brown_autumnal_sapling": "Коричневий осінній паросток у горщику", "block.traverse.potted_orange_autumnal_sapling": "Помаранчевий осінній паросток у горщику", "block.traverse.potted_yellow_autumnal_sapling": "Жовтий осінній паросток у горщику", + "block.traverse.fir_log": "Ялицева колода", "block.traverse.stripped_fir_log": "Обтесана ялицева колода", "block.traverse.stripped_fir_wood": "Обтесана ялицева деревина", @@ -40,6 +43,37 @@ "block.traverse.fir_fence_gate": "Ялицева хвіртка", "block.traverse.fir_door": "Ялицеві двері", "block.traverse.fir_trapdoor": "Ялицевий люк", + + "itemGroup.traverse.items": "Предмети Traverse", + "item.traverse.red_autumnal_leaves": "Червоне осіннє листя", + "item.traverse.brown_autumnal_leaves": "Коричневе осіннє листя", + "item.traverse.orange_autumnal_leaves": "Помаранчеве осіннє листя", + "item.traverse.yellow_autumnal_leaves": "Жовте осіннє листя", + + "item.traverse.red_autumnal_sapling": "Червоний осінній паросток", + "item.traverse.brown_autumnal_sapling": "Коричневий осінній паросток", + "item.traverse.orange_autumnal_sapling": "Помаранчевий осінній паросток", + "item.traverse.yellow_autumnal_sapling": "Жовтий осінній паросток", + + "item.traverse.fir_log": "Ялицева колода", + "item.traverse.stripped_fir_log": "Обтесана ялицева колода", + "item.traverse.stripped_fir_wood": "Обтесана ялицева деревина", + "item.traverse.fir_wood": "Ялицева деревина", + "item.traverse.fir_leaves": "Ялицеве листя", + "item.traverse.fir_sapling": "Паросток ялиці", + "item.traverse.potted_fir_sapling": "Паросток ялиці в горщику", + "item.traverse.fir_planks": "Ялицеві дошки", + "item.traverse.fir_stairs": "Ялицеві сходи", + "item.traverse.fir_slab": "Ялицева плита", + "item.traverse.fir_sign": "Ялицева табличка", + "item.traverse.fir_hanging_sign": "Ялицева вивіска", + "item.traverse.fir_button": "Ялицева кнопка", + "item.traverse.fir_pressure_plate": "Ялицева натискна плита", + "item.traverse.fir_fence": "Ялицевий паркан", + "item.traverse.fir_fence_gate": "Ялицева хвіртка", + "item.traverse.fir_door": "Ялицеві двері", + "item.traverse.fir_trapdoor": "Ялицевий люк", + "item.traverse.fir_boat": "Ялицевий човен", "item.traverse.fir_chest_boat": "Ялицевий човен зі скринею" } diff --git a/client/src/main/resources/assets/traverse/lang/zh_cn.json b/client/src/main/resources/assets/traverse/lang/zh_cn.json index 2296861..aa19fe4 100644 --- a/client/src/main/resources/assets/traverse/lang/zh_cn.json +++ b/client/src/main/resources/assets/traverse/lang/zh_cn.json @@ -1,6 +1,4 @@ { - "itemGroup.traverse.items": "遍历丨物品", - "biome.traverse.arid_highlands": "干旱高原", "biome.traverse.autumnal_woods": "秋树林", "biome.traverse.coniferous_forest": "针叶林", @@ -45,6 +43,37 @@ "block.traverse.fir_fence_gate": "冷杉木栅栏门", "block.traverse.fir_door": "冷杉木门", "block.traverse.fir_trapdoor": "冷杉木活板门", + + "itemGroup.traverse.items": "遍历丨物品", + "item.traverse.red_autumnal_leaves": "红色秋叶", + "item.traverse.brown_autumnal_leaves": "棕色秋叶", + "item.traverse.orange_autumnal_leaves": "橙色秋叶", + "item.traverse.yellow_autumnal_leaves": "黄色秋叶", + + "item.traverse.red_autumnal_sapling": "红色秋树苗", + "item.traverse.brown_autumnal_sapling": "棕色秋树苗", + "item.traverse.orange_autumnal_sapling": "橙色秋树苗", + "item.traverse.yellow_autumnal_sapling": "黄色秋树苗", + + "item.traverse.fir_log": "冷杉原木", + "item.traverse.stripped_fir_log": "去皮冷杉原木", + "item.traverse.stripped_fir_wood": "去皮冷杉木", + "item.traverse.fir_wood": "冷杉木", + "item.traverse.fir_leaves": "冷杉树叶", + "item.traverse.fir_sapling": "冷杉树苗", + "item.traverse.potted_fir_sapling": "冷杉树苗盆栽", + "item.traverse.fir_planks": "冷杉木板", + "item.traverse.fir_stairs": "冷杉木楼梯", + "item.traverse.fir_slab": "冷杉木台阶", + "item.traverse.fir_sign": "冷杉木告示牌", + "item.traverse.fir_hanging_sign": "悬挂式冷杉木告示牌", + "item.traverse.fir_button": "冷杉木按钮", + "item.traverse.fir_pressure_plate": "冷杉木压力板", + "item.traverse.fir_fence": "冷杉木栅栏", + "item.traverse.fir_fence_gate": "冷杉木栅栏门", + "item.traverse.fir_door": "冷杉木门", + "item.traverse.fir_trapdoor": "冷杉木活板门", + "item.traverse.fir_boat": "冷杉木船", "item.traverse.fir_chest_boat": "冷杉木运输船" } diff --git a/common/src/main/java/com/terraformersmc/traverse/Traverse.java b/common/src/main/java/com/terraformersmc/traverse/Traverse.java index 2660d8d..1921d80 100644 --- a/common/src/main/java/com/terraformersmc/traverse/Traverse.java +++ b/common/src/main/java/com/terraformersmc/traverse/Traverse.java @@ -4,7 +4,7 @@ import com.terraformersmc.traverse.config.TraverseConfigManager; import com.terraformersmc.traverse.feature.placer.TraversePlacerTypes; import com.terraformersmc.traverse.init.TraverseTrades; -import com.terraformersmc.traverse.item.TraverseBoatTypes; +import com.terraformersmc.traverse.boat.TraverseBoats; import com.terraformersmc.traverse.item.TraverseItemGroups; import com.terraformersmc.traverse.item.TraverseItems; import com.terraformersmc.traverse.villager.TraverseVillagerTypes; @@ -22,12 +22,12 @@ public class Traverse implements ModInitializer { private static final TraverseConfigManager CONFIG_MANAGER = new TraverseConfigManager(); private static Boolean initialized = false; - private static final ArrayList runnables = new ArrayList<>(1); + private static final ArrayList RUNNABLES = new ArrayList<>(1); private static void register() { TraverseBlocks.register(); TraverseItems.register(); - TraverseBoatTypes.register(); + TraverseBoats.register(); TraverseTrades.register(); TraverseVillagerTypes.register(); TraversePlacerTypes.register(); @@ -47,7 +47,7 @@ public void onInitialize() { // At this point Traverse is completely initialized. initialized = true; - for (Runnable callback : runnables) { + for (Runnable callback : RUNNABLES) { callback.run(); } } @@ -56,7 +56,7 @@ public static void callbackWhenInitialized(Runnable callback) { if (initialized) { callback.run(); } else { - runnables.add(callback); + RUNNABLES.add(callback); } } diff --git a/common/src/main/java/com/terraformersmc/traverse/block/TraverseBlocks.java b/common/src/main/java/com/terraformersmc/traverse/block/TraverseBlocks.java index d7d77d6..77ccbf6 100644 --- a/common/src/main/java/com/terraformersmc/traverse/block/TraverseBlocks.java +++ b/common/src/main/java/com/terraformersmc/traverse/block/TraverseBlocks.java @@ -57,45 +57,45 @@ public class TraverseBlocks { public static Block POTTED_FIR_SAPLING; public static void register() { - RED_AUTUMNAL_LEAVES = TraverseRegistry.register("red_autumnal_leaves", new LeavesBlock(AbstractBlock.Settings.copy(Blocks.OAK_LEAVES).mapColor(MapColor.TERRACOTTA_RED).allowsSpawning(TraverseBlocks::canSpawnOnLeaves).suffocates(TraverseBlocks::never).blockVision(TraverseBlocks::never))); - RED_AUTUMNAL_SAPLING = TraverseRegistry.register("red_autumnal_sapling", new SaplingBlock(new SaplingGenerator("red_autumnal", Optional.empty(), Optional.of(TraverseConfiguredFeatures.RED_AUTUMNAL_TREE), Optional.empty()), SaplingBlock.Settings.copy(Blocks.OAK_SAPLING).mapColor(MapColor.TERRACOTTA_RED))); - BROWN_AUTUMNAL_LEAVES = TraverseRegistry.register("brown_autumnal_leaves", new LeavesBlock(AbstractBlock.Settings.copy(Blocks.OAK_LEAVES).mapColor(MapColor.TERRACOTTA_BROWN).allowsSpawning(TraverseBlocks::canSpawnOnLeaves).suffocates(TraverseBlocks::never).blockVision(TraverseBlocks::never))); - BROWN_AUTUMNAL_SAPLING = TraverseRegistry.register("brown_autumnal_sapling", new SaplingBlock(new SaplingGenerator("brown_autumnal", Optional.empty(), Optional.of(TraverseConfiguredFeatures.BROWN_AUTUMNAL_TREE), Optional.empty()), SaplingBlock.Settings.copy(Blocks.OAK_SAPLING).mapColor(MapColor.TERRACOTTA_BROWN))); - ORANGE_AUTUMNAL_LEAVES = TraverseRegistry.register("orange_autumnal_leaves", new LeavesBlock(AbstractBlock.Settings.copy(Blocks.OAK_LEAVES).mapColor(MapColor.TERRACOTTA_ORANGE).allowsSpawning(TraverseBlocks::canSpawnOnLeaves).suffocates(TraverseBlocks::never).blockVision(TraverseBlocks::never))); - ORANGE_AUTUMNAL_SAPLING = TraverseRegistry.register("orange_autumnal_sapling", new SaplingBlock(new SaplingGenerator("orange_autumnal", Optional.empty(), Optional.of(TraverseConfiguredFeatures.ORANGE_AUTUMNAL_TREE), Optional.empty()), SaplingBlock.Settings.copy(Blocks.OAK_SAPLING).mapColor(MapColor.TERRACOTTA_ORANGE))); - YELLOW_AUTUMNAL_LEAVES = TraverseRegistry.register("yellow_autumnal_leaves", new LeavesBlock(AbstractBlock.Settings.copy(Blocks.OAK_LEAVES).mapColor(MapColor.TERRACOTTA_YELLOW).allowsSpawning(TraverseBlocks::canSpawnOnLeaves).suffocates(TraverseBlocks::never).blockVision(TraverseBlocks::never))); - YELLOW_AUTUMNAL_SAPLING = TraverseRegistry.register("yellow_autumnal_sapling", new SaplingBlock(new SaplingGenerator("yellow_autumnal", Optional.empty(), Optional.of(TraverseConfiguredFeatures.YELLOW_AUTUMNAL_TREE), Optional.empty()), SaplingBlock.Settings.copy(Blocks.OAK_SAPLING).mapColor(MapColor.TERRACOTTA_YELLOW))); - - FIR_LEAVES = TraverseRegistry.register("fir_leaves", new LeavesBlock(AbstractBlock.Settings.copy(Blocks.OAK_LEAVES).allowsSpawning(TraverseBlocks::canSpawnOnLeaves).suffocates(TraverseBlocks::never).blockVision(TraverseBlocks::never))); - FIR_SAPLING = TraverseRegistry.register("fir_sapling", new SaplingBlock(new SaplingGenerator("fir", Optional.empty(), Optional.of(TraverseConfiguredFeatures.FIR_TREE), Optional.empty()), SaplingBlock.Settings.copy(Blocks.OAK_SAPLING))); - - FIR_LOG = TraverseRegistry.register("fir_log", PillarLogHelper.of(MapColor.OAK_TAN, MapColor.BROWN)); - FIR_WOOD = TraverseRegistry.register("fir_wood", PillarLogHelper.of(MapColor.BROWN)); - STRIPPED_FIR_LOG = TraverseRegistry.register("stripped_fir_log", PillarLogHelper.of(MapColor.OAK_TAN)); - STRIPPED_FIR_WOOD = TraverseRegistry.register("stripped_fir_wood", PillarLogHelper.of(MapColor.OAK_TAN)); - FIR_PLANKS = TraverseRegistry.register("fir_planks", new Block(AbstractBlock.Settings.copy(Blocks.OAK_PLANKS))); - FIR_SLAB = TraverseRegistry.register("fir_slab", new SlabBlock(AbstractBlock.Settings.copy(Blocks.OAK_SLAB))); - FIR_PRESSURE_PLATE = TraverseRegistry.register("fir_pressure_plate", new PressurePlateBlock(BlockSetType.OAK, AbstractBlock.Settings.copy(Blocks.OAK_PRESSURE_PLATE))); - FIR_FENCE = TraverseRegistry.register("fir_fence", new FenceBlock(AbstractBlock.Settings.copy(Blocks.OAK_FENCE))); - FIR_TRAPDOOR = TraverseRegistry.register("fir_trapdoor", new TrapdoorBlock(BlockSetType.OAK, AbstractBlock.Settings.copy(Blocks.OAK_TRAPDOOR))); - FIR_FENCE_GATE = TraverseRegistry.register("fir_fence_gate", new FenceGateBlock(WoodType.OAK, AbstractBlock.Settings.copy(Blocks.OAK_FENCE_GATE))); - FIR_STAIRS = TraverseRegistry.register("fir_stairs", new StairsBlock(FIR_PLANKS.getDefaultState(), AbstractBlock.Settings.copy(Blocks.OAK_STAIRS))); - FIR_BUTTON = TraverseRegistry.register("fir_button", new ButtonBlock(BlockSetType.OAK, 30, AbstractBlock.Settings.copy(Blocks.OAK_BUTTON))); - FIR_DOOR = TraverseRegistry.register("fir_door", new DoorBlock(BlockSetType.OAK, AbstractBlock.Settings.copy(Blocks.OAK_DOOR))); + RED_AUTUMNAL_LEAVES = TraverseRegistry.register("red_autumnal_leaves", LeavesBlock::new, AbstractBlock.Settings.copy(Blocks.OAK_LEAVES).mapColor(MapColor.TERRACOTTA_RED).allowsSpawning(TraverseBlocks::canSpawnOnLeaves).suffocates(TraverseBlocks::never).blockVision(TraverseBlocks::never)); + RED_AUTUMNAL_SAPLING = TraverseRegistry.register("red_autumnal_sapling", settings -> new SaplingBlock(new SaplingGenerator("red_autumnal", Optional.empty(), Optional.of(TraverseConfiguredFeatures.RED_AUTUMNAL_TREE), Optional.empty()), settings), SaplingBlock.Settings.copy(Blocks.OAK_SAPLING).mapColor(MapColor.TERRACOTTA_RED)); + BROWN_AUTUMNAL_LEAVES = TraverseRegistry.register("brown_autumnal_leaves", LeavesBlock::new, AbstractBlock.Settings.copy(Blocks.OAK_LEAVES).mapColor(MapColor.TERRACOTTA_BROWN).allowsSpawning(TraverseBlocks::canSpawnOnLeaves).suffocates(TraverseBlocks::never).blockVision(TraverseBlocks::never)); + BROWN_AUTUMNAL_SAPLING = TraverseRegistry.register("brown_autumnal_sapling", settings -> new SaplingBlock(new SaplingGenerator("brown_autumnal", Optional.empty(), Optional.of(TraverseConfiguredFeatures.BROWN_AUTUMNAL_TREE), Optional.empty()), settings), SaplingBlock.Settings.copy(Blocks.OAK_SAPLING).mapColor(MapColor.TERRACOTTA_BROWN)); + ORANGE_AUTUMNAL_LEAVES = TraverseRegistry.register("orange_autumnal_leaves", LeavesBlock::new, AbstractBlock.Settings.copy(Blocks.OAK_LEAVES).mapColor(MapColor.TERRACOTTA_ORANGE).allowsSpawning(TraverseBlocks::canSpawnOnLeaves).suffocates(TraverseBlocks::never).blockVision(TraverseBlocks::never)); + ORANGE_AUTUMNAL_SAPLING = TraverseRegistry.register("orange_autumnal_sapling", settings -> new SaplingBlock(new SaplingGenerator("orange_autumnal", Optional.empty(), Optional.of(TraverseConfiguredFeatures.ORANGE_AUTUMNAL_TREE), Optional.empty()), settings), SaplingBlock.Settings.copy(Blocks.OAK_SAPLING).mapColor(MapColor.TERRACOTTA_ORANGE)); + YELLOW_AUTUMNAL_LEAVES = TraverseRegistry.register("yellow_autumnal_leaves", LeavesBlock::new, AbstractBlock.Settings.copy(Blocks.OAK_LEAVES).mapColor(MapColor.TERRACOTTA_YELLOW).allowsSpawning(TraverseBlocks::canSpawnOnLeaves).suffocates(TraverseBlocks::never).blockVision(TraverseBlocks::never)); + YELLOW_AUTUMNAL_SAPLING = TraverseRegistry.register("yellow_autumnal_sapling", settings -> new SaplingBlock(new SaplingGenerator("yellow_autumnal", Optional.empty(), Optional.of(TraverseConfiguredFeatures.YELLOW_AUTUMNAL_TREE), Optional.empty()), settings), SaplingBlock.Settings.copy(Blocks.OAK_SAPLING).mapColor(MapColor.TERRACOTTA_YELLOW)); + + FIR_LEAVES = TraverseRegistry.register("fir_leaves", LeavesBlock::new, AbstractBlock.Settings.copy(Blocks.OAK_LEAVES).allowsSpawning(TraverseBlocks::canSpawnOnLeaves).suffocates(TraverseBlocks::never).blockVision(TraverseBlocks::never)); + FIR_SAPLING = TraverseRegistry.register("fir_sapling", settings -> new SaplingBlock(new SaplingGenerator("fir", Optional.empty(), Optional.of(TraverseConfiguredFeatures.FIR_TREE), Optional.empty()), settings), SaplingBlock.Settings.copy(Blocks.OAK_SAPLING)); + + FIR_LOG = TraverseRegistry.register("fir_log", PillarBlock::new, PillarLogHelper.createSettings(MapColor.OAK_TAN, MapColor.BROWN)); + FIR_WOOD = TraverseRegistry.register("fir_wood", PillarBlock::new, PillarLogHelper.createSettings(MapColor.BROWN)); + STRIPPED_FIR_LOG = TraverseRegistry.register("stripped_fir_log", PillarBlock::new, PillarLogHelper.createSettings(MapColor.OAK_TAN)); + STRIPPED_FIR_WOOD = TraverseRegistry.register("stripped_fir_wood", PillarBlock::new, PillarLogHelper.createSettings(MapColor.OAK_TAN)); + FIR_PLANKS = TraverseRegistry.register("fir_planks", Block::new, AbstractBlock.Settings.copy(Blocks.OAK_PLANKS)); + FIR_SLAB = TraverseRegistry.register("fir_slab", SlabBlock::new, AbstractBlock.Settings.copy(Blocks.OAK_SLAB)); + FIR_PRESSURE_PLATE = TraverseRegistry.register("fir_pressure_plate", settings -> new PressurePlateBlock(BlockSetType.OAK, settings), AbstractBlock.Settings.copy(Blocks.OAK_PRESSURE_PLATE)); + FIR_FENCE = TraverseRegistry.register("fir_fence", FenceBlock::new, AbstractBlock.Settings.copy(Blocks.OAK_FENCE)); + FIR_TRAPDOOR = TraverseRegistry.register("fir_trapdoor", settings -> new TrapdoorBlock(BlockSetType.OAK, settings), AbstractBlock.Settings.copy(Blocks.OAK_TRAPDOOR)); + FIR_FENCE_GATE = TraverseRegistry.register("fir_fence_gate", settings -> new FenceGateBlock(WoodType.OAK, settings), AbstractBlock.Settings.copy(Blocks.OAK_FENCE_GATE)); + FIR_STAIRS = TraverseRegistry.register("fir_stairs", settings -> new StairsBlock(FIR_PLANKS.getDefaultState(), settings), AbstractBlock.Settings.copy(Blocks.OAK_STAIRS)); + FIR_BUTTON = TraverseRegistry.register("fir_button", settings -> new ButtonBlock(BlockSetType.OAK, 30, settings), AbstractBlock.Settings.copy(Blocks.OAK_BUTTON)); + FIR_DOOR = TraverseRegistry.register("fir_door", settings -> new DoorBlock(BlockSetType.OAK, settings), AbstractBlock.Settings.copy(Blocks.OAK_DOOR)); final Identifier FIR_SIGN_TEXTURE = Identifier.of(Traverse.MOD_ID, "entity/signs/fir"); - FIR_SIGN = TraverseRegistry.register("fir_sign", new TerraformSignBlock(FIR_SIGN_TEXTURE, AbstractBlock.Settings.copy(Blocks.OAK_SIGN))); - FIR_WALL_SIGN = TraverseRegistry.register("fir_wall_sign", new TerraformWallSignBlock(FIR_SIGN_TEXTURE, AbstractBlock.Settings.copy(Blocks.OAK_WALL_SIGN).dropsLike(FIR_SIGN))); + FIR_SIGN = TraverseRegistry.register("fir_sign", settings -> new TerraformSignBlock(FIR_SIGN_TEXTURE, settings), AbstractBlock.Settings.copy(Blocks.OAK_SIGN)); + FIR_WALL_SIGN = TraverseRegistry.register("fir_wall_sign", settings -> new TerraformWallSignBlock(FIR_SIGN_TEXTURE, settings), AbstractBlock.Settings.copy(Blocks.OAK_WALL_SIGN).lootTable(FIR_SIGN.getLootTableKey())); final Identifier FIR_HANGING_SIGN_TEXTURE = Identifier.of(Traverse.MOD_ID, "entity/signs/hanging/fir"); final Identifier FIR_HANGING_SIGN_GUI_TEXTURE = Identifier.of(Traverse.MOD_ID, "textures/gui/hanging_signs/fir"); - FIR_HANGING_SIGN = TraverseRegistry.register("fir_hanging_sign", new TerraformHangingSignBlock(FIR_HANGING_SIGN_TEXTURE, FIR_HANGING_SIGN_GUI_TEXTURE, AbstractBlock.Settings.copy(Blocks.OAK_HANGING_SIGN))); - FIR_WALL_HANGING_SIGN = TraverseRegistry.register("fir_wall_hanging_sign", new TerraformWallHangingSignBlock(FIR_HANGING_SIGN_TEXTURE, FIR_HANGING_SIGN_GUI_TEXTURE, AbstractBlock.Settings.copy(Blocks.OAK_WALL_HANGING_SIGN).dropsLike(FIR_HANGING_SIGN))); - - POTTED_RED_AUTUMNAL_SAPLING = TraverseRegistry.register("potted_red_autumnal_sapling", new FlowerPotBlock(RED_AUTUMNAL_SAPLING, AbstractBlock.Settings.copy(Blocks.POTTED_OAK_SAPLING))); - POTTED_BROWN_AUTUMNAL_SAPLING = TraverseRegistry.register("potted_brown_autumnal_sapling", new FlowerPotBlock(BROWN_AUTUMNAL_SAPLING, AbstractBlock.Settings.copy(Blocks.POTTED_OAK_SAPLING))); - POTTED_ORANGE_AUTUMNAL_SAPLING = TraverseRegistry.register("potted_orange_autumnal_sapling", new FlowerPotBlock(ORANGE_AUTUMNAL_SAPLING, AbstractBlock.Settings.copy(Blocks.POTTED_OAK_SAPLING))); - POTTED_YELLOW_AUTUMNAL_SAPLING = TraverseRegistry.register("potted_yellow_autumnal_sapling", new FlowerPotBlock(YELLOW_AUTUMNAL_SAPLING, AbstractBlock.Settings.copy(Blocks.POTTED_OAK_SAPLING))); - POTTED_FIR_SAPLING = TraverseRegistry.register("potted_fir_sapling", new FlowerPotBlock(FIR_SAPLING, AbstractBlock.Settings.copy(Blocks.POTTED_OAK_SAPLING))); + FIR_HANGING_SIGN = TraverseRegistry.register("fir_hanging_sign", settings -> new TerraformHangingSignBlock(FIR_HANGING_SIGN_TEXTURE, FIR_HANGING_SIGN_GUI_TEXTURE, settings), AbstractBlock.Settings.copy(Blocks.OAK_HANGING_SIGN)); + FIR_WALL_HANGING_SIGN = TraverseRegistry.register("fir_wall_hanging_sign", settings -> new TerraformWallHangingSignBlock(FIR_HANGING_SIGN_TEXTURE, FIR_HANGING_SIGN_GUI_TEXTURE, settings), AbstractBlock.Settings.copy(Blocks.OAK_WALL_HANGING_SIGN).lootTable(FIR_HANGING_SIGN.getLootTableKey())); + + POTTED_RED_AUTUMNAL_SAPLING = TraverseRegistry.register("potted_red_autumnal_sapling", settings -> new FlowerPotBlock(RED_AUTUMNAL_SAPLING, settings), AbstractBlock.Settings.copy(Blocks.POTTED_OAK_SAPLING)); + POTTED_BROWN_AUTUMNAL_SAPLING = TraverseRegistry.register("potted_brown_autumnal_sapling", settings -> new FlowerPotBlock(BROWN_AUTUMNAL_SAPLING, settings), AbstractBlock.Settings.copy(Blocks.POTTED_OAK_SAPLING)); + POTTED_ORANGE_AUTUMNAL_SAPLING = TraverseRegistry.register("potted_orange_autumnal_sapling", settings -> new FlowerPotBlock(ORANGE_AUTUMNAL_SAPLING, settings), AbstractBlock.Settings.copy(Blocks.POTTED_OAK_SAPLING)); + POTTED_YELLOW_AUTUMNAL_SAPLING = TraverseRegistry.register("potted_yellow_autumnal_sapling", settings -> new FlowerPotBlock(YELLOW_AUTUMNAL_SAPLING, settings), AbstractBlock.Settings.copy(Blocks.POTTED_OAK_SAPLING)); + POTTED_FIR_SAPLING = TraverseRegistry.register("potted_fir_sapling", settings -> new FlowerPotBlock(FIR_SAPLING, settings), AbstractBlock.Settings.copy(Blocks.POTTED_OAK_SAPLING)); addFlammables(); addStrippables(); diff --git a/common/src/main/java/com/terraformersmc/traverse/boat/TraverseBoats.java b/common/src/main/java/com/terraformersmc/traverse/boat/TraverseBoats.java new file mode 100644 index 0000000..5ddea4f --- /dev/null +++ b/common/src/main/java/com/terraformersmc/traverse/boat/TraverseBoats.java @@ -0,0 +1,15 @@ +package com.terraformersmc.traverse.boat; + +import com.terraformersmc.terraform.boat.api.item.TerraformBoatItemHelper; +import com.terraformersmc.traverse.Traverse; +import net.minecraft.item.Item; +import net.minecraft.util.Identifier; + +public class TraverseBoats { + public static final Identifier FIR = Identifier.of(Traverse.MOD_ID, "fir"); + public static final Item FIR_BOAT = TerraformBoatItemHelper.registerBoatItem(FIR, false); + public static final Item FIR_CHEST_BOAT = TerraformBoatItemHelper.registerBoatItem(FIR, true); + + public static void register() { + } +} diff --git a/common/src/main/java/com/terraformersmc/traverse/data/TraverseBlockLootTableProvider.java b/common/src/main/java/com/terraformersmc/traverse/data/TraverseBlockLootTableProvider.java index 1acef83..330e1e0 100644 --- a/common/src/main/java/com/terraformersmc/traverse/data/TraverseBlockLootTableProvider.java +++ b/common/src/main/java/com/terraformersmc/traverse/data/TraverseBlockLootTableProvider.java @@ -17,7 +17,7 @@ protected TraverseBlockLootTableProvider(FabricDataOutput output, CompletableFut @Override public void generate() { //noinspection unused - RegistryWrapper.Impl enchantmentRegistry = this.registryLookup.getWrapperOrThrow(RegistryKeys.ENCHANTMENT); + RegistryWrapper.Impl enchantmentRegistry = this.registries.getOrThrow(RegistryKeys.ENCHANTMENT); // simple blocks addDrop(TraverseBlocks.BROWN_AUTUMNAL_SAPLING); diff --git a/common/src/main/java/com/terraformersmc/traverse/data/TraverseDynamicRegistryProvider.java b/common/src/main/java/com/terraformersmc/traverse/data/TraverseDynamicRegistryProvider.java index f9e00f2..a123abb 100644 --- a/common/src/main/java/com/terraformersmc/traverse/data/TraverseDynamicRegistryProvider.java +++ b/common/src/main/java/com/terraformersmc/traverse/data/TraverseDynamicRegistryProvider.java @@ -27,9 +27,9 @@ public static void buildRegistry(RegistryBuilder registryBuilder) { @Override public void configure(RegistryWrapper.WrapperLookup registries, Entries entries) { - addAll(entries, registries.getWrapperOrThrow(RegistryKeys.CONFIGURED_FEATURE), Traverse.MOD_ID); - addAll(entries, registries.getWrapperOrThrow(RegistryKeys.PLACED_FEATURE), Traverse.MOD_ID); - addAll(entries, registries.getWrapperOrThrow(RegistryKeys.BIOME), Traverse.MOD_ID); + addAll(entries, registries.getOrThrow(RegistryKeys.CONFIGURED_FEATURE), Traverse.MOD_ID); + addAll(entries, registries.getOrThrow(RegistryKeys.PLACED_FEATURE), Traverse.MOD_ID); + addAll(entries, registries.getOrThrow(RegistryKeys.BIOME), Traverse.MOD_ID); } @Override diff --git a/common/src/main/java/com/terraformersmc/traverse/data/TraverseItemTagProvider.java b/common/src/main/java/com/terraformersmc/traverse/data/TraverseItemTagProvider.java index eea62e4..f782c52 100644 --- a/common/src/main/java/com/terraformersmc/traverse/data/TraverseItemTagProvider.java +++ b/common/src/main/java/com/terraformersmc/traverse/data/TraverseItemTagProvider.java @@ -1,6 +1,6 @@ package com.terraformersmc.traverse.data; -import com.terraformersmc.traverse.item.TraverseBoatTypes; +import com.terraformersmc.traverse.boat.TraverseBoats; import com.terraformersmc.traverse.tag.TraverseBlockTags; import com.terraformersmc.traverse.tag.TraverseItemTags; import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput; @@ -19,10 +19,10 @@ protected TraverseItemTagProvider(FabricDataOutput output, CompletableFuture getDfuBoatIds() { + return Set.of("traverse:fir_boat", "traverse:fir_chest_boat"); + } +} diff --git a/common/src/main/java/com/terraformersmc/traverse/init/helpers/TraverseRegistry.java b/common/src/main/java/com/terraformersmc/traverse/init/helpers/TraverseRegistry.java index ead9981..642f98f 100644 --- a/common/src/main/java/com/terraformersmc/traverse/init/helpers/TraverseRegistry.java +++ b/common/src/main/java/com/terraformersmc/traverse/init/helpers/TraverseRegistry.java @@ -1,6 +1,7 @@ package com.terraformersmc.traverse.init.helpers; import com.terraformersmc.traverse.Traverse; +import net.minecraft.block.AbstractBlock; import net.minecraft.block.Block; import net.minecraft.item.BlockItem; import net.minecraft.item.Item; @@ -10,10 +11,11 @@ import net.minecraft.world.gen.placementmodifier.PlacementModifier; import java.util.List; +import java.util.function.Function; public class TraverseRegistry { @SuppressWarnings("UnnecessaryReturnStatement") - public TraverseRegistry() { + private TraverseRegistry() { return; } @@ -29,33 +31,41 @@ public TraverseRegistry() { * @return Newly created {@link BlockItem} */ public static BlockItem registerBlockItem(String name, Block block) { - BlockItem item = new BlockItem(block, new Item.Settings()); - return register(name, item); + return register(name, settings -> new BlockItem(block, settings), new Item.Settings()); } /** * Registers an item. * * @param name Name ({@link Identifier} path string) of the item - * @param item {@link Item} to be registered + * @param factory Factory function to create {@link Item} from settings + * @param settings {@link Item.Settings} of the item * @return Newly registered {@link Item} */ - public static I register(String name, I item) { + public static I register(String name, Function factory, Item.Settings settings) { + RegistryKey key = RegistryKey.of(RegistryKeys.ITEM, Identifier.of(Traverse.MOD_ID, name)); + I item = factory.apply(settings.registryKey(key)); + if (item instanceof BlockItem blockItem) { blockItem.appendBlocks(Item.BLOCK_ITEMS, blockItem); } - return Registry.register(Registries.ITEM, Identifier.of(Traverse.MOD_ID, name), item); + + return Registry.register(Registries.ITEM, key, item); } /** * Registers a block. * * @param name Name ({@link Identifier} path string) of the block - * @param block {@link Block} to be registered + * @param factory Factory function to create {@link Block} from settings + * @param settings {@link AbstractBlock.Settings} of the block * @return Newly registered {@link Block} */ - public static B register(String name, B block) { - return Registry.register(Registries.BLOCK, Identifier.of(Traverse.MOD_ID, name), block); + public static B register(String name, Function factory, AbstractBlock.Settings settings) { + RegistryKey key = RegistryKey.of(RegistryKeys.BLOCK, Identifier.of(Traverse.MOD_ID, name)); + B block = factory.apply(settings.registryKey(key)); + + return Registry.register(Registries.BLOCK, key, block); } /* diff --git a/common/src/main/java/com/terraformersmc/traverse/item/TraverseBoatTypes.java b/common/src/main/java/com/terraformersmc/traverse/item/TraverseBoatTypes.java deleted file mode 100644 index ac5c922..0000000 --- a/common/src/main/java/com/terraformersmc/traverse/item/TraverseBoatTypes.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.terraformersmc.traverse.item; - -import com.terraformersmc.terraform.boat.api.TerraformBoatType; -import com.terraformersmc.terraform.boat.api.TerraformBoatTypeRegistry; -import com.terraformersmc.terraform.boat.api.item.TerraformBoatItemHelper; -import com.terraformersmc.traverse.Traverse; -import com.terraformersmc.traverse.block.TraverseBlocks; -import net.minecraft.item.Item; -import net.minecraft.registry.Registry; -import net.minecraft.registry.RegistryKey; -import net.minecraft.util.Identifier; - -public class TraverseBoatTypes { - public static Item FIR_BOAT; - public static Item FIR_CHEST_BOAT; - - public static void register() { - final Identifier FIR_BOAT_ID = Identifier.of(Traverse.MOD_ID, "fir_boat"); - final Identifier FIR_CHEST_BOAT_ID = Identifier.of(Traverse.MOD_ID, "fir_chest_boat"); - final RegistryKey FIR_BOAT_KEY = TerraformBoatTypeRegistry.createKey(Identifier.of(Traverse.MOD_ID, "fir")); - - FIR_BOAT = TerraformBoatItemHelper.registerBoatItem(FIR_BOAT_ID, FIR_BOAT_KEY, false); - FIR_CHEST_BOAT = TerraformBoatItemHelper.registerBoatItem(FIR_CHEST_BOAT_ID, FIR_BOAT_KEY, true); - - TerraformBoatType FIR = new TerraformBoatType.Builder() - .item(FIR_BOAT) - .chestItem(FIR_CHEST_BOAT) - .planks(TraverseBlocks.FIR_PLANKS.asItem()) - .build(); - - Registry.register(TerraformBoatTypeRegistry.INSTANCE, FIR_BOAT_KEY, FIR); - } -} diff --git a/common/src/main/java/com/terraformersmc/traverse/item/TraverseItemGroups.java b/common/src/main/java/com/terraformersmc/traverse/item/TraverseItemGroups.java index b17f146..02979dd 100644 --- a/common/src/main/java/com/terraformersmc/traverse/item/TraverseItemGroups.java +++ b/common/src/main/java/com/terraformersmc/traverse/item/TraverseItemGroups.java @@ -2,6 +2,7 @@ import com.terraformersmc.traverse.Traverse; import com.terraformersmc.traverse.block.TraverseBlocks; +import com.terraformersmc.traverse.boat.TraverseBoats; import net.fabricmc.fabric.api.itemgroup.v1.FabricItemGroup; import net.fabricmc.fabric.api.itemgroup.v1.ItemGroupEvents; import net.minecraft.item.*; @@ -101,8 +102,8 @@ public class TraverseItemGroups { // TOOLS // Boats - addGroupEntry(TraverseBoatTypes.FIR_BOAT, ItemGroups.TOOLS, TOOLS_BOAT); - addGroupEntry(TraverseBoatTypes.FIR_CHEST_BOAT, ItemGroups.TOOLS, TOOLS_BOAT); + addGroupEntry(TraverseBoats.FIR_BOAT, ItemGroups.TOOLS, TOOLS_BOAT); + addGroupEntry(TraverseBoats.FIR_CHEST_BOAT, ItemGroups.TOOLS, TOOLS_BOAT); // COMBAT diff --git a/common/src/main/java/com/terraformersmc/traverse/item/TraverseItems.java b/common/src/main/java/com/terraformersmc/traverse/item/TraverseItems.java index 17f6809..87ecb8b 100644 --- a/common/src/main/java/com/terraformersmc/traverse/item/TraverseItems.java +++ b/common/src/main/java/com/terraformersmc/traverse/item/TraverseItems.java @@ -3,7 +3,7 @@ import com.terraformersmc.traverse.block.TraverseBlocks; import com.terraformersmc.traverse.init.helpers.TraverseRegistry; import net.fabricmc.fabric.api.registry.CompostingChanceRegistry; -import net.fabricmc.fabric.api.registry.FuelRegistry; +import net.fabricmc.fabric.api.registry.FuelRegistryEvents; import net.minecraft.item.*; public class TraverseItems { @@ -63,8 +63,8 @@ public static void register() { FIR_BUTTON = TraverseRegistry.registerBlockItem("fir_button", TraverseBlocks.FIR_BUTTON); FIR_DOOR = TraverseRegistry.registerBlockItem("fir_door", TraverseBlocks.FIR_DOOR); - FIR_SIGN = TraverseRegistry.register("fir_sign", new SignItem(new Item.Settings().maxCount(16), TraverseBlocks.FIR_SIGN, TraverseBlocks.FIR_WALL_SIGN)); - FIR_HANGING_SIGN = TraverseRegistry.register("fir_hanging_sign", new HangingSignItem(TraverseBlocks.FIR_HANGING_SIGN, TraverseBlocks.FIR_WALL_HANGING_SIGN, new Item.Settings().maxCount(16))); + FIR_SIGN = TraverseRegistry.register("fir_sign", settings -> new SignItem(TraverseBlocks.FIR_SIGN, TraverseBlocks.FIR_WALL_SIGN, settings), new Item.Settings().maxCount(16)); + FIR_HANGING_SIGN = TraverseRegistry.register("fir_hanging_sign", settings -> new HangingSignItem(TraverseBlocks.FIR_HANGING_SIGN, TraverseBlocks.FIR_WALL_HANGING_SIGN, settings), new Item.Settings().maxCount(16)); addCompostables(); addFuels(); @@ -88,9 +88,9 @@ private static void addCompostables() { } private static void addFuels() { - FuelRegistry fuelRegistry = FuelRegistry.INSTANCE; - - fuelRegistry.add(FIR_FENCE, 300); - fuelRegistry.add(FIR_FENCE_GATE, 300); + FuelRegistryEvents.BUILD.register((builder, context) -> { + builder.add(FIR_FENCE, 300); + builder.add(FIR_FENCE_GATE, 300); + }); } } diff --git a/common/src/main/resources/fabric.mod.json b/common/src/main/resources/fabric.mod.json index 16683f9..e100da0 100644 --- a/common/src/main/resources/fabric.mod.json +++ b/common/src/main/resources/fabric.mod.json @@ -13,7 +13,10 @@ "terraform-biome-remapper": [ "com.terraformersmc.traverse.biome.TraverseBiomeRemappings" ], - "fabric-datagen": [ + "terraform-boat-dfu": [ + "com.terraformersmc.traverse.init.helpers.TraverseBoatDfu" + ], + "fabric-datagen": [ "com.terraformersmc.traverse.data.TraverseDatagen" ] }, diff --git a/gradle.properties b/gradle.properties index bcc9f9c..b518891 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,24 +1,20 @@ org.gradle.jvmargs=-Xmx1G -fabric.loom.multiProjectOptimisation=true maven_group=com.terraformersmc archive_name=traverse -minecraft_version=1.21 -yarn_mappings=1.21+build.2 -loader_version=0.15.11 -fabric_version=0.100.4+1.21 -terraform_biome_remapper_api_version=11.0.0 -terraform_config_api_version=11.0.0 -terraform_surfaces_api_version=11.0.0 -terraform_tree_api_version=11.0.0 -terraform_wood_api_version=11.0.0 +minecraft_version=1.21.2 +yarn_mappings=1.21.2+build.1 +loader_version=0.16.7 +fabric_version=0.106.1+1.21.2 +terraform_biome_remapper_api_version=12.0.0-alpha.1 +terraform_config_api_version=12.0.0-alpha.1 +terraform_surfaces_api_version=12.0.0-alpha.1 +terraform_tree_api_version=12.0.0-alpha.1 +terraform_wood_api_version=12.0.0-alpha.1 # Biolith for worldgen module and testing -biolith_version=3.0.0 - -# TerraBlender for worldgen module and testing -terrablender_version=1.21-4.0.0.1 +biolith_version=3.1.0-beta.1 # Project Metadata project_name=Traverse @@ -31,14 +27,14 @@ default_release_type=alpha # CurseForge Metadata curseforge_slug=traverse curseforge_id=308777 -curseforge_game_versions=1.21, 1.21.1, Fabric, Quilt +curseforge_game_versions=1.21.2, 1.21.3, Fabric, Quilt curseforge_required_dependencies=fabric-api curseforge_optional_dependencies= # Modrinth Metadata modrinth_slug=traverse modrinth_id=kXygSBVI -modrinth_game_versions=1.21, 1.21.1 +modrinth_game_versions=1.21.2, 1.21.3 modrinth_mod_loaders=fabric, quilt modrinth_required_dependencies=fabric-api #modrinth_embedded_dependencies=biolith diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 99b1b79..50cb36a 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -14,7 +14,7 @@ "depends": { "fabricloader": ">=0.15.3", "fabric-api": ">=0.77.0", - "minecraft": ">=1.21 <1.21.2", + "minecraft": ">=1.21.2 <1.22", "java": ">=21" }, "authors": [ diff --git a/worldgen/build.gradle b/worldgen/build.gradle index 5f0ac74..31f5e03 100644 --- a/worldgen/build.gradle +++ b/worldgen/build.gradle @@ -5,9 +5,8 @@ loom { } dependencies { - // Biolith and TerraBlender for the worldgen API modules + // Biolith for the worldgen API module modImplementation "com.terraformersmc:biolith-fabric:${biolith_version}" - modCompileOnly "com.github.glitchfiend:TerraBlender-fabric:${terrablender_version}" implementation project(path: ':traverse-common') } diff --git a/worldgen/src/main/java/com/terraformersmc/traverse/biomegen/TraverseTerraBlenderGeneration.java b/worldgen/src/main/java/com/terraformersmc/traverse/biomegen/TraverseTerraBlenderGeneration.java deleted file mode 100644 index 7eb1ada..0000000 --- a/worldgen/src/main/java/com/terraformersmc/traverse/biomegen/TraverseTerraBlenderGeneration.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.terraformersmc.traverse.biomegen; - -import com.mojang.datafixers.util.Pair; -import com.terraformersmc.traverse.Traverse; -import com.terraformersmc.traverse.config.TraverseBiomeConfig; -import com.terraformersmc.traverse.surfacerules.TraverseSurfaceRules; -import net.minecraft.registry.Registry; -import net.minecraft.registry.RegistryKey; -import net.minecraft.util.Identifier; -import net.minecraft.world.biome.Biome; -import net.minecraft.world.biome.BiomeKeys; -import net.minecraft.world.biome.source.util.MultiNoiseUtil; -import terrablender.api.*; - -import java.util.function.Consumer; - -import static com.terraformersmc.traverse.biome.TraverseBiomes.*; - -public class TraverseTerraBlenderGeneration extends Region implements Runnable, TerraBlenderApi { - TraverseBiomeConfig BIOME_CONFIG; - - public TraverseTerraBlenderGeneration() { - super(Identifier.of(Traverse.MOD_ID, "overworld"), RegionType.OVERWORLD, 5); - } - - @Override - public void addBiomes(Registry registry, Consumer>> mapper) { - this.addModifiedVanillaOverworldBiomes(mapper, builder -> { - if (BIOME_CONFIG.isBiomeEnabled(AUTUMNAL_WOODS)) { builder.replaceBiome(BiomeKeys.FOREST, AUTUMNAL_WOODS); } - if (BIOME_CONFIG.isBiomeEnabled(CONIFEROUS_FOREST)) { builder.replaceBiome(BiomeKeys.TAIGA, CONIFEROUS_FOREST); } - if (BIOME_CONFIG.isBiomeEnabled(DESERT_SHRUBLAND)) { builder.replaceBiome(BiomeKeys.DESERT, DESERT_SHRUBLAND); } - if (BIOME_CONFIG.isBiomeEnabled(FLATLANDS)) { builder.replaceBiome(BiomeKeys.PLAINS, FLATLANDS); } - if (BIOME_CONFIG.isBiomeEnabled(LUSH_SWAMP)) { builder.replaceBiome(BiomeKeys.SWAMP, LUSH_SWAMP); } - if (BIOME_CONFIG.isBiomeEnabled(SNOWY_CONIFEROUS_FOREST)) { builder.replaceBiome(BiomeKeys.SNOWY_TAIGA, SNOWY_CONIFEROUS_FOREST); } - if (BIOME_CONFIG.isBiomeEnabled(WOODLANDS)) { builder.replaceBiome(BiomeKeys.BIRCH_FOREST, WOODLANDS); } - }); - } - - @Override - public void onTerraBlenderInitialized() { - // We can't do registration stuff until both Traverse and TerraBlender are ready. - // The run() method below will be called when Traverse is done initializing. - //Traverse.callbackWhenInitialized(TraverseSurfaceBuilders::init); - Traverse.callbackWhenInitialized(this); - } - - // Initialize TerraBlender as our biome placement provider. - @Override - public void run() { - // Register the Traverse surface rules; this must happen before we call addSurfaceRules(). - TraverseSurfaceRules.register(); - - // Add the Traverse Overworld surface rules via TerraBlender. - SurfaceRuleManager.addSurfaceRules(SurfaceRuleManager.RuleCategory.OVERWORLD, Traverse.MOD_ID, TraverseSurfaceRules.createRules()); - - // Register the Traverse surface builders. - //TraverseSurfaceBuilders.getBuilders().forEach(SurfaceGeneration::addSurfaceBuilder); - - // Add the biomes to Overworld generation via TerraBlender. - BIOME_CONFIG = Traverse.getConfigManager().getBiomeConfig(); - Regions.register(this); - } -} diff --git a/worldgen/src/main/resources/fabric.mod.json b/worldgen/src/main/resources/fabric.mod.json index a8af2bb..6d2f28d 100644 --- a/worldgen/src/main/resources/fabric.mod.json +++ b/worldgen/src/main/resources/fabric.mod.json @@ -20,6 +20,6 @@ } }, "depends": { - "biolith": ">=1.2.0-beta.1" + "biolith": ">=3.0.0" } }