Misc AE2 Fixes and Improvements (#950)

[EXPAND]
[[messages]]
messageTitle = "Misc AE2 Improvements (#950)"
messageBody = '''
[DETAILS]
details = [
"Enables Color Applicator (with Tooltip)",
"Enables Entropy Manipulator",
"Enables Paint Balls",
"Enables Matter Cannon (with Tooltip)",
"Enables Quartz Wrenches",
]
[DETAILS]
'''

[[messages]]
messageTitle = "Fix Unintended Alt Recipe for Cable Anchors (#950)"
messageBody = "[BUG]"
[EXPAND]

overrides/config-overrides/expert/betterquesting/DefaultQuests.json

@@ -56608,7 +56608,7 @@
       "properties:10": {
         "betterquesting:10": {
           "autoclaim:1": 0,
-          "desc:8": "The §3Matter Condenser§r accepts large quantities of items or fluids to turn into data, which can ultimately be converted into a §6Singularity§r. They can also make §6Matter Balls§r, but they are useless in this pack.\n\nA storage component is needed for holding this data. Specifically, you need a §664k Storage Component§r to make a Singularity.\n\nThe fastest way to make these is with §aFluid Lasers§r and a §6Aqueous Accumulator§r. \n\nSet the Aqueous Accumulator§r to output at a fluid laser, configure that fluid laser to `output\u0027, add a fluid laser on your matter condensor set to `input\u0027, and connect them together.\n\nIf you don\u0027t have that, you can surround it with §6Dense Cobblestone Generators§r.\n\nSingularities are required for linking together §aQuantum Link Chambers§r, and for crafting different AE2 and NAE2 parts.\n\nFor the former, you want to detonate a §6Tiny TNT§r with two §6Singularities§r and an §6Ender Pearl§r dropped on the ground next to it. This will create a pair of §6Quantum Entangled Singularities§r, which you can place inside of a Quantum Link Chamber to connect them together.",
+          "desc:8": "The §3Matter Condenser§r accepts large quantities of items or fluids to turn into data, which can ultimately be converted into a §6Singularity§r.\n\nThey can also make §6Matter Balls§r, but they are useless in this pack... well, except for being fired in the §eMatter Cannon§r, and being made into §6Paint Balls§r for the §eColor Applicator§r.\n\nA storage component is needed for holding this data. Specifically, you need a §664k Storage Component§r to make a Singularity.\n\nThe fastest way to make these is with §aFluid Lasers§r and a §6Aqueous Accumulator§r. \n\nSet the Aqueous Accumulator§r to output at a fluid laser, configure that fluid laser to `output\u0027, add a fluid laser on your matter condensor set to `input\u0027, and connect them together.\n\nIf you don\u0027t have that, you can surround it with §6Dense Cobblestone Generators§r.\n\nSingularities are required for linking together §aQuantum Link Chambers§r, and for crafting different AE2 and NAE2 parts.\n\nFor the former, you want to detonate an explosive (like §eTiny TNT§r, §eTNT§r or §ePowderbarrel§r), with a §6Singularity§r and an §6Ender Pearl Dust§r dropped on the ground next to it.\n\nThis will create a pair of §6Quantum Entangled Singularities§r, which you can then place inside of a Quantum Link Chamber to connect them together.",
           "globalshare:1": 0,
           "icon:10": {
             "Count:3": 1,

overrides/config-overrides/normal/betterquesting/DefaultQuests.json

@@ -66680,7 +66680,7 @@
       "properties:10": {
         "betterquesting:10": {
           "autoclaim:1": 0,
-          "desc:8": "The §3Matter Condenser§r accepts large quantities of items or fluids to turn into data, which can ultimately be converted into a §6Singularity§r. They can also make §6Matter Balls§r, but they are useless in this pack.\n\nA storage component is needed for holding this data. Specifically, you need a §664k Storage Component§r to make a Singularity.\n\nThe fastest way to make these is with §aFluid Lasers§r and a §6Aqueous Accumulator§r. \n\nSet the Aqueous Accumulator§r to output at a fluid laser, configure that fluid laser to `output\u0027, add a fluid laser on your matter condensor set to `input\u0027, and connect them together.\n\nIf you don\u0027t have that, you can surround it with §6Dense Cobblestone Generators§r.\n\nSingularities are required for linking together §aQuantum Link Chambers§r, and for crafting different AE2 and NAE2 parts.\n\nFor the former, you want to detonate a §6Tiny TNT§r with two §6Singularities§r and an §6Ender Pearl§r dropped on the ground next to it. This will create a pair of §6Quantum Entangled Singularities§r, which you can place inside of a Quantum Link Chamber to connect them together.",
+          "desc:8": "The §3Matter Condenser§r accepts large quantities of items or fluids to turn into data, which can ultimately be converted into a §6Singularity§r.\n\nThey can also make §6Matter Balls§r, but they are useless in this pack... well, except for being fired in the §eMatter Cannon§r, and being made into §6Paint Balls§r for the §eColor Applicator§r.\n\nA storage component is needed for holding this data. Specifically, you need a §664k Storage Component§r to make a Singularity.\n\nThe fastest way to make these is with §aFluid Lasers§r and a §6Aqueous Accumulator§r. \n\nSet the Aqueous Accumulator§r to output at a fluid laser, configure that fluid laser to `output\u0027, add a fluid laser on your matter condensor set to `input\u0027, and connect them together.\n\nIf you don\u0027t have that, you can surround it with §6Dense Cobblestone Generators§r.\n\nSingularities are required for linking together §aQuantum Link Chambers§r, and for crafting different AE2 and NAE2 parts.\n\nFor the former, you want to detonate an explosive (like §eTiny TNT§r, §eTNT§r or §ePowderbarrel§r), with a §6Singularity§r and an §6Ender Pearl Dust§r dropped on the ground next to it.\n\nThis will create a pair of §6Quantum Entangled Singularities§r, which you can then place inside of a Quantum Link Chamber to connect them together.",
           "globalshare:1": 0,
           "icon:10": {
             "Count:3": 1,

overrides/config/AppliedEnergistics2/AppliedEnergistics2.cfg

@@ -99,7 +99,7 @@ blockingmode {
         gregtech:glass_lens.black
         nomilabs:smallgearextrudershape
         nomilabs:creativeportabletankmold
-        
+
         [ae2stuff]
         appliedenergistics2:material:13
         appliedenergistics2:material:14
@@ -237,18 +237,18 @@ features {
 
     tools {
         B:ChargedStaff=false
-        B:ColorApplicator=false
+        B:ColorApplicator=true
-        B:EntropyManipulator=false
+        B:EntropyManipulator=true
-        B:MatterCannon=false
+        B:MatterCannon=true
         B:MeteoriteCompass=true
-        B:PaintBalls=false
+        B:PaintBalls=true
         B:QuartzAxe=false
         B:QuartzHoe=false
         B:QuartzKnife=true
         B:QuartzPickaxe=false
         B:QuartzSpade=false
         B:QuartzSword=false
-        B:QuartzWrench=false
+        B:QuartzWrench=true
         B:WirelessAccessTerminal=true
     }
 
@@ -332,7 +332,7 @@ features {
 
     blockfeatures {
         B:MassCannonBlockDamage=true
-        B:TinyTNTBlockDamage=true
+        B:TinyTNTBlockDamage=false
     }
 
     facades {
@@ -570,5 +570,3 @@ worldgen {
     I:quartzOresPerCluster=4
     D:spawnChargedChance=0.07999998331069946
 }
-
-

overrides/config/betterquesting/DefaultQuests.json

@@ -66680,7 +66680,7 @@
       "properties:10": {
         "betterquesting:10": {
           "autoclaim:1": 0,
-          "desc:8": "The §3Matter Condenser§r accepts large quantities of items or fluids to turn into data, which can ultimately be converted into a §6Singularity§r. They can also make §6Matter Balls§r, but they are useless in this pack.\n\nA storage component is needed for holding this data. Specifically, you need a §664k Storage Component§r to make a Singularity.\n\nThe fastest way to make these is with §aFluid Lasers§r and a §6Aqueous Accumulator§r. \n\nSet the Aqueous Accumulator§r to output at a fluid laser, configure that fluid laser to `output\u0027, add a fluid laser on your matter condensor set to `input\u0027, and connect them together.\n\nIf you don\u0027t have that, you can surround it with §6Dense Cobblestone Generators§r.\n\nSingularities are required for linking together §aQuantum Link Chambers§r, and for crafting different AE2 and NAE2 parts.\n\nFor the former, you want to detonate a §6Tiny TNT§r with two §6Singularities§r and an §6Ender Pearl§r dropped on the ground next to it. This will create a pair of §6Quantum Entangled Singularities§r, which you can place inside of a Quantum Link Chamber to connect them together.",
+          "desc:8": "The §3Matter Condenser§r accepts large quantities of items or fluids to turn into data, which can ultimately be converted into a §6Singularity§r.\n\nThey can also make §6Matter Balls§r, but they are useless in this pack... well, except for being fired in the §eMatter Cannon§r, and being made into §6Paint Balls§r for the §eColor Applicator§r.\n\nA storage component is needed for holding this data. Specifically, you need a §664k Storage Component§r to make a Singularity.\n\nThe fastest way to make these is with §aFluid Lasers§r and a §6Aqueous Accumulator§r. \n\nSet the Aqueous Accumulator§r to output at a fluid laser, configure that fluid laser to `output\u0027, add a fluid laser on your matter condensor set to `input\u0027, and connect them together.\n\nIf you don\u0027t have that, you can surround it with §6Dense Cobblestone Generators§r.\n\nSingularities are required for linking together §aQuantum Link Chambers§r, and for crafting different AE2 and NAE2 parts.\n\nFor the former, you want to detonate an explosive (like §eTiny TNT§r, §eTNT§r or §ePowderbarrel§r), with a §6Singularity§r and an §6Ender Pearl Dust§r dropped on the ground next to it.\n\nThis will create a pair of §6Quantum Entangled Singularities§r, which you can then place inside of a Quantum Link Chamber to connect them together.",
           "globalshare:1": 0,
           "icon:10": {
             "Count:3": 1,

overrides/config/betterquesting/saved_quests/ExpertQuests.json

@@ -56608,7 +56608,7 @@
       "properties:10": {
         "betterquesting:10": {
           "autoclaim:1": 0,
-          "desc:8": "The §3Matter Condenser§r accepts large quantities of items or fluids to turn into data, which can ultimately be converted into a §6Singularity§r. They can also make §6Matter Balls§r, but they are useless in this pack.\n\nA storage component is needed for holding this data. Specifically, you need a §664k Storage Component§r to make a Singularity.\n\nThe fastest way to make these is with §aFluid Lasers§r and a §6Aqueous Accumulator§r. \n\nSet the Aqueous Accumulator§r to output at a fluid laser, configure that fluid laser to `output\u0027, add a fluid laser on your matter condensor set to `input\u0027, and connect them together.\n\nIf you don\u0027t have that, you can surround it with §6Dense Cobblestone Generators§r.\n\nSingularities are required for linking together §aQuantum Link Chambers§r, and for crafting different AE2 and NAE2 parts.\n\nFor the former, you want to detonate a §6Tiny TNT§r with two §6Singularities§r and an §6Ender Pearl§r dropped on the ground next to it. This will create a pair of §6Quantum Entangled Singularities§r, which you can place inside of a Quantum Link Chamber to connect them together.",
+          "desc:8": "The §3Matter Condenser§r accepts large quantities of items or fluids to turn into data, which can ultimately be converted into a §6Singularity§r.\n\nThey can also make §6Matter Balls§r, but they are useless in this pack... well, except for being fired in the §eMatter Cannon§r, and being made into §6Paint Balls§r for the §eColor Applicator§r.\n\nA storage component is needed for holding this data. Specifically, you need a §664k Storage Component§r to make a Singularity.\n\nThe fastest way to make these is with §aFluid Lasers§r and a §6Aqueous Accumulator§r. \n\nSet the Aqueous Accumulator§r to output at a fluid laser, configure that fluid laser to `output\u0027, add a fluid laser on your matter condensor set to `input\u0027, and connect them together.\n\nIf you don\u0027t have that, you can surround it with §6Dense Cobblestone Generators§r.\n\nSingularities are required for linking together §aQuantum Link Chambers§r, and for crafting different AE2 and NAE2 parts.\n\nFor the former, you want to detonate an explosive (like §eTiny TNT§r, §eTNT§r or §ePowderbarrel§r), with a §6Singularity§r and an §6Ender Pearl Dust§r dropped on the ground next to it.\n\nThis will create a pair of §6Quantum Entangled Singularities§r, which you can then place inside of a Quantum Link Chamber to connect them together.",
           "globalshare:1": 0,
           "icon:10": {
             "Count:3": 1,

overrides/groovy/postInit/Post-Initial/Main/General/Misc/tooltips.groovy

@@ -252,6 +252,28 @@ for (var bus : buses) {
 // Storage Exposer Warning
 addTooltip(item('nae2:exposer'), [translatableEmpty(), translatable("nomiceu.tooltip.ae2.storage_exposer.warning")])
 
+// Matter Cannon
+addTooltip(item('appliedenergistics2:matter_cannon'), [
+	translatableEmpty(),
+	translatable("nomiceu.tooltip.ae2.matter_cannon.1"),
+	translatable("nomiceu.tooltip.ae2.matter_cannon.2"),
+	translatable("nomiceu.tooltip.ae2.storage_cell_like")
+])
+
+// Color Applicator
+addTooltip(item('appliedenergistics2:color_applicator'), [
+	translatableEmpty(),
+	translatable("nomiceu.tooltip.ae2.color_applicator.1"),
+	translatable("nomiceu.tooltip.ae2.storage_cell_like")
+])
+
+// Tiny TNT
+addTooltip(item('appliedenergistics2:tiny_tnt'), [
+	translatable("nomiceu.tooltip.ae2.tiny_tnt.1"),
+	translatable("nomiceu.tooltip.ae2.tiny_tnt.2"),
+	translatable("nomiceu.tooltip.ae2.tiny_tnt.3"),
+])
+
 /* Dimensional Edibles */
 
 // Island Cake

overrides/groovy/postInit/Post-Initial/Main/Mod-Specific/ae2/blocks.groovy

@@ -350,7 +350,7 @@ crafting.shapedBuilder()
 	.register()
 
 // Cable Anchor
-crafting.addShapeless(item('appliedenergistics2:part', 120), [ore('boltSteel')])
+crafting.replaceShapeless(item('appliedenergistics2:part', 120), [ore('boltSteel')])
 
 /* Misc Blocks */
 // Vibrant Quartz Glass

overrides/groovy/postInit/Post-Initial/Main/Mod-Specific/ae2/items.groovy

@@ -4,8 +4,6 @@ import gregtech.api.recipes.RecipeBuilder
 import net.minecraft.item.ItemStack
 import net.minecraftforge.fluids.FluidStack
 
-import java.util.stream.Stream
-
 import static gregtech.api.GTValues.*
 import static com.nomiceu.nomilabs.groovy.GroovyHelpers.GTRecipeHelpers.*
 

overrides/resources/modpack/lang/en_us.lang

@@ -64,7 +64,13 @@ nomiceu.tooltip.ae2.hyper_acceleration_card.1=§bAn even faster version of the A
 nomiceu.tooltip.ae2.hyper_acceleration_card.2=§cOnly Works in ME IO Ports.§r
 nomiceu.tooltip.ae2.buses.warning=§cMay cause TPS lag if used excessively! Use Interfaces instead!§r
 nomiceu.tooltip.ae2.storage_exposer.warning=§cMay cause TPS lag if used on big networks without Filters!§r
-
+nomiceu.tooltip.ae2.tiny_tnt.1=§cCannot be lit with Flint and Steel!
+nomiceu.tooltip.ae2.tiny_tnt.2=§bLight with a Redstone Signal instead!§r
+nomiceu.tooltip.ae2.tiny_tnt.3=§eDoesn't break blocks!§r
+nomiceu.tooltip.ae2.matter_cannon.1=§eAccepts Matter Balls, Paint Balls and Nuggets as ammo.§r
+nomiceu.tooltip.ae2.matter_cannon.2=§bFilled with ammo like a Storage Cell!§r
+nomiceu.tooltip.ae2.color_applicator.1=§eAccepts Paint Balls like a Storage Cell.§r
+nomiceu.tooltip.ae2.storage_cell_like=§bUsing a ME Chest may be helpful!§r
 
 # Dimensional Edibles
 nomiceu.tooltip.dimensionaledibles.island_cake.1=§aUsed by Server Owners to send FTB Teams and Individuals to their Personal Islands!§r