Skip to content

Commit

Permalink
sun stuff
Browse files Browse the repository at this point in the history
  • Loading branch information
DonovanDMC committed Mar 30, 2024
1 parent 105179e commit f80ba2d
Show file tree
Hide file tree
Showing 181 changed files with 837 additions and 23 deletions.
12 changes: 12 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ mixin {
sourceSets.main.resources { srcDir 'src/generated/resources' }

repositories {
maven { url = "https://modmaven.dev/" }
maven {
url "https://www.cursemaven.com"
content {
Expand Down Expand Up @@ -113,6 +114,17 @@ dependencies {
runtimeOnly fg.deobf("curse.maven:itank-256991:${getProperty("itankVersion")}")
runtimeOnly fg.deobf("curse.maven:cloth-config-348521:${getProperty("clothVersion")}")
runtimeOnly fg.deobf("curse.maven:better-advancements-272515:${getProperty("baVersion")}")
compileOnly fg.deobf("curse.maven:jade-api-324717:${getProperty("jadeApiVersion")}")
runtimeOnly fg.deobf("curse.maven:jade-324717:${getProperty("jadeVersion")}")
compileOnly fg.deobf("curse.maven:wthit-455982:${getProperty("wthitVersion")}")

// https://github.com/McJtyMods/TheOneProbe/issues/548
compileOnly fg.deobf("mcjty.theoneprobe:theoneprobe:${getProperty("topVersion")}:api") {
transitive = false
}
runtimeOnly fg.deobf("mcjty.theoneprobe:theoneprobe:${getProperty("topVersion")}") {
transitive = false
}
}

jar {
Expand Down
8 changes: 7 additions & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,10 @@ itankVersion = 3921315
# 8.3.103
clothVersion = 4633416
# 1.19.2-0.3.0.148
baVersion = 4276529
baVersion = 4276529
# 1.19.1-forge-8.9.2
jadeApiVersion=4914106
jadeVersion=4914105
topVersion=1.19-6.2.0-6
# 5.24.0
wthitVersion=5208194
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"forge_marker": 1,
"variants": {
"": {
"model": "projectexpansion:block/compact_sun"
}
}
}
166 changes: 164 additions & 2 deletions src/generated/resources/assets/projectexpansion/lang/en_us.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,160 @@
{
"advancements.projecte.alchemical_coal": "Alchemical Coal",
"advancements.projecte.alchemical_coal.description": "Obtain alchemical coal.",
"advancements.projecte.alchemical_coal_block": "Alchemical Coal Block",
"advancements.projecte.alchemical_coal_block.description": "Obtain an alchemical coal block.",
"advancements.projecte.mobius_fuel": "Mobius Fuel",
"advancements.projecte.mobius_fuel.description": "Obtain mobius fuel.",
"advancements.projecte.mobius_fuel_block": "Mobius Fuel Block",
"advancements.projecte.mobius_fuel_block.description": "Obtain a mobius fuel block.",
"advancements.projecte.aeternalis_fuel": "Aeternalis Fuel",
"advancements.projecte.aeternalis_fuel.description": "Obtain aeternalis fuel.",
"advancements.projecte.aeternalis_fuel_block": "Aeternalis Fuel Block",
"advancements.projecte.aeternalis_fuel_block.description": "Obtain an aeternalis fuel block.",
"advancements.projecte.tome": "Tome of Knowledge",
"advancements.projecte.tome.description": "The entire universe at your fingertips.",
"advancements.projectexpansion.magenta_matter": "Magenta Matter",
"advancements.projectexpansion.magenta_matter.description": "Obtain magenta matter.",
"advancements.projectexpansion.magenta_matter_block": "Magenta Matter Block",
"advancements.projectexpansion.magenta_matter_block.description": "Obtain a magenta matter block.",
"advancements.projectexpansion.pink_matter": "Pink Matter",
"advancements.projectexpansion.pink_matter.description": "Obtain pink matter.",
"advancements.projectexpansion.pink_matter_block": "Pink Matter Block",
"advancements.projectexpansion.pink_matter_block.description": "Obtain a pink matter block.",
"advancements.projectexpansion.purple_matter": "Purple Matter",
"advancements.projectexpansion.purple_matter.description": "Obtain purple matter.",
"advancements.projectexpansion.purple_matter_block": "Purple Matter Block",
"advancements.projectexpansion.purple_matter_block.description": "Obtain a purple matter block.",
"advancements.projectexpansion.violet_matter": "Violet Matter",
"advancements.projectexpansion.violet_matter.description": "Obtain violet matter.",
"advancements.projectexpansion.violet_matter_block": "Violet Matter Block",
"advancements.projectexpansion.violet_matter_block.description": "Obtain a violet matter block.",
"advancements.projectexpansion.blue_matter": "Blue Matter",
"advancements.projectexpansion.blue_matter.description": "Obtain blue matter.",
"advancements.projectexpansion.blue_matter_block": "Blue Matter Block",
"advancements.projectexpansion.blue_matter_block.description": "Obtain a blue matter block.",
"advancements.projectexpansion.cyan_matter": "Cyan Matter",
"advancements.projectexpansion.cyan_matter.description": "Obtain cyan matter.",
"advancements.projectexpansion.cyan_matter_block": "Cyan Matter Block",
"advancements.projectexpansion.cyan_matter_block.description": "Obtain a cyan matter block.",
"advancements.projectexpansion.green_matter": "Green Matter",
"advancements.projectexpansion.green_matter.description": "Obtain green matter.",
"advancements.projectexpansion.green_matter_block": "Green Matter Block",
"advancements.projectexpansion.green_matter_block.description": "Obtain a green matter block.",
"advancements.projectexpansion.lime_matter": "Lime Matter",
"advancements.projectexpansion.lime_matter.description": "Obtain lime matter.",
"advancements.projectexpansion.lime_matter_block": "Lime Matter Block",
"advancements.projectexpansion.lime_matter_block.description": "Obtain a lime matter block.",
"advancements.projectexpansion.yellow_matter": "Yellow Matter",
"advancements.projectexpansion.yellow_matter.description": "Obtain yellow matter.",
"advancements.projectexpansion.yellow_matter_block": "Yellow Matter Block",
"advancements.projectexpansion.yellow_matter_block.description": "Obtain a yellow matter block.",
"advancements.projectexpansion.orange_matter": "Orange Matter",
"advancements.projectexpansion.orange_matter.description": "Obtain orange matter.",
"advancements.projectexpansion.orange_matter_block": "Orange Matter Block",
"advancements.projectexpansion.orange_matter_block.description": "Obtain an orange matter block.",
"advancements.projectexpansion.white_matter": "White Matter",
"advancements.projectexpansion.white_matter.description": "Obtain white matter.",
"advancements.projectexpansion.white_matter_block": "White Matter Block",
"advancements.projectexpansion.white_matter_block.description": "Obtain a white matter block.",
"advancements.projectexpansion.fading_matter": "Fading Matter",
"advancements.projectexpansion.fading_matter.description": "Obtain fading matter.",
"advancements.projectexpansion.fading_matter_block": "Fading Matter Block",
"advancements.projectexpansion.fading_matter_block.description": "Obtain a fading matter block.",
"advancements.projectexpansion.advanced_alchemical_chest": "Take it, and push it somewhere else!",
"advancements.projectexpansion.advanced_alchemical_chest.description": "An even better upgrade??",
"advancements.projectexpansion.magenta_fuel": "Magenta Fuel",
"advancements.projectexpansion.magenta_fuel.description": "Obtain magenta fuel.",
"advancements.projectexpansion.magenta_fuel_block": "Magenta Fuel Block",
"advancements.projectexpansion.magenta_fuel_block.description": "Obtain a magenta fuel block.",
"advancements.projectexpansion.pink_fuel": "Pink Fuel",
"advancements.projectexpansion.pink_fuel.description": "Obtain pink fuel.",
"advancements.projectexpansion.pink_fuel_block": "Pink Fuel Block",
"advancements.projectexpansion.pink_fuel_block.description": "Obtain a pink fuel block.",
"advancements.projectexpansion.purple_fuel": "Purple Fuel",
"advancements.projectexpansion.purple_fuel.description": "Obtain purple fuel.",
"advancements.projectexpansion.purple_fuel_block": "Purple Fuel Block",
"advancements.projectexpansion.purple_fuel_block.description": "Obtain a purple fuel block.",
"advancements.projectexpansion.violet_fuel": "Violet Fuel",
"advancements.projectexpansion.violet_fuel.description": "Obtain violet fuel.",
"advancements.projectexpansion.violet_fuel_block": "Violet Fuel Block",
"advancements.projectexpansion.violet_fuel_block.description": "Obtain a violet fuel block.",
"advancements.projectexpansion.blue_fuel": "Blue Fuel",
"advancements.projectexpansion.blue_fuel.description": "Obtain blue fuel.",
"advancements.projectexpansion.blue_fuel_block": "Blue Fuel Block",
"advancements.projectexpansion.blue_fuel_block.description": "Obtain a blue fuel block.",
"advancements.projectexpansion.cyan_fuel": "Cyan Fuel",
"advancements.projectexpansion.cyan_fuel.description": "Obtain cyan fuel.",
"advancements.projectexpansion.cyan_fuel_block": "Cyan Fuel Block",
"advancements.projectexpansion.cyan_fuel_block.description": "Obtain a cyan fuel block.",
"advancements.projectexpansion.green_fuel": "Green Fuel",
"advancements.projectexpansion.green_fuel.description": "Obtain green fuel.",
"advancements.projectexpansion.green_fuel_block": "Green Fuel Block",
"advancements.projectexpansion.green_fuel_block.description": "Obtain a green fuel block.",
"advancements.projectexpansion.lime_fuel": "Lime Fuel",
"advancements.projectexpansion.lime_fuel.description": "Obtain lime fuel.",
"advancements.projectexpansion.lime_fuel_block": "Lime Fuel Block",
"advancements.projectexpansion.lime_fuel_block.description": "Obtain a lime fuel block.",
"advancements.projectexpansion.orange_fuel": "Orange Fuel",
"advancements.projectexpansion.orange_fuel.description": "Obtain orange fuel.",
"advancements.projectexpansion.orange_fuel_block": "Orange Fuel Block",
"advancements.projectexpansion.orange_fuel_block.description": "Obtain a orange fuel block.",
"advancements.projectexpansion.white_fuel": "White Fuel",
"advancements.projectexpansion.white_fuel.description": "Obtain white fuel.",
"advancements.projectexpansion.white_fuel_block": "White Fuel Block",
"advancements.projectexpansion.white_fuel_block.description": "Obtain a white fuel block.",
"advancements.projectexpansion.fading_fuel": "Fading Fuel",
"advancements.projectexpansion.fading_fuel.description": "Obtain fading fuel.",
"advancements.projectexpansion.fading_fuel_block": "Fading Fuel Block",
"advancements.projectexpansion.fading_fuel_block.description": "Obtain a fading fuel block.",
"advancements.projectexpansion.magnum_star_omega": "Even bigger EMC batteries??",
"advancements.projectexpansion.magnum_star_omega.description": "No one person should have this much power.",
"advancements.projectexpansion.colossal_star_omega": "Why do you even need this much EMC?",
"advancements.projectexpansion.colossal_star_omega.description": "This is getting ridiculous.",
"advancements.projectexpansion.final_star_shard": "You've played this game too much",
"advancements.projectexpansion.final_star_shard.description": "Seriously, go outside.",
"advancements.projectexpansion.transmutation_interface": "Transmutation in your computers??",
"advancements.projectexpansion.transmutation_interface.description": "They just got even better.",
"advancements.projectexpansion.infinite_steak": "Unlimited Steak!!1!11!!!",
"advancements.projectexpansion.infinite_steak.description": "Bread? That's for peasants.",
"advancements.projectexpansion.infinite_fuel": "Is it a star?",
"advancements.projectexpansion.infinite_fuel.description": "Is it a cross? Who cares, chuck it in a furnace and watch it work.",
"advancements.projectexpansion.collector": "Even more sun power",
"advancements.projectexpansion.collector.description": "Now the ridiculousness begins.",
"advancements.projectexpansion.compressed_collector": "Hey look, I took some collectors and made them useless!",
"advancements.projectexpansion.compressed_collector.description": "Useless until they're crafted into something else.",
"advancements.projectexpansion.final_collector": "Final Collector",
"advancements.projectexpansion.final_collector.description": "Do you even need this much EMC?",
"advancements.projectexpansion.final_compressed_collector": "Final Compressed Collector",
"advancements.projectexpansion.final_compressed_collector.description": "The universe just might implode.",
"advancements.projectexpansion.relay": "The first step to the REAL power flower.",
"advancements.projectexpansion.relay.description": "It's a long way to the top.",
"advancements.projectexpansion.final_relay": "Final Relay",
"advancements.projectexpansion.final_relay.description": "No really, do you need this much EMC?",
"advancements.projectexpansion.power_flower": "The REAL Power Flower",
"advancements.projectexpansion.power_flower.description": "Now you're cooking with gas.",
"advancements.projectexpansion.final_power_flower": "Final Power Flower",
"advancements.projectexpansion.final_power_flower.description": "Go touch some grass, please.",
"advancements.projectexpansion.emc_link": "Wait, you can do that?",
"advancements.projectexpansion.emc_link.description": "Condensers be damned.",
"advancements.projectexpansion.final_emc_link": "Final EMC Link",
"advancements.projectexpansion.final_emc_link.description": "Go emc some water for me.",
"advancements.projectexpansion.final_star": "Final Star",
"advancements.projectexpansion.final_star.description": "You're done. Go outside.",
"advancements.projectexpansion.basic_alchemical_book": "Alchemical Teleportation",
"advancements.projectexpansion.basic_alchemical_book.description": "Obtain a basic alchemical book.",
"advancements.projectexpansion.advanced_alchemical_book": "Advanced Alchemical Book",
"advancements.projectexpansion.advanced_alchemical_book.description": "Obtain an advanced alchemical book.",
"advancements.projectexpansion.master_alchemical_book": "Master Alchemical Book",
"advancements.projectexpansion.master_alchemical_book.description": "Obtain a master alchemical book.",
"advancements.projectexpansion.arcane_alchemical_book": "Arcane Alchemical Book",
"advancements.projectexpansion.arcane_alchemical_book.description": "Obtain an arcane alchemical book.",
"advancements.projectexpansion.knowledge_sharing_book": "Sharing is caring!",
"advancements.projectexpansion.knowledge_sharing_book.description": "But I don't care.",
"advancements.projectexpansion.compact_sun": "The power of the sun in your hands",
"advancements.projectexpansion.compact_sun.description": "Don't stare at it for too long..",
"advancements.projectexpansion.blinded_by_the_light": "Blinded By The Light",
"advancements.projectexpansion.blinded_by_the_light.description": "You were warned.",
"block.projectexpansion.advanced_alchemical_chest.color_set": "The color has been set to %s.",
"block.projectexpansion.advanced_alchemical_chest.invalid_item": "You must be holding a %s to set the color.",
"block.projectexpansion.advanced_alchemical_chest.color": "Current Color: %s",
Expand All @@ -20,8 +176,8 @@
"block.projectexpansion.red_advanced_alchemical_chest": "Red Advanced Alchemical Chest",
"block.projectexpansion.black_advanced_alchemical_chest": "Black Advanced Alchemical Chest",
"block.projectexpansion.collector": "Collector.",
"block.projectexpansion.collector.tooltip": "Generates EMC once per second.",
"block.projectexpansion.collector.emc": "Produced EMC: %s/s",
"block.projectexpansion.collector.tooltip": "Generates EMC when exposed to light.",
"block.projectexpansion.collector.emc": "Maximum Produced EMC: %s/s",
"block.projectexpansion.collector.stack_emc": "Stack Produced EMC: %s/s",
"block.projectexpansion.collector.max_storage": "Maximum Stored EMC: %s",
"block.projectexpansion.basic_collector": "Basic Collector [MK 1]",
Expand Down Expand Up @@ -95,6 +251,8 @@
"block.projectexpansion.arcane_table": "Arcane Table",
"block.projectexpansion.transmutation_interface": "Transmutation Interface",
"block.projectexpansion.transmutation_interface.tooltip": "This can be used with compatible mods like Applied Energistics to access your transmutation inventory.",
"block.projectexpansion.compact_sun": "Compact Sun",
"block.projectexpansion.compact_sun.tooltip": "The power of the sun in a single block.",
"block.projectexpansion.power_flower.tooltip": "Generates EMC once per %s tick%s. (20/second)",
"block.projectexpansion.power_flower.emc": "Produced EMC: %s/s",
"block.projectexpansion.power_flower.stack_emc": "Stack Produced EMC: %s/s",
Expand Down Expand Up @@ -386,6 +544,10 @@
"text.projectexpansion.disabled": "Disabled ✗",
"text.projectexpansion.alchemical_collection": "Alchemical Collection: %s",
"text.projectexpansion.pos.outofbounds": "That position is outside the allowed boundaries.",
"death.attack.walk_on_sun": "%s tried to walk on the sun.",
"death.attack.walk_on_sun.player": "%s tried to walk on the sun whilst fighting %s.",
"death.attack.stare_at_sun": "%s decided staring at the sun was a good idea.",
"death.attack.stare_at_sun.player": "%s decided to stare at the sun whilst fighting %s.",
"sounds.projectexpansion.knowledge_sharing_book.store": "Knowledge Stored",
"sounds.projectexpansion.knowledge_sharing_book.use": "Knowledge Gained",
"sounds.projectexpansion.knowledge_sharing_book.use_none": "No Knowledge Gained",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "projectexpansion:block/sun"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"parent": "projectexpansion:block/compact_sun"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
{
"parent": "projectexpansion:compact_sun",
"criteria": {
"blinded_by_the_light": {
"trigger": "minecraft:impossible"
}
},
"display": {
"announce_to_chat": true,
"description": {
"translate": "advancements.projectexpansion.blinded_by_the_light.description"
},
"frame": "goal",
"hidden": true,
"icon": {
"item": "minecraft:sunflower"
},
"show_toast": true,
"title": {
"translate": "advancements.projectexpansion.blinded_by_the_light"
}
},
"requirements": [
[
"blinded_by_the_light"
]
],
"sends_telemetry_event": true
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
{
"parent": "projecte:philosophers_stone",
"criteria": {
"compact_sun": {
"conditions": {
"items": [
{
"items": [
"projectexpansion:compact_sun"
]
}
]
},
"trigger": "minecraft:inventory_changed"
}
},
"display": {
"announce_to_chat": true,
"description": {
"translate": "advancements.projectexpansion.compact_sun.description"
},
"frame": "goal",
"hidden": true,
"icon": {
"item": "projectexpansion:compact_sun"
},
"show_toast": true,
"title": {
"translate": "advancements.projectexpansion.compact_sun"
}
},
"requirements": [
[
"compact_sun"
]
],
"sends_telemetry_event": true
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"type": "minecraft:block",
"pools": [
{
"rolls": 1,
"entries": [
{
"type": "minecraft:item",
"name": "projectexpansion:compact_sun"
}
],
"conditions": [
{
"condition": "minecraft:survives_explosion"
}
]
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
"HSH",
"SYS",
"HSH"
],
"key": {
"Y": {
"item": "projectexpansion:yellow_matter"
},
"S": {
"item": "projectexpansion:final_star"
},
"H": {
"item": "projectexpansion:final_star_shard"
}
},
"result": {
"item": "projectexpansion:compact_sun"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
"SHS",
"HYH",
"SHS"
],
"key": {
"Y": {
"item": "projectexpansion:yellow_matter"
},
"S": {
"item": "projectexpansion:final_star"
},
"H": {
"item": "projectexpansion:final_star_shard"
}
},
"result": {
"item": "projectexpansion:compact_sun"
}
}
2 changes: 1 addition & 1 deletion src/main/generation
Submodule generation updated 48 files
+2 −0 constants.ts
+38 −0 generators/advancements/fuel.json
+21 −0 generators/advancements/fuel.ts
+38 −0 generators/advancements/fuel_block.json
+4 −0 generators/advancements/index.ts
+38 −0 generators/advancements/matter.json
+23 −0 generators/advancements/matter.ts
+38 −0 generators/advancements/matter_block.json
+2 −0 generators/advancements/single.ts
+38 −0 generators/advancements/single/advanced_alchemical_book.json
+36 −0 generators/advancements/single/advanced_alchemical_chest.json
+38 −0 generators/advancements/single/arcane_alchemical_book.json
+38 −0 generators/advancements/single/basic_alchemical_book.json
+29 −0 generators/advancements/single/blinded_by_the_light.json
+36 −0 generators/advancements/single/collector.json
+38 −0 generators/advancements/single/colossal_star_omega.json
+38 −0 generators/advancements/single/compact_sun.json
+36 −0 generators/advancements/single/compressed_collector.json
+36 −0 generators/advancements/single/emc_link.json
+38 −0 generators/advancements/single/final_collector.json
+38 −0 generators/advancements/single/final_compressed_collector.json
+38 −0 generators/advancements/single/final_emc_link.json
+38 −0 generators/advancements/single/final_power_flower.json
+38 −0 generators/advancements/single/final_relay.json
+38 −0 generators/advancements/single/final_star.json
+38 −0 generators/advancements/single/final_star_shard.json
+38 −0 generators/advancements/single/infinite_fuel.json
+38 −0 generators/advancements/single/infinite_steak.json
+39 −0 generators/advancements/single/knowledge_sharing_book.json
+38 −0 generators/advancements/single/magenta_fuel.json
+38 −0 generators/advancements/single/magenta_fuel_block.json
+38 −0 generators/advancements/single/magenta_matter.json
+38 −0 generators/advancements/single/magnum_star_omega.json
+38 −0 generators/advancements/single/master_alchemical_book.json
+36 −0 generators/advancements/single/power_flower.json
+36 −0 generators/advancements/single/relay.json
+38 −0 generators/advancements/single/transmutation_interface.json
+6 −0 generators/block/single/compact_sun.json
+8 −0 generators/blockstate/single/compact_sun.json
+3 −0 generators/item/single/compact_sun.json
+158 −0 generators/lang/en_US/advancements.json
+4 −2 generators/lang/en_US/block/collector.json
+3 −1 generators/lang/en_US/block/misc.json
+3 −1 generators/lang/en_US/gui/config.json
+5 −1 generators/lang/en_US/misc.json
+19 −0 generators/loot_tables/single/compact_sun.json
+22 −0 generators/recipes/single/compact_sun_1.json
+22 −0 generators/recipes/single/compact_sun_2.json

0 comments on commit f80ba2d

Please sign in to comment.