Skip to content

Commit

Permalink
tweaks on generation
Browse files Browse the repository at this point in the history
  • Loading branch information
@LTHCTheMaster
LTHCTheMaster committed Jul 23, 2022
1 parent 9aafcd3 commit a75c6f8
Show file tree
Hide file tree
Showing 20 changed files with 100 additions and 5 deletions.
1 change: 1 addition & 0 deletions Datapack/data/lthc.advancenergy/functions/core/loading/internal/data.mcfunction
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ scoreboard players set #260 lthc.advancenergy.data 260
scoreboard players set #100 lthc.advancenergy.data 100
scoreboard players set #80 lthc.advancenergy.data 80
scoreboard players set #64 lthc.advancenergy.data 64
scoreboard players set #16 lthc.advancenergy.data 16
scoreboard players set #10 lthc.advancenergy.data 10
scoreboard players set #8 lthc.advancenergy.data 8
scoreboard players set #5 lthc.advancenergy.data 5
Expand Down
1 change: 1 addition & 0 deletions ...s/custom/block/destroy/ores/lead/deepslate_lead_ore/destroy_deepslate_lead_ore.mcfunction
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
kill @e[type=item,nbt={Item:{id:"minecraft:deepslate_bricks",Count:1b}},sort=nearest,limit=1]
kill @e[type=item,nbt={Item:{id:"minecraft:cracked_deepslate_bricks",Count:1b}},sort=nearest,limit=1]
execute as @p[distance=..5.3] run function lthc.advancenergy:utils/destroy_scan_enchantments/scan_enchant
execute if score #enchtemp lthc.advancenergy.data_2 matches 0 run loot spawn ~ ~0.11 ~ loot lthc.advancenergy:i/ores/lead/raw
execute if score #enchtemp lthc.advancenergy.data_2 matches 1 run loot spawn ~ ~0.11 ~ loot lthc.advancenergy:i/ores/lead/deepslate_ore
Expand Down
1 change: 1 addition & 0 deletions ...cenergy/functions/custom/block/destroy/ores/lead/lead_block/destroy_lead_block.mcfunction
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
kill @e[type=item,nbt={Item:{id:"minecraft:deepslate_bricks",Count:1b}},sort=nearest,limit=1]
kill @e[type=item,nbt={Item:{id:"minecraft:cracked_deepslate_bricks",Count:1b}},sort=nearest,limit=1]
loot spawn ~ ~0.11 ~ loot lthc.advancenergy:i/ores/lead/block
kill @s
1 change: 1 addition & 0 deletions ...dvancenergy/functions/custom/block/destroy/ores/lead/lead_ore/destroy_lead_ore.mcfunction
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
kill @e[type=item,nbt={Item:{id:"minecraft:deepslate_bricks",Count:1b}},sort=nearest,limit=1]
kill @e[type=item,nbt={Item:{id:"minecraft:cracked_deepslate_bricks",Count:1b}},sort=nearest,limit=1]
execute as @p[distance=..5.3] run function lthc.advancenergy:utils/destroy_scan_enchantments/scan_enchant
execute if score #enchtemp lthc.advancenergy.data_2 matches 0 run loot spawn ~ ~0.11 ~ loot lthc.advancenergy:i/ores/lead/raw
execute if score #enchtemp lthc.advancenergy.data_2 matches 1 run loot spawn ~ ~0.11 ~ loot lthc.advancenergy:i/ores/lead/ore
Expand Down
1 change: 1 addition & 0 deletions ...functions/custom/block/destroy/ores/lead/raw_lead_block/destroy_raw_lead_block.mcfunction
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
kill @e[type=item,nbt={Item:{id:"minecraft:deepslate_bricks",Count:1b}},sort=nearest,limit=1]
kill @e[type=item,nbt={Item:{id:"minecraft:cracked_deepslate_bricks",Count:1b}},sort=nearest,limit=1]
loot spawn ~ ~0.11 ~ loot lthc.advancenergy:i/ores/lead/raw_block
kill @s
1 change: 1 addition & 0 deletions ...ions/custom/block/destroy/ores/tin/deepslate_tin_ore/destroy_deepslate_tin_ore.mcfunction
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
kill @e[type=item,nbt={Item:{id:"minecraft:deepslate_tiles",Count:1b}},sort=nearest,limit=1]
kill @e[type=item,nbt={Item:{id:"minecraft:cracked_deepslate_tiles",Count:1b}},sort=nearest,limit=1]
execute as @p[distance=..5.3] run function lthc.advancenergy:utils/destroy_scan_enchantments/scan_enchant
execute if score #enchtemp lthc.advancenergy.data_2 matches 0 run loot spawn ~ ~0.11 ~ loot lthc.advancenergy:i/ores/tin/raw
execute if score #enchtemp lthc.advancenergy.data_2 matches 1 run loot spawn ~ ~0.11 ~ loot lthc.advancenergy:i/ores/tin/deepslate_ore
Expand Down
1 change: 1 addition & 0 deletions ...gy/functions/custom/block/destroy/ores/tin/raw_tin_block/destroy_raw_tin_block.mcfunction
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
kill @e[type=item,nbt={Item:{id:"minecraft:deepslate_tiles",Count:1b}},sort=nearest,limit=1]
kill @e[type=item,nbt={Item:{id:"minecraft:cracked_deepslate_tiles",Count:1b}},sort=nearest,limit=1]
loot spawn ~ ~0.11 ~ loot lthc.advancenergy:i/ores/tin/raw_block
kill @s
1 change: 1 addition & 0 deletions ...vancenergy/functions/custom/block/destroy/ores/tin/tin_block/destroy_tin_block.mcfunction
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
kill @e[type=item,nbt={Item:{id:"minecraft:deepslate_tiles",Count:1b}},sort=nearest,limit=1]
kill @e[type=item,nbt={Item:{id:"minecraft:cracked_deepslate_tiles",Count:1b}},sort=nearest,limit=1]
loot spawn ~ ~0.11 ~ loot lthc.advancenergy:i/ores/tin/block
kill @s
1 change: 1 addition & 0 deletions ...c.advancenergy/functions/custom/block/destroy/ores/tin/tin_ore/destroy_tin_ore.mcfunction
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
kill @e[type=item,nbt={Item:{id:"minecraft:deepslate_tiles",Count:1b}},sort=nearest,limit=1]
kill @e[type=item,nbt={Item:{id:"minecraft:cracked_deepslate_tiles",Count:1b}},sort=nearest,limit=1]
execute as @p[distance=..5.3] run function lthc.advancenergy:utils/destroy_scan_enchantments/scan_enchant
execute if score #enchtemp lthc.advancenergy.data_2 matches 0 run loot spawn ~ ~0.11 ~ loot lthc.advancenergy:i/ores/tin/raw
execute if score #enchtemp lthc.advancenergy.data_2 matches 1 run loot spawn ~ ~0.11 ~ loot lthc.advancenergy:i/ores/tin/ore
Expand Down
7 changes: 7 additions & 0 deletions Datapack/data/lthc.advancenergy/functions/gen/main.mcfunction
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,3 +27,10 @@
# Generate Silver Ore with air adjacency
execute as @e[limit=4] run summon area_effect_cloud ~ 0 ~ {Tags:["lthc.advancenergy.ore_pos"],Duration:0}
execute as @e[tag=lthc.advancenergy.ore_pos] at @s run function lthc.advancenergy:gen/ores/silver/silver_air

