Skip to content

Commit

Permalink
Minor updates for 1.19.2.
Browse files Browse the repository at this point in the history
* Update dependencies
* Only provide one panorama after all
- Update the Vistas panorama for Traverse
* Revamped recipe gen now I know how
- Add some more biome tags for mod compatibility
  • Loading branch information
gniftygnome committed Sep 3, 2022
1 parent a421046 commit bcc7161
Show file tree
Hide file tree
Showing 26 changed files with 87 additions and 148 deletions.
8 changes: 4 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ allprojects {
apply plugin: 'eclipse'
apply plugin: 'maven-publish'
apply plugin: 'fabric-loom'
// apply plugin: 'io.github.juuxel.loom-quiltflower-mini'
apply plugin: 'io.github.juuxel.loom-quiltflower'

sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
Expand All @@ -55,9 +55,9 @@ allprojects {
}
}

// quiltflower {
// addToRuntimeClasspath.set(true)
// }
quiltflower {
addToRuntimeClasspath.set(true)
}

configurations {
dev {
Expand Down
26 changes: 0 additions & 26 deletions client/src/main/resources/assets/traverse/panoramas.json
Original file line number Diff line number Diff line change
@@ -1,30 +1,4 @@
{
"autumnal_woods_woodlands_and_rolling_hills": {
"musicSound": {
"sound": "minecraft:music.menu"
},
"cubemaps": [
{
"cubemapId": "traverse:textures/gui/panorama/autumnal_woodlands",
"visualControl": {
"addedY": 0.0
}
}
]
},
"coniferous": {
"musicSound": {
"sound": "minecraft:music.menu"
},
"cubemaps": [
{
"cubemapId": "traverse:textures/gui/panorama/coniferous",
"visualControl": {
"addedY": 0.0
}
}
]
},
"swamplands": {
"musicSound": {
"sound": "minecraft:music.menu"
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,12 @@ public TraverseBiomeTagProvider(FabricDataGenerator dataGenerator) {

@Override
protected void generateTags() {
// biome categories
/*
* Vanilla biome categories
*/
this.getOrCreateTagBuilder(TagKey.of(this.registry.getKey(), BiomeTags.ALLOWS_SURFACE_SLIME_SPAWNS.id()))
.add(TraverseBiomes.LUSH_SWAMP);

this.getOrCreateTagBuilder(TagKey.of(this.registry.getKey(), BiomeTags.IS_FOREST.id()))
.add(TraverseBiomes.AUTUMNAL_WOODS)
.add(TraverseBiomes.CONIFEROUS_FOREST)
Expand All @@ -25,16 +30,62 @@ protected void generateTags() {
this.getOrCreateTagBuilder(TagKey.of(this.registry.getKey(), BiomeTags.IS_TAIGA.id()))
.add(TraverseBiomes.SNOWY_CONIFEROUS_FOREST);

this.getOrCreateTagBuilder(TagKey.of(this.registry.getKey(), BiomeTags.SPAWNS_COLD_VARIANT_FROGS.id()))
.add(TraverseBiomes.SNOWY_CONIFEROUS_FOREST);

this.getOrCreateTagBuilder(TagKey.of(this.registry.getKey(), BiomeTags.SPAWNS_WARM_VARIANT_FROGS.id()))
.add(TraverseBiomes.DESERT_SHRUBLAND);

this.getOrCreateTagBuilder(TagKey.of(this.registry.getKey(), BiomeTags.WATER_ON_MAP_OUTLINES.id()))
.add(TraverseBiomes.LUSH_SWAMP);


/*
* Conventional biome categories
*/
this.getOrCreateTagBuilder(TagKey.of(this.registry.getKey(), ConventionalBiomeTags.CLIMATE_TEMPERATE.id()))
.add(TraverseBiomes.AUTUMNAL_WOODS)
.add(TraverseBiomes.CONIFEROUS_FOREST)
.add(TraverseBiomes.FLATLANDS)
.add(TraverseBiomes.LUSH_SWAMP)
.add(TraverseBiomes.WOODLANDS);

this.getOrCreateTagBuilder(TagKey.of(this.registry.getKey(), ConventionalBiomeTags.DESERT.id()))
.add(TraverseBiomes.DESERT_SHRUBLAND);

this.getOrCreateTagBuilder(TagKey.of(this.registry.getKey(), ConventionalBiomeTags.PLAINS.id()))
.add(TraverseBiomes.FLATLANDS);

this.getOrCreateTagBuilder(TagKey.of(this.registry.getKey(), ConventionalBiomeTags.IN_OVERWORLD.id()))
.add(TraverseBiomes.AUTUMNAL_WOODS)
.add(TraverseBiomes.CONIFEROUS_FOREST)
.add(TraverseBiomes.DESERT_SHRUBLAND)
.add(TraverseBiomes.FLATLANDS)
.add(TraverseBiomes.LUSH_SWAMP)
.add(TraverseBiomes.SNOWY_CONIFEROUS_FOREST)
.add(TraverseBiomes.WOODLANDS);

this.getOrCreateTagBuilder(TagKey.of(this.registry.getKey(), ConventionalBiomeTags.SNOWY.id()))
.add(TraverseBiomes.SNOWY_CONIFEROUS_FOREST);

this.getOrCreateTagBuilder(TagKey.of(this.registry.getKey(), ConventionalBiomeTags.SWAMP.id()))
.add(TraverseBiomes.LUSH_SWAMP);

// biome structure generation tags
this.getOrCreateTagBuilder(TagKey.of(this.registry.getKey(), ConventionalBiomeTags.TREE_CONIFEROUS.id()))
.add(TraverseBiomes.CONIFEROUS_FOREST);

this.getOrCreateTagBuilder(TagKey.of(this.registry.getKey(), ConventionalBiomeTags.TREE_DECIDUOUS.id()))
.add(TraverseBiomes.AUTUMNAL_WOODS)
.add(TraverseBiomes.LUSH_SWAMP)
.add(TraverseBiomes.WOODLANDS);


/*
* Biome structure generation tags
*/
this.getOrCreateTagBuilder(TagKey.of(this.registry.getKey(), BiomeTags.IGLOO_HAS_STRUCTURE.id()))
.add(TraverseBiomes.SNOWY_CONIFEROUS_FOREST);

this.getOrCreateTagBuilder(TagKey.of(this.registry.getKey(), BiomeTags.MINESHAFT_HAS_STRUCTURE.id()))
.add(TraverseBiomes.DESERT_SHRUBLAND)
.add(TraverseBiomes.FLATLANDS)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ protected void generateBlockLootTables() {
addDrop(TraverseBlocks.YELLOW_AUTUMNAL_SAPLING);

// less simple blocks
addDrop(TraverseBlocks.FIR_DOOR, BlockLootTableGenerator::addDoorDrop);
addDrop(TraverseBlocks.FIR_DOOR, BlockLootTableGenerator::doorDrops);
addDrop(TraverseBlocks.FIR_SLAB, BlockLootTableGenerator::slabDrops);

// potted things
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,7 @@
import net.minecraft.advancement.criterion.InventoryChangedCriterion;
import net.minecraft.data.server.recipe.RecipeJsonProvider;
import net.minecraft.data.server.recipe.ShapedRecipeJsonBuilder;
import net.minecraft.data.server.recipe.ShapelessRecipeJsonBuilder;
import net.minecraft.item.Items;
import net.minecraft.predicate.item.ItemPredicate;
import net.minecraft.recipe.Ingredient;
import net.minecraft.util.Identifier;

import java.util.function.Consumer;
Expand All @@ -23,88 +21,40 @@ public TraverseRecipeProvider(FabricDataGenerator dataGenerator) {

@Override
protected void generateRecipes(Consumer<RecipeJsonProvider> exporter) {
FabricRecipeProvider.offerBoatRecipe(exporter, TraverseBoatTypes.fir.getItem(), TraverseBlocks.FIR_PLANKS);
FabricRecipeProvider.offerChestBoatRecipe(exporter, TraverseBoatTypes.fir.getChestItem(), TraverseBoatTypes.fir.getItem());
offerBoatRecipe(exporter, TraverseBoatTypes.fir.getItem(), TraverseBlocks.FIR_PLANKS);
offerChestBoatRecipe(exporter, TraverseBoatTypes.fir.getChestItem(), TraverseBoatTypes.fir.getItem());

new ShapelessRecipeJsonBuilder(TraverseBlocks.FIR_BUTTON, 1)
.group("wooden_button")
.input(TraverseBlocks.FIR_PLANKS)
.criterion("has_planks", InventoryChangedCriterion.Conditions.items(TraverseBlocks.FIR_PLANKS))
.offerTo(exporter, new Identifier(Traverse.MOD_ID, "fir_button"));

new ShapedRecipeJsonBuilder(TraverseBlocks.FIR_DOOR, 3)
.group("wooden_door")
.pattern("PP")
.pattern("PP")
.pattern("PP")
.input('P', TraverseBlocks.FIR_PLANKS)
.criterion("has_planks", InventoryChangedCriterion.Conditions.items(TraverseBlocks.FIR_PLANKS))
.offerTo(exporter, new Identifier(Traverse.MOD_ID, "fir_door"));

new ShapedRecipeJsonBuilder(TraverseBlocks.FIR_FENCE, 3)
.group("wooden_fence")
.pattern("PSP")
.pattern("PSP")
.input('P', TraverseBlocks.FIR_PLANKS)
.input('S', Items.STICK)
.criterion("has_planks", InventoryChangedCriterion.Conditions.items(TraverseBlocks.FIR_PLANKS))
.offerTo(exporter, new Identifier(Traverse.MOD_ID, "fir_fence"));

new ShapedRecipeJsonBuilder(TraverseBlocks.FIR_FENCE_GATE, 1)
.group("wooden_fence_gate")
.pattern("SPS")
.pattern("SPS")
.input('P', TraverseBlocks.FIR_PLANKS)
.input('S', Items.STICK)
offerSingleOutputShapelessRecipe(exporter, TraverseBlocks.FIR_BUTTON, TraverseBlocks.FIR_PLANKS, "wooden_button");

createDoorRecipe(TraverseBlocks.FIR_DOOR, Ingredient.ofItems(TraverseBlocks.FIR_PLANKS))
.criterion("has_planks", InventoryChangedCriterion.Conditions.items(TraverseBlocks.FIR_PLANKS))
.offerTo(exporter, new Identifier(Traverse.MOD_ID, "fir_fence_gate"));

new ShapelessRecipeJsonBuilder(TraverseBlocks.FIR_PLANKS, 4)
.group("planks")
.input(TraverseItemTags.FIR_LOGS)
.criterion("has_logs", InventoryChangedCriterion.Conditions.items(ItemPredicate.Builder.create().tag(TraverseItemTags.FIR_LOGS).build()))
.offerTo(exporter, new Identifier(Traverse.MOD_ID, "fir_planks"));

new ShapedRecipeJsonBuilder(TraverseBlocks.FIR_PRESSURE_PLATE, 1)
.group("wooden_pressure_plate")
.pattern("PP")
.input('P', TraverseBlocks.FIR_PLANKS)
.offerTo(exporter);

createFenceRecipe(TraverseBlocks.FIR_FENCE, Ingredient.ofItems(TraverseBlocks.FIR_PLANKS))
.criterion("has_planks", InventoryChangedCriterion.Conditions.items(TraverseBlocks.FIR_PLANKS))
.offerTo(exporter, new Identifier(Traverse.MOD_ID, "fir_pressure_plate"));

new ShapedRecipeJsonBuilder(TraverseBlocks.FIR_SIGN_ITEM, 3)
.group("wooden_signs")
.pattern("PPP")
.pattern("PPP")
.pattern(" S ")
.input('P', TraverseBlocks.FIR_PLANKS)
.input('S', Items.STICK)
.offerTo(exporter);

createFenceGateRecipe(TraverseBlocks.FIR_FENCE_GATE, Ingredient.ofItems(TraverseBlocks.FIR_PLANKS))
.criterion("has_planks", InventoryChangedCriterion.Conditions.items(TraverseBlocks.FIR_PLANKS))
.offerTo(exporter, new Identifier(Traverse.MOD_ID, "fir_sign"));
.offerTo(exporter);

offerPlanksRecipe(exporter, TraverseBlocks.FIR_PLANKS, TraverseItemTags.FIR_LOGS);

offerPressurePlateRecipe(exporter, TraverseBlocks.FIR_PRESSURE_PLATE, TraverseBlocks.FIR_PLANKS);

new ShapedRecipeJsonBuilder(TraverseBlocks.FIR_SLAB, 6)
.group("wooden_slab")
.pattern("PPP")
.input('P', TraverseBlocks.FIR_PLANKS)
createSignRecipe(TraverseBlocks.FIR_SIGN, Ingredient.ofItems(TraverseBlocks.FIR_PLANKS))
.criterion("has_planks", InventoryChangedCriterion.Conditions.items(TraverseBlocks.FIR_PLANKS))
.offerTo(exporter, new Identifier(Traverse.MOD_ID, "fir_slab"));

new ShapedRecipeJsonBuilder(TraverseBlocks.FIR_STAIRS, 4)
.group("wooden_stairs")
.pattern("P ")
.pattern("PP ")
.pattern("PPP")
.input('P', TraverseBlocks.FIR_PLANKS)
.offerTo(exporter);

offerSlabRecipe(exporter, TraverseBlocks.FIR_SLAB, TraverseBlocks.FIR_PLANKS);

createStairsRecipe(TraverseBlocks.FIR_STAIRS, Ingredient.ofItems(TraverseBlocks.FIR_PLANKS))
.criterion("has_planks", InventoryChangedCriterion.Conditions.items(TraverseBlocks.FIR_PLANKS))
.offerTo(exporter, new Identifier(Traverse.MOD_ID, "fir_stairs"));
.offerTo(exporter);

new ShapedRecipeJsonBuilder(TraverseBlocks.FIR_TRAPDOOR, 2)
.group("wooden_trapdoor")
.pattern("PPP")
.pattern("PPP")
.input('P', TraverseBlocks.FIR_PLANKS)
createTrapdoorRecipe(TraverseBlocks.FIR_TRAPDOOR, Ingredient.ofItems(TraverseBlocks.FIR_PLANKS))
.criterion("has_planks", InventoryChangedCriterion.Conditions.items(TraverseBlocks.FIR_PLANKS))
.offerTo(exporter, new Identifier(Traverse.MOD_ID, "fir_trapdoor"));
.offerTo(exporter);

new ShapedRecipeJsonBuilder(TraverseBlocks.FIR_WOOD, 3)
.group("bark")
Expand Down

This file was deleted.

1 change: 0 additions & 1 deletion common/src/main/resources/mixins.traverse-common.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,5 @@
"defaultRequire": 1
},
"mixins": [
"MixinSlimeEntity"
]
}
6 changes: 3 additions & 3 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,17 @@ maven_group=com.terraformersmc
archive_name=traverse

minecraft_version=1.19.2
yarn_mappings=1.19.2+build.1
yarn_mappings=1.19.2+build.9
loader_version=0.14.9
terraform_biome_remapper_api_version=4.1.1
terraform_config_api_version=4.1.1
terraform_surfaces_api_version=4.1.1
terraform_tree_api_version=4.1.1
terraform_wood_api_version=4.1.1
fabric_version=0.58.6+1.19.2
fabric_version=0.60.0+1.19.2

# TerraBlender for worldgen module and testing
terrablender_version=1.19-2.0.0.120
terrablender_version=1.19.2-2.0.1.125

# Project Metadata
project_name=Traverse
Expand Down

0 comments on commit bcc7161

Please sign in to comment.