See Description

- Advanced Alchemical Chest
- Rework various internal methods to be cleaner
- Fix bucket usage on emc links
- revise how we use capabilities, to avoid unexpected exceptions
- add various blocks & items to forge and vanilla tags
- add upgrade recipes for power flowers
- more I'm forgetting, it's been a week, god help me

build.gradle

@@ -101,6 +101,8 @@ dependencies {
     compileOnly fg.deobf("top.theillusivec4.curios:curios-forge:${getProperty("curiosVersion")}:api")
     runtimeOnly fg.deobf("top.theillusivec4.curios:curios-forge:${getProperty("curiosVersion")}")
     runtimeOnly fg.deobf("curse.maven:no-chat-reports-634062:3926371")
+    runtimeOnly fg.deobf("curse.maven:jei-238222:${getProperty("jeiVersion")}")
+    runtimeOnly fg.deobf("curse.maven:pipez-443900:${getProperty("pipezVersion")}")
 }
 
 jar {

gradle.properties

@@ -9,4 +9,8 @@ mappingsVersion = 1.19.2
 forgeVersion    = 43.1.25
 # 1.19.2-PE1.0.1
 projecteVersion = 3955047
-curiosVersion   = 1.19.2-5.1.1.0
+curiosVersion   = 1.19.2-5.1.1.0
+# 11.4.0.285
+jeiVersion = 4068188
+# 1.19.2-1.0.1
+pipezVersion = 4064952

src/generated/resources/assets/projectexpansion/blockstates/black_advanced_alchemical_chest.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "projectexpansion:block/advanced_alchemical_chest/black"
+    }
+  }
+}

src/generated/resources/assets/projectexpansion/blockstates/blue_advanced_alchemical_chest.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "projectexpansion:block/advanced_alchemical_chest/blue"
+    }
+  }
+}

src/generated/resources/assets/projectexpansion/blockstates/brown_advanced_alchemical_chest.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "projectexpansion:block/advanced_alchemical_chest/brown"
+    }
+  }
+}

src/generated/resources/assets/projectexpansion/blockstates/cyan_advanced_alchemical_chest.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "projectexpansion:block/advanced_alchemical_chest/cyan"
+    }
+  }
+}

src/generated/resources/assets/projectexpansion/blockstates/gray_advanced_alchemical_chest.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "projectexpansion:block/advanced_alchemical_chest/gray"
+    }
+  }
+}

src/generated/resources/assets/projectexpansion/blockstates/green_advanced_alchemical_chest.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "projectexpansion:block/advanced_alchemical_chest/green"
+    }
+  }
+}

src/generated/resources/assets/projectexpansion/blockstates/light_blue_advanced_alchemical_chest.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "projectexpansion:block/advanced_alchemical_chest/light_blue"
+    }
+  }
+}

src/generated/resources/assets/projectexpansion/blockstates/light_gray_advanced_alchemical_chest.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "projectexpansion:block/advanced_alchemical_chest/light_gray"
+    }
+  }
+}

src/generated/resources/assets/projectexpansion/blockstates/lime_advanced_alchemical_chest.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "projectexpansion:block/advanced_alchemical_chest/lime"
+    }
+  }
+}

src/generated/resources/assets/projectexpansion/blockstates/magenta_advanced_alchemical_chest.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "projectexpansion:block/advanced_alchemical_chest/magenta"
+    }
+  }
+}

src/generated/resources/assets/projectexpansion/blockstates/orange_advanced_alchemical_chest.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "projectexpansion:block/advanced_alchemical_chest/orange"
+    }
+  }
+}

src/generated/resources/assets/projectexpansion/blockstates/pink_advanced_alchemical_chest.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "projectexpansion:block/advanced_alchemical_chest/pink"
+    }
+  }
+}

src/generated/resources/assets/projectexpansion/blockstates/purple_advanced_alchemical_chest.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "projectexpansion:block/advanced_alchemical_chest/purple"
+    }
+  }
+}