## Random Builded Pattern
scoreboard players set #xz_variation lthc.advancenergy.data 450
scoreboard players set #max_height lthc.advancenergy.data 330
# Generate Random Builded Pattern
execute as @e[limit=6] run summon area_effect_cloud ~ 0 ~ {Tags:["lthc.advancenergy.ore_pos"],Duration:0}
execute as @e[tag=lthc.advancenergy.ore_pos] at @s run function lthc.advancenergy:gen/ores/multiple_builded_pattern/build_ore_pattern
21 changes: 21 additions & 0 deletions ...thc.advancenergy/functions/gen/ores/multiple_builded_pattern/build_ore_pattern.mcfunction
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@

function lthc.advancenergy:gen/utils/random_position

scoreboard players set #max_attempts lthc.advancenergy.data 100
execute at @s run function lthc.advancenergy:gen/utils/find_adjacent_air/find_adjacent_air

#Get Random Value
summon area_effect_cloud ~ ~ ~ {Duration:0,Tags:["lthc.advancenergy.ropbgrvs"]}
scoreboard players set #ropbgrvs lthc.advancenergy.data 0
execute store result score #ropbgrvs lthc.advancenergy.data run data get entity @e[tag=lthc.advancenergy.ropbgrvs,limit=1] UUID[3]
scoreboard players operation #ropbgrvs lthc.advancenergy.data %= #16 lthc.advancenergy.data
kill @e[tag=lthc.advancenergy.ropbgrvs]

