Skip to content

Commit

Permalink
fix: aaaa
Browse files Browse the repository at this point in the history
  • Loading branch information
Zepalesque committed Jun 22, 2024
1 parent 355afc5 commit a435dec
Show file tree
Hide file tree
Showing 12 changed files with 329 additions and 1 deletion.
Original file line number Diff line number Diff line change
@@ -0,0 +1,160 @@
{
"multipart": [
{
"apply": {
"model": "aether_redux:block/golden_clovers_1"
},
"when": {
"facing": "north",
"flower_amount": "1|2|3|4"
}
},
{
"apply": {
"model": "aether_redux:block/golden_clovers_2"
},
"when": {
"facing": "north",
"flower_amount": "2|3|4"
}
},
{
"apply": {
"model": "aether_redux:block/golden_clovers_3"
},
"when": {
"facing": "north",
"flower_amount": "3|4"
}
},
{
"apply": {
"model": "aether_redux:block/golden_clovers_4"
},
"when": {
"facing": "north",
"flower_amount": "4"
}
},
{
"apply": {
"model": "aether_redux:block/golden_clovers_1",
"y": 90
},
"when": {
"facing": "east",
"flower_amount": "1|2|3|4"
}
},
{
"apply": {
"model": "aether_redux:block/golden_clovers_2",
"y": 90
},
"when": {
"facing": "east",
"flower_amount": "2|3|4"
}
},
{
"apply": {
"model": "aether_redux:block/golden_clovers_3",
"y": 90
},
"when": {
"facing": "east",
"flower_amount": "3|4"
}
},
{
"apply": {
"model": "aether_redux:block/golden_clovers_4",
"y": 90
},
"when": {
"facing": "east",
"flower_amount": "4"
}
},
{
"apply": {
"model": "aether_redux:block/golden_clovers_1",
"y": 180
},
"when": {
"facing": "south",
"flower_amount": "1|2|3|4"
}
},
{
"apply": {
"model": "aether_redux:block/golden_clovers_2",
"y": 180
},
"when": {
"facing": "south",
"flower_amount": "2|3|4"
}
},
{
"apply": {
"model": "aether_redux:block/golden_clovers_3",
"y": 180
},
"when": {
"facing": "south",
"flower_amount": "3|4"
}
},
{
"apply": {
"model": "aether_redux:block/golden_clovers_4",
"y": 180
},
"when": {
"facing": "south",
"flower_amount": "4"
}
},
{
"apply": {
"model": "aether_redux:block/golden_clovers_1",
"y": 270
},
"when": {
"facing": "west",
"flower_amount": "1|2|3|4"
}
},
{
"apply": {
"model": "aether_redux:block/golden_clovers_2",
"y": 270
},
"when": {
"facing": "west",
"flower_amount": "2|3|4"
}
},
{
"apply": {
"model": "aether_redux:block/golden_clovers_3",
"y": 270
},
"when": {
"facing": "west",
"flower_amount": "3|4"
}
},
{
"apply": {
"model": "aether_redux:block/golden_clovers_4",
"y": 270
},
"when": {
"facing": "west",
"flower_amount": "4"
}
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "aether_redux:block/potted_cloudroot_sapling"
}
}
}
3 changes: 3 additions & 0 deletions src/generated/resources/assets/aether_redux/lang/en_us.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,15 @@
"block.aether_redux.gilded_holystone_slab": "Gilded Holystone Slab",
"block.aether_redux.gilded_holystone_stairs": "Gilded Holystone Stairs",
"block.aether_redux.gilded_holystone_wall": "Gilded Holystone Wall",
"block.aether_redux.golden_clovers": "Golden Clovers",
"block.aether_redux.locked_carved_base": "Locked Carved Base",
"block.aether_redux.locked_carved_pillar": "Locked Carved Pillar",
"block.aether_redux.locked_runelight": "Locked Runelight",
"block.aether_redux.locked_sentrite_bricks": "Locked Sentrite Bricks",
"block.aether_redux.locked_sentry_base": "Locked Sentry Base",
"block.aether_redux.locked_sentry_pillar": "Locked Sentry Pillar",
"block.aether_redux.potted_aurum": "Potted Aurum",
"block.aether_redux.potted_cloudroot_sapling": "Potted Cloudroot Sapling",
"block.aether_redux.potted_skysprouts": "Potted Skysprouts",
"block.aether_redux.potted_wyndsprouts": "Potted Wyndsprouts",
"block.aether_redux.raw_veridium_block": "Block of Raw Veridium",
Expand Down Expand Up @@ -119,6 +121,7 @@
"lore.block.aether_redux.gilded_holystone_slab": "Crafted from Gilded Holystone. Slabs are half blocks, versatile for decoration and smooth slopes. Try adding some to a building's roofing!",
"lore.block.aether_redux.gilded_holystone_stairs": "Crafted from Gilded Holystone. Stairs are useful for adding verticality to builds and are often used for decoration too!",
"lore.block.aether_redux.gilded_holystone_wall": "Crafted from Gilded Holystone. Walls can be used for decorative enclosures and defences. Great for keeping nasty intruders away!",
"lore.block.aether_redux.golden_clovers": "A nice patch of clovers that can be found in the Gilded Groves.",
"lore.block.aether_redux.raw_veridium_block": "A block of raw Veridium. This can be crafted from Raw Veridium.",
"lore.block.aether_redux.refined_sentrite_block": "A block of the refined form of Sentrite, crafted with Refined Sentrite.",
"lore.block.aether_redux.runelight": "A glowing block of circuitry made of Veridium, which can be easily toggled on and off. Found in Bronze Dungeons.",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"parent": "minecraft:block/flowerbed_1",
"render_type": "minecraft:cutout",
"textures": {
"flowerbed": "aether_redux:block/natural/golden_clovers",
"stem": "aether_redux:block/natural/golden_clovers_stem"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"parent": "minecraft:block/flowerbed_2",
"render_type": "minecraft:cutout",
"textures": {
"flowerbed": "aether_redux:block/natural/golden_clovers",
"stem": "aether_redux:block/natural/golden_clovers_stem"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"parent": "minecraft:block/flowerbed_3",
"render_type": "minecraft:cutout",
"textures": {
"flowerbed": "aether_redux:block/natural/golden_clovers",
"stem": "aether_redux:block/natural/golden_clovers_stem"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"parent": "minecraft:block/flowerbed_4",
"render_type": "minecraft:cutout",
"textures": {
"flowerbed": "aether_redux:block/natural/golden_clovers",
"stem": "aether_redux:block/natural/golden_clovers_stem"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"parent": "minecraft:block/flower_pot_cross",
"render_type": "minecraft:cutout",
"textures": {
"plant": "aether_redux:block/natural/cloudroot_sapling"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "aether_redux:item/misc/golden_clovers"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
{
"type": "minecraft:block",
"pools": [
{
"bonus_rolls": 0.0,
"entries": [
{
"type": "minecraft:item",
"functions": [
{
"add": false,
"conditions": [
{
"block": "aether_redux:golden_clovers",
"condition": "minecraft:block_state_property",
"properties": {
"flower_amount": "1"
}
}
],
"count": 1.0,
"function": "minecraft:set_count"
},
{
"add": false,
"conditions": [
{
"block": "aether_redux:golden_clovers",
"condition": "minecraft:block_state_property",
"properties": {
"flower_amount": "2"
}
}
],
"count": 2.0,
"function": "minecraft:set_count"
},
{
"add": false,
"conditions": [
{
"block": "aether_redux:golden_clovers",
"condition": "minecraft:block_state_property",
"properties": {
"flower_amount": "3"
}
}
],
"count": 3.0,
"function": "minecraft:set_count"
},
{
"add": false,
"conditions": [
{
"block": "aether_redux:golden_clovers",
"condition": "minecraft:block_state_property",
"properties": {
"flower_amount": "4"
}
}
],
"count": 4.0,
"function": "minecraft:set_count"
},
{
"function": "minecraft:explosion_decay"
}
],
"name": "aether_redux:golden_clovers"
}
],
"rolls": 1.0
}
],
"random_sequence": "aether_redux:blocks/golden_clovers"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
{
"type": "minecraft:block",
"pools": [
{
"bonus_rolls": 0.0,
"conditions": [
{
"condition": "minecraft:survives_explosion"
}
],
"entries": [
{
"type": "minecraft:item",
"name": "minecraft:flower_pot"
}
],
"rolls": 1.0
},
{
"bonus_rolls": 0.0,
"conditions": [
{
"condition": "minecraft:survives_explosion"
}
],
"entries": [
{
"type": "minecraft:item",
"name": "aether_redux:cloudroot_sapling"
}
],
"rolls": 1.0
}
],
"random_sequence": "aether_redux:blocks/potted_cloudroot_sapling"
}
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public class ReduxPlacements {
public static final ResourceKey<PlacedFeature> SENTRITE_ORE = copyKey(ReduxFeatureConfig.SENTRITE_ORE);
public static final ResourceKey<PlacedFeature> GROVE_TREES = copyKey(ReduxFeatureConfig.GROVE_TREES);
public static final ResourceKey<PlacedFeature> AURUM_PATCH = copyKey(ReduxFeatureConfig.AURUM_PATCH);
public static final ResourceKey<PlacedFeature> GOLDEN_CLOVERS_PATCH = copyKey(ReduxFeatureConfig.AURUM_PATCH);
public static final ResourceKey<PlacedFeature> GOLDEN_CLOVERS_PATCH = copyKey(ReduxFeatureConfig.GOLDEN_CLOVERS_PATCH);

public static final ResourceKey<PlacedFeature> SPARSE_BLUE_AERCLOUD = createKey("sparse_blue_aercloud");
public static final ResourceKey<PlacedFeature> DENSE_BLUE_AERCLOUD = createKey("dense_blue_aercloud");
Expand Down

0 comments on commit a435dec

Please sign in to comment.