src/generated/resources/assets/projectexpansion/blockstates/red_advanced_alchemical_chest.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "projectexpansion:block/advanced_alchemical_chest/red"
+    }
+  }
+}

src/generated/resources/assets/projectexpansion/blockstates/white_advanced_alchemical_chest.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "projectexpansion:block/advanced_alchemical_chest/white"
+    }
+  }
+}

src/generated/resources/assets/projectexpansion/blockstates/yellow_advanced_alchemical_chest.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "projectexpansion:block/advanced_alchemical_chest/yellow"
+    }
+  }
+}

src/generated/resources/assets/projectexpansion/lang/en_us.json

@@ -1,4 +1,24 @@
 {
+	"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",
+	"block.projectexpansion.advanced_alchemical_chest.tooltip": "Just like the alchemical bag, but in a chest form. Shift click with a bag to set the color.",
+	"block.projectexpansion.white_advanced_alchemical_chest": "White Advanced Alchemical Chest",
+	"block.projectexpansion.orange_advanced_alchemical_chest": "Orange Advanced Alchemical Chest",
+	"block.projectexpansion.magenta_advanced_alchemical_chest": "Magenta Advanced Alchemical Chest",
+	"block.projectexpansion.light_blue_advanced_alchemical_chest": "Light Blue Advanced Alchemical Chest",
+	"block.projectexpansion.yellow_advanced_alchemical_chest": "Yellow Advanced Alchemical Chest",
+	"block.projectexpansion.lime_advanced_alchemical_chest": "Lime Advanced Alchemical Chest",
+	"block.projectexpansion.pink_advanced_alchemical_chest": "Pink Advanced Alchemical Chest",
+	"block.projectexpansion.gray_advanced_alchemical_chest": "Gray Advanced Alchemical Chest",
+	"block.projectexpansion.light_gray_advanced_alchemical_chest": "Light Gray Advanced Alchemical Chest",
+	"block.projectexpansion.cyan_advanced_alchemical_chest": "Cyan Advanced Alchemical Chest",
+	"block.projectexpansion.purple_advanced_alchemical_chest": "Purple Advanced Alchemical Chest",
+	"block.projectexpansion.blue_advanced_alchemical_chest": "Blue Advanced Alchemical Chest",
+	"block.projectexpansion.brown_advanced_alchemical_chest": "Brown Advanced Alchemical Chest",
+	"block.projectexpansion.green_advanced_alchemical_chest": "Green Advanced Alchemical Chest",
+	"block.projectexpansion.red_advanced_alchemical_chest": "Red Advanced Alchemical Chest",
+	"block.projectexpansion.black_advanced_alchemical_chest": "Black Advanced Alchemical Chest",
 	"block.projectexpansion.collector.tooltip": "Generates EMC once per second.",
 	"block.projectexpansion.collector.emc": "Produced EMC: %s/s",
 	"block.projectexpansion.basic_collector": "Basic Collector [MK 1]",
@@ -176,6 +196,7 @@
 	"gui.projectexpansion.config.infinite_fuel_burn_time.desc": "The ticks each usage of the infinite fuel item will give.",
 	"gui.projectexpansion.config.infinite_steak_cost": "Infinite Steak Cost",
 	"gui.projectexpansion.config.infinite_steak_cost.desc": "The cost of using the infinite steak item.",
+	"gui.projectexpansion.advanced_alchemical_chest.title": "Alchemical Chest",
 	"item.projectexpansion.compressed_collector.tooltip": "Crafting Ingredient",
 	"item.projectexpansion.basic_compressed_collector": "Basic Compressed Collector [MK 1]",
 	"item.projectexpansion.dark_compressed_collector": "Dark Compressed Collector [MK 2]",
@@ -266,6 +287,7 @@
 	"text.projectexpansion.not_owner": "You do not own this, %s does.",
 	"text.projectexpansion.nbt_filter.disable": "NBT Filter Disabled",
 	"text.projectexpansion.nbt_filter.enable": "NBT Filter Enabled",
+	"text.projectexpansion.failed_to_get_knowledge_provider": "Failed to get knowledge provider for %s.",
 	"enchantment.projectexpansion.alchemical_collection": "Alchemical Collection",
 	"enchantment.projectexpansion.alchemical_collection.desc": "Converts any mined items with an emc value directly into emc.",
 	"sounds.projectexpansion.knowledge_sharing_book.store": "Knowledge Stored",

src/generated/resources/assets/projectexpansion/models/block/advanced_alchemical_chest/black.json

@@ -0,0 +1,5 @@
+{
+  "textures": {
+    "particle": "projectexpansion:block/advanced_alchemical_chest/black"
+  }
+}

src/generated/resources/assets/projectexpansion/models/block/advanced_alchemical_chest/blue.json

@@ -0,0 +1,5 @@
+{
+  "textures": {
+    "particle": "projectexpansion:block/advanced_alchemical_chest/blue"
+  }
+}

src/generated/resources/assets/projectexpansion/models/block/advanced_alchemical_chest/brown.json

@@ -0,0 +1,5 @@
+{
+  "textures": {
+    "particle": "projectexpansion:block/advanced_alchemical_chest/brown"
+  }
+}

src/generated/resources/assets/projectexpansion/models/block/advanced_alchemical_chest/cyan.json

@@ -0,0 +1,5 @@
+{
+  "textures": {
+    "particle": "projectexpansion:block/advanced_alchemical_chest/cyan"
+  }
+}

src/generated/resources/assets/projectexpansion/models/block/advanced_alchemical_chest/gray.json

@@ -0,0 +1,5 @@
+{
+  "textures": {
+    "particle": "projectexpansion:block/advanced_alchemical_chest/gray"
+  }
+}

src/generated/resources/assets/projectexpansion/models/block/advanced_alchemical_chest/green.json

@@ -0,0 +1,5 @@
+{
+  "textures": {
+    "particle": "projectexpansion:block/advanced_alchemical_chest/green"
+  }
+}

src/generated/resources/assets/projectexpansion/models/block/advanced_alchemical_chest/light_blue.json

@@ -0,0 +1,5 @@
+{
+  "textures": {
+    "particle": "projectexpansion:block/advanced_alchemical_chest/light_blue"
+  }
+}

src/generated/resources/assets/projectexpansion/models/block/advanced_alchemical_chest/light_gray.json

@@ -0,0 +1,5 @@
+{
+  "textures": {
+    "particle": "projectexpansion:block/advanced_alchemical_chest/light_gray"
+  }
+}

src/generated/resources/assets/projectexpansion/models/block/advanced_alchemical_chest/lime.json

@@ -0,0 +1,5 @@
+{
+  "textures": {
+    "particle": "projectexpansion:block/advanced_alchemical_chest/lime"
+  }
+}

src/generated/resources/assets/projectexpansion/models/block/advanced_alchemical_chest/magenta.json

@@ -0,0 +1,5 @@
+{
+  "textures": {
+    "particle": "projectexpansion:block/advanced_alchemical_chest/magenta"
+  }
+}

src/generated/resources/assets/projectexpansion/models/block/advanced_alchemical_chest/orange.json

@@ -0,0 +1,5 @@
+{
+  "textures": {
+    "particle": "projectexpansion:block/advanced_alchemical_chest/orange"
+  }
+}

src/generated/resources/assets/projectexpansion/models/block/advanced_alchemical_chest/pink.json

@@ -0,0 +1,5 @@
+{
+  "textures": {
+    "particle": "projectexpansion:block/advanced_alchemical_chest/pink"
+  }
+}

src/generated/resources/assets/projectexpansion/models/block/advanced_alchemical_chest/purple.json

@@ -0,0 +1,5 @@
+{
+  "textures": {
+    "particle": "projectexpansion:block/advanced_alchemical_chest/purple"
+  }
+}

src/generated/resources/assets/projectexpansion/models/block/advanced_alchemical_chest/red.json

@@ -0,0 +1,5 @@
+{
+  "textures": {
+    "particle": "projectexpansion:block/advanced_alchemical_chest/red"
+  }
+}

src/generated/resources/assets/projectexpansion/models/block/advanced_alchemical_chest/white.json

@@ -0,0 +1,5 @@
+{
+  "textures": {
+    "particle": "projectexpansion:block/advanced_alchemical_chest/white"
+  }
+}

src/generated/resources/assets/projectexpansion/models/block/advanced_alchemical_chest/yellow.json

@@ -0,0 +1,5 @@
+{
+  "textures": {
+    "particle": "projectexpansion:block/advanced_alchemical_chest/yellow"
+  }
+}

src/generated/resources/assets/projectexpansion/models/item/black_advanced_alchemical_chest.json

@@ -0,0 +1,6 @@
+{
+  "parent": "projecte:block/base_chest",
+  "textures": {
+    "chest": "projectexpansion:block/advanced_alchemical_chest/black"
+  }
+}

src/generated/resources/assets/projectexpansion/models/item/blue_advanced_alchemical_chest.json

@@ -0,0 +1,6 @@
+{
+  "parent": "projecte:block/base_chest",
+  "textures": {
+    "chest": "projectexpansion:block/advanced_alchemical_chest/blue"
+  }
+}

src/generated/resources/assets/projectexpansion/models/item/brown_advanced_alchemical_chest.json

@@ -0,0 +1,6 @@
+{
+  "parent": "projecte:block/base_chest",
+  "textures": {
+    "chest": "projectexpansion:block/advanced_alchemical_chest/brown"
+  }
+}

src/generated/resources/assets/projectexpansion/models/item/cyan_advanced_alchemical_chest.json

@@ -0,0 +1,6 @@
+{
+  "parent": "projecte:block/base_chest",
+  "textures": {
+    "chest": "projectexpansion:block/advanced_alchemical_chest/cyan"
+  }
+}

src/generated/resources/assets/projectexpansion/models/item/gray_advanced_alchemical_chest.json

@@ -0,0 +1,6 @@
+{
+  "parent": "projecte:block/base_chest",
+  "textures": {
+    "chest": "projectexpansion:block/advanced_alchemical_chest/gray"
+  }
+}

src/generated/resources/assets/projectexpansion/models/item/green_advanced_alchemical_chest.json

@@ -0,0 +1,6 @@
+{
+  "parent": "projecte:block/base_chest",
+  "textures": {
+    "chest": "projectexpansion:block/advanced_alchemical_chest/green"
+  }
+}

src/generated/resources/assets/projectexpansion/models/item/light_blue_advanced_alchemical_chest.json

@@ -0,0 +1,6 @@
+{
+  "parent": "projecte:block/base_chest",
+  "textures": {
+    "chest": "projectexpansion:block/advanced_alchemical_chest/light_blue"
+  }
+}

src/generated/resources/assets/projectexpansion/models/item/light_gray_advanced_alchemical_chest.json

@@ -0,0 +1,6 @@
+{
+  "parent": "projecte:block/base_chest",
+  "textures": {
+    "chest": "projectexpansion:block/advanced_alchemical_chest/light_gray"
+  }
+}

src/generated/resources/assets/projectexpansion/models/item/lime_advanced_alchemical_chest.json

@@ -0,0 +1,6 @@
+{
+  "parent": "projecte:block/base_chest",
+  "textures": {
+    "chest": "projectexpansion:block/advanced_alchemical_chest/lime"
+  }
+}

src/generated/resources/assets/projectexpansion/models/item/magenta_advanced_alchemical_chest.json

@@ -0,0 +1,6 @@
+{
+  "parent": "projecte:block/base_chest",
+  "textures": {
+    "chest": "projectexpansion:block/advanced_alchemical_chest/magenta"
+  }
+}