#Choose Pattern
execute if score #ropbgrvs lthc.advancenergy.data matches 0..6 run function lthc.advancenergy:gen/ores/multiple_builded_pattern/patterns/p0
execute if score #ropbgrvs lthc.advancenergy.data matches 7..11 run function lthc.advancenergy:gen/ores/multiple_builded_pattern/patterns/p1
execute if score #ropbgrvs lthc.advancenergy.data matches 12 run function lthc.advancenergy:gen/ores/multiple_builded_pattern/patterns/p2
execute if score #ropbgrvs lthc.advancenergy.data matches 13 run function lthc.advancenergy:gen/ores/multiple_builded_pattern/patterns/p3
execute if score #ropbgrvs lthc.advancenergy.data matches 14..15 run function lthc.advancenergy:gen/ores/multiple_builded_pattern/patterns/p4

kill @s
10 changes: 10 additions & 0 deletions ...data/lthc.advancenergy/functions/gen/ores/multiple_builded_pattern/patterns/p0.mcfunction
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
#Placing Ore
execute at @s if block ~ ~ ~ #lthc.advancenergy:ore_gen/lead/for_lead_ore run function lthc.advancenergy:gen/ores/lead/lead_type
execute at @s positioned ~0.8 ~0.8 ~0.8 if block ~ ~ ~ #lthc.advancenergy:ore_gen/lead/for_lead_ore run function lthc.advancenergy:gen/ores/lead/lead_type
execute at @s positioned ~0.0 ~0.8 ~0.8 if block ~ ~ ~ #lthc.advancenergy:ore_gen/tin/for_tin_ore run function lthc.advancenergy:gen/ores/tin/tin_type
execute at @s positioned ~0.8 ~0.8 ~0.0 if block ~ ~ ~ #lthc.advancenergy:ore_gen/tin/for_tin_ore run function lthc.advancenergy:gen/ores/tin/tin_type
execute at @s positioned ~0.8 ~0.0 ~0.8 if block ~ ~ ~ #lthc.advancenergy:ore_gen/tin/for_tin_ore run function lthc.advancenergy:gen/ores/tin/tin_type
execute at @s positioned ~0.0 ~0.8 ~0.0 if block ~ ~ ~ #minecraft:stone_ore_replaceables run setblock ~ ~ ~ redstone_ore
execute at @s positioned ~0.0 ~0.8 ~0.0 if block ~ ~ ~ #minecraft:deepslate_ore_replaceables run setblock ~ ~ ~ deepslate_redstone_ore

