Skip to content

Commit

Permalink
[~] Recipe, loot table, etc. polishing
Browse files Browse the repository at this point in the history
  • Loading branch information
crispytwig committed May 19, 2024
1 parent 4471c5c commit 55b9ca2
Show file tree
Hide file tree
Showing 60 changed files with 1,148 additions and 86 deletions.
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ plugins {
apply plugin: 'org.spongepowered.mixin'

group = mod_group_id
version = "${mod_version}-forge"
version = "${minecraft_version}-forge-${mod_version}"

base {
archivesName = mod_id
Expand Down
4 changes: 1 addition & 3 deletions misc/0_tempremoval/advancements/recipes/bamboo_beam.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,7 @@
"has_log": {
"conditions": {
"items": [
{
"tag": "minecraft:bamboo_logs"
}
"minecraft:stripped_bamboo_block"
]
},
"trigger": "minecraft:inventory_changed"
Expand Down
4 changes: 1 addition & 3 deletions misc/0_tempremoval/advancements/recipes/crimson_beam.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,7 @@
"has_log": {
"conditions": {
"items": [
{
"tag": "minecraft:crimson_logs"
}
"minecraft:stripped_crimson_stem"
]
},
"trigger": "minecraft:inventory_changed"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ public class BBBBlocks {
public static final RegistryObject<Block> BAMBOO_LAYER = BLOCKS.register("bamboo_layer", () -> new LayerBlock(BlockBehaviour.Properties.copy((Blocks.BAMBOO_PLANKS))));
public static final RegistryObject<Block> BAMBOO_MOSAIC_LAYER = BLOCKS.register("bamboo_mosaic_layer", () -> new LayerBlock(BlockBehaviour.Properties.copy((Blocks.BAMBOO_MOSAIC))));
public static final RegistryObject<Block> CHERRY_LAYER = BLOCKS.register("cherry_layer", () -> new LayerBlock(BlockBehaviour.Properties.copy((Blocks.CHERRY_PLANKS))));
public static final RegistryObject<Block> MOSS_LAYER = BLOCKS.register("moss_layer", () -> new LayerBlock(BlockBehaviour.Properties.copy((Blocks.MOSS_BLOCK))));
// public static final RegistryObject<Block> MOSS_LAYER = BLOCKS.register("moss_layer", () -> new LayerBlock(BlockBehaviour.Properties.copy((Blocks.MOSS_BLOCK))));
public static final RegistryObject<Block> STONE_LAYER = BLOCKS.register("stone_layer", () -> new LayerBlock(BlockBehaviour.Properties.copy((Blocks.STONE))));
public static final RegistryObject<Block> COBBLESTONE_LAYER = BLOCKS.register("cobblestone_layer", () -> new LayerBlock(BlockBehaviour.Properties.copy((Blocks.COBBLESTONE))));
public static final RegistryObject<Block> MOSSY_COBBLESTONE_LAYER = BLOCKS.register("mossy_cobblestone_layer", () -> new LayerBlock(BlockBehaviour.Properties.copy((Blocks.MOSSY_COBBLESTONE))));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@
import static com.starfish_studios.bbb.registry.BBBItems.MANGROVE_WALL;
import static com.starfish_studios.bbb.registry.BBBItems.MOSSY_COBBLESTONE_LAYER;
import static com.starfish_studios.bbb.registry.BBBItems.MOSSY_STONE_BRICK_LAYER;
import static com.starfish_studios.bbb.registry.BBBItems.MOSS_LAYER;
//import static com.starfish_studios.bbb.registry.BBBItems.MOSS_LAYER;
import static com.starfish_studios.bbb.registry.BBBItems.MUD_BRICK_LAYER;
import static com.starfish_studios.bbb.registry.BBBItems.NETHER_BRICK_BLOCK;
import static com.starfish_studios.bbb.registry.BBBItems.NETHER_BRICK_COLUMN;
Expand Down Expand Up @@ -431,7 +431,7 @@ public class BBBCreativeModeTab {
output.accept(BAMBOO_LAYER.get());
output.accept(BAMBOO_MOSAIC_LAYER.get());
output.accept(CHERRY_LAYER.get());
output.accept(MOSS_LAYER.get());
// output.accept(MOSS_LAYER.get());
output.accept(STONE_LAYER.get());
output.accept(COBBLESTONE_LAYER.get());
output.accept(MOSSY_COBBLESTONE_LAYER.get());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ public class BBBItems {
public static final RegistryObject<Item> BAMBOO_LAYER = ITEMS.register("bamboo_layer", () -> new DescriptionBlockItem(BBBBlocks.BAMBOO_LAYER.get(), new Item.Properties()));
public static final RegistryObject<Item> BAMBOO_MOSAIC_LAYER = ITEMS.register("bamboo_mosaic_layer", () -> new DescriptionBlockItem(BBBBlocks.BAMBOO_MOSAIC_LAYER.get(), new Item.Properties()));
public static final RegistryObject<Item> CHERRY_LAYER = ITEMS.register("cherry_layer", () -> new DescriptionBlockItem(BBBBlocks.CHERRY_LAYER.get(), new Item.Properties()));
public static final RegistryObject<Item> MOSS_LAYER = ITEMS.register("moss_layer", () -> new DescriptionBlockItem(BBBBlocks.MOSS_LAYER.get(), new Item.Properties()));
// public static final RegistryObject<Item> MOSS_LAYER = ITEMS.register("moss_layer", () -> new DescriptionBlockItem(BBBBlocks.MOSS_LAYER.get(), new Item.Properties()));
public static final RegistryObject<Item> STONE_LAYER = ITEMS.register("stone_layer", () -> new DescriptionBlockItem(BBBBlocks.STONE_LAYER.get(), new Item.Properties()));
public static final RegistryObject<Item> COBBLESTONE_LAYER = ITEMS.register("cobblestone_layer", () -> new DescriptionBlockItem(BBBBlocks.COBBLESTONE_LAYER.get(), new Item.Properties()));
public static final RegistryObject<Item> MOSSY_COBBLESTONE_LAYER = ITEMS.register("mossy_cobblestone_layer", () -> new DescriptionBlockItem(BBBBlocks.MOSSY_COBBLESTONE_LAYER.get(), new Item.Properties()));
Expand Down
33 changes: 33 additions & 0 deletions src/main/resources/data/bbb/advancements/recipes/acacia_wall.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"has_logs": {
"conditions": {
"items": [
{
"tag": "minecraft:acacia_logs"
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_the_recipe": {
"conditions": {
"recipe": "bbb:acacia_wall"
},
"trigger": "minecraft:recipe_unlocked"
}
},
"requirements": [
[
"has_logs",
"has_the_recipe"
]
],
"rewards": {
"recipes": [
"bbb:acacia_wall"
]
},
"sends_telemetry_event": false
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
"parent": "minecraft:recipes/root",
"criteria": {
"has_log": {
"conditions": {
"items": [
{
"tag": "minecraft:bamboo_logs"
}
]
},
"items": [
{
"items": [
"minecraft:stripped_bamboo_block"
]
}
],
"trigger": "minecraft:inventory_changed"
},
"has_the_recipe": {
Expand Down
33 changes: 33 additions & 0 deletions src/main/resources/data/bbb/advancements/recipes/bamboo_wall.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"has_logs": {
"items": [
{
"items": [
"minecraft:stripped_bamboo_block"
]
}
],
"trigger": "minecraft:inventory_changed"
},
"has_the_recipe": {
"conditions": {
"recipe": "bbb:bamboo_wall"
},
"trigger": "minecraft:recipe_unlocked"
}
},
"requirements": [
[
"has_logs",
"has_the_recipe"
]
],
"rewards": {
"recipes": [
"bbb:bamboo_wall"
]
},
"sends_telemetry_event": false
}
33 changes: 33 additions & 0 deletions src/main/resources/data/bbb/advancements/recipes/birch_wall.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"has_logs": {
"conditions": {
"items": [
{
"tag": "minecraft:birch_logs"
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_the_recipe": {
"conditions": {
"recipe": "bbb:birch_wall"
},
"trigger": "minecraft:recipe_unlocked"
}
},
"requirements": [
[
"has_logs",
"has_the_recipe"
]
],
"rewards": {
"recipes": [
"bbb:birch_wall"
]
},
"sends_telemetry_event": false
}
33 changes: 33 additions & 0 deletions src/main/resources/data/bbb/advancements/recipes/cherry_wall.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"has_logs": {
"conditions": {
"items": [
{
"tag": "minecraft:cherry_logs"
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_the_recipe": {
"conditions": {
"recipe": "bbb:cherry_wall"
},
"trigger": "minecraft:recipe_unlocked"
}
},
"requirements": [
[
"has_logs",
"has_the_recipe"
]
],
"rewards": {
"recipes": [
"bbb:cherry_wall"
]
},
"sends_telemetry_event": false
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@
"conditions": {
"items": [
{
"tag": "minecraft:crimson_logs"
"items": [
"minecraft:stripped_crimson_stem"
]
}
]
},
Expand Down
35 changes: 35 additions & 0 deletions src/main/resources/data/bbb/advancements/recipes/crimson_wall.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"has_logs": {
"conditions": {
"items": [
{
"items": [
"minecraft:stripped_crimson_stem"
]
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_the_recipe": {
"conditions": {
"recipe": "bbb:crimson_wall"
},
"trigger": "minecraft:recipe_unlocked"
}
},
"requirements": [
[
"has_logs",
"has_the_recipe"
]
],
"rewards": {
"recipes": [
"bbb:crimson_wall"
]
},
"sends_telemetry_event": false
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"has_logs": {
"conditions": {
"items": [
{
"tag": "minecraft:dark_oak_logs"
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_the_recipe": {
"conditions": {
"recipe": "bbb:dark_oak_wall"
},
"trigger": "minecraft:recipe_unlocked"
}
},
"requirements": [
[
"has_logs",
"has_the_recipe"
]
],
"rewards": {
"recipes": [
"bbb:dark_oak_wall"
]
},
"sends_telemetry_event": false
}
34 changes: 34 additions & 0 deletions src/main/resources/data/bbb/advancements/recipes/iron_fence.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"has_ingot": {
"conditions": {
"items": [
{
"items": [
"minecraft:iron_ingot"
]
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_the_recipe": {
"conditions": {
"recipe": "bbb:iron_fence"
},
"trigger": "minecraft:recipe_unlocked"
}
},
"requirements": [
[
"has_ingot",
"has_the_recipe"
]
],
"rewards": {
"recipes": [
"bbb:iron_fence"
]
}
}
33 changes: 33 additions & 0 deletions src/main/resources/data/bbb/advancements/recipes/jungle_wall.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"has_logs": {
"conditions": {
"items": [
{
"tag": "minecraft:jungle_logs"
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_the_recipe": {
"conditions": {
"recipe": "bbb:jungle_wall"
},
"trigger": "minecraft:recipe_unlocked"
}
},
"requirements": [
[
"has_logs",
"has_the_recipe"
]
],
"rewards": {
"recipes": [
"bbb:jungle_wall"
]
},
"sends_telemetry_event": false
}
Loading

0 comments on commit 55b9ca2

Please sign in to comment.