kill @s
10 changes: 10 additions & 0 deletions ...data/lthc.advancenergy/functions/gen/ores/multiple_builded_pattern/patterns/p1.mcfunction
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
#Placing Ore
execute at @s if block ~ ~ ~ #lthc.advancenergy:ore_gen/lead/for_lead_ore run function lthc.advancenergy:gen/ores/lead/lead_type
execute at @s positioned ~0.8 ~0.8 ~0.8 if block ~ ~ ~ #lthc.advancenergy:ore_gen/lead/for_lead_ore run function lthc.advancenergy:gen/ores/lead/lead_type
execute at @s positioned ~0.0 ~0.8 ~0.8 if block ~ ~ ~ #lthc.advancenergy:ore_gen/tin/for_tin_ore run function lthc.advancenergy:gen/ores/tin/tin_type
execute at @s positioned ~0.8 ~0.8 ~0.0 if block ~ ~ ~ #lthc.advancenergy:ore_gen/tin/for_tin_ore run function lthc.advancenergy:gen/ores/tin/tin_type
execute at @s positioned ~0.8 ~0.0 ~0.8 if block ~ ~ ~ #lthc.advancenergy:ore_gen/silver/for_silver_ore run function lthc.advancenergy:gen/ores/silver/silver_type
execute at @s positioned ~0.0 ~0.8 ~0.0 if block ~ ~ ~ #minecraft:stone_ore_replaceables run setblock ~ ~ ~ redstone_ore
execute at @s positioned ~0.0 ~0.8 ~0.0 if block ~ ~ ~ #minecraft:deepslate_ore_replaceables run setblock ~ ~ ~ deepslate_redstone_ore

kill @s
10 changes: 10 additions & 0 deletions ...data/lthc.advancenergy/functions/gen/ores/multiple_builded_pattern/patterns/p2.mcfunction
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
#Placing Ore
execute at @s if block ~ ~ ~ #lthc.advancenergy:ore_gen/lead/for_lead_ore run function lthc.advancenergy:gen/ores/lead/lead_type
execute at @s positioned ~0.8 ~0.8 ~0.8 if block ~ ~ ~ #lthc.advancenergy:ore_gen/lead/for_lead_ore run function lthc.advancenergy:gen/ores/lead/lead_type
execute at @s positioned ~0.0 ~0.8 ~0.8 if block ~ ~ ~ #lthc.advancenergy:ore_gen/tin/for_tin_ore run function lthc.advancenergy:gen/ores/tin/tin_type
execute at @s positioned ~0.8 ~0.8 ~0.0 if block ~ ~ ~ #lthc.advancenergy:ore_gen/tin/for_tin_ore run function lthc.advancenergy:gen/ores/tin/tin_type
execute at @s positioned ~0.8 ~0.0 ~0.8 if block ~ ~ ~ #lthc.advancenergy:ore_gen/silver/for_silver_ore run function lthc.advancenergy:gen/ores/silver/silver_type
execute at @s positioned ~0.0 ~0.8 ~0.0 if block ~ ~ ~ #minecraft:stone_ore_replaceables run setblock ~ ~ ~ gold_ore
execute at @s positioned ~0.0 ~0.8 ~0.0 if block ~ ~ ~ #minecraft:deepslate_ore_replaceables run setblock ~ ~ ~ deepslate_gold_ore

kill @s
12 changes: 12 additions & 0 deletions ...data/lthc.advancenergy/functions/gen/ores/multiple_builded_pattern/patterns/p3.mcfunction
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
#Placing Ore
execute at @s if block ~ ~ ~ #lthc.advancenergy:ore_gen/lead/for_lead_ore run function lthc.advancenergy:gen/ores/lead/lead_type
execute at @s positioned ~0.8 ~0.8 ~0.8 if block ~ ~ ~ #lthc.advancenergy:ore_gen/silver/for_silver_ore run function lthc.advancenergy:gen/ores/silver/silver_type
execute at @s positioned ~0.0 ~0.8 ~0.8 if block ~ ~ ~ #lthc.advancenergy:ore_gen/tin/for_tin_ore run function lthc.advancenergy:gen/ores/tin/tin_type
execute at @s positioned ~0.8 ~0.8 ~0.0 if block ~ ~ ~ #minecraft:stone_ore_replaceables run function lthc.advancenergy:custom/block/place/ash_block/main
execute at @s positioned ~0.8 ~0.8 ~0.0 if block ~ ~ ~ #minecraft:deepslate_ore_replaceables run function lthc.advancenergy:custom/block/place/ash_block/main
execute at @s positioned ~0.8 ~0.0 ~0.8 if block ~ ~ ~ #minecraft:stone_ore_replaceables run setblock ~ ~ ~ redstone_ore
execute at @s positioned ~0.8 ~0.0 ~0.8 if block ~ ~ ~ #minecraft:deepslate_ore_replaceables run setblock ~ ~ ~ deepslate_redstone_ore
execute at @s positioned ~0.0 ~0.8 ~0.0 if block ~ ~ ~ #minecraft:stone_ore_replaceables run setblock ~ ~ ~ gold_ore
execute at @s positioned ~0.0 ~0.8 ~0.0 if block ~ ~ ~ #minecraft:deepslate_ore_replaceables run setblock ~ ~ ~ deepslate_gold_ore

kill @s
12 changes: 12 additions & 0 deletions ...data/lthc.advancenergy/functions/gen/ores/multiple_builded_pattern/patterns/p4.mcfunction
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
#Placing Ore
execute at @s if block ~ ~ ~ #lthc.advancenergy:ore_gen/lead/for_lead_ore run function lthc.advancenergy:gen/ores/lead/lead_type
execute at @s positioned ~0.8 ~0.8 ~0.8 if block ~ ~ ~ #lthc.advancenergy:ore_gen/silver/for_silver_ore run function lthc.advancenergy:gen/ores/silver/silver_type
execute at @s positioned ~0.0 ~0.8 ~0.8 if block ~ ~ ~ #lthc.advancenergy:ore_gen/tin/for_tin_ore run function lthc.advancenergy:gen/ores/tin/tin_type
execute at @s positioned ~0.8 ~0.8 ~0.0 if block ~ ~ ~ #minecraft:stone_ore_replaceables run setblock ~ ~ ~ dripstone_block
execute at @s positioned ~0.8 ~0.8 ~0.0 if block ~ ~ ~ #minecraft:deepslate_ore_replaceables run setblock ~ ~ ~ dripstone_block
execute at @s positioned ~0.8 ~0.0 ~0.8 if block ~ ~ ~ #minecraft:stone_ore_replaceables run setblock ~ ~ ~ redstone_ore
execute at @s positioned ~0.8 ~0.0 ~0.8 if block ~ ~ ~ #minecraft:deepslate_ore_replaceables run setblock ~ ~ ~ deepslate_redstone_ore
execute at @s positioned ~0.0 ~0.8 ~0.0 if block ~ ~ ~ #minecraft:stone_ore_replaceables run setblock ~ ~ ~ gold_ore
execute at @s positioned ~0.0 ~0.8 ~0.0 if block ~ ~ ~ #minecraft:deepslate_ore_replaceables run setblock ~ ~ ~ deepslate_gold_ore

kill @s
1 change: 1 addition & 0 deletions Datapack/data/lthc.advancenergy/functions/uninstall/under/clear_storage.mcfunction
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
data remove storage lthc.advancenergy:main registry
data remove storage lthc.advancenergy:main refinery
data remove storage lthc.advancenergy:main temp
3 changes: 2 additions & 1 deletion Datapack/data/lthc.advancenergy/tags/worldgen/biome/for_creeper_cage.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
"birch_forest",
"wooded_badlands",
"dark_forest",
"windswept_forest"
"windswept_forest",
"#is_hill"
]
}
5 changes: 3 additions & 2 deletions Datapack/data/lthc.advancenergy/tags/worldgen/biome/for_lead_house.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@
"values": [
"sunflower_plains",
"eroded_badlands",
"taiga",
"#is_taiga",
"sparse_jungle",
"stony_shore"
"stony_shore",
"#is_beach"
]
}
5 changes: 3 additions & 2 deletions Datapack/data/lthc.advancenergy/tags/worldgen/biome/for_tin_shed.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
"plains",
"desert",
"dripstone_caves",
"swamp",
"badlands"
"#allows_surface_slime_spawns",
"badlands",
"#is_beach"
]
}

0 comments on commit a75c6f8

Please sign in to comment.