Fix various recipe and item issues

src/generated/resources/assets/gtceu/lang/en_ud.json

@@ -4108,7 +4108,7 @@
   "item.gtceu.basic_integrated_circuit.tooltip.0": "ןnɟɹǝʍod ǝɹoɯ puɐ ɹǝןןɐɯSㄥ§",
   "item.gtceu.basic_integrated_circuit.tooltip.1": "ʇınɔɹıƆ ɹǝı⟘-ΛꞀ9§",
   "item.gtceu.basic_tape": "ǝdɐ⟘",
-  "item.gtceu.basic_tape.tooltip": "sǝnssı ןɐɔıuɐɥɔǝɯ ɹoɟ ɥbnouǝ buoɹʇs ʇoN",
+  "item.gtceu.basic_tape.tooltip": "sɯǝʇı ɹıǝɥʇ buıddoɹp ʇnoɥʇıʍ sǝʇɐɹɔ dn ʞɔıd oʇ pǝsn ǝq uɐƆ\nsǝnssı ןɐɔıuɐɥɔǝɯ ɹoɟ ɥbnouǝ buoɹʇs ʇoㄥ§N",
   "item.gtceu.battery.charge_detailed.0": ")ㄥ§buıuıɐɯǝɹ %s %s/%sɐ§(ㄥ§ %s ɹǝı⟘ - ㄥ§∩Ǝ %s/%sɐ§",
   "item.gtceu.battery.charge_detailed.1": ")ㄥ§buıuıɐɯǝɹ %s %s/%sǝ§(ㄥ§ %s ɹǝı⟘ - ㄥ§∩Ǝ %s/%sǝ§",
   "item.gtceu.battery.charge_detailed.2": ")ㄥ§buıuıɐɯǝɹ %s %s/%sɔ§(ㄥ§ %s ɹǝı⟘ - ㄥ§∩Ǝ %s/%sɔ§",
@@ -4185,7 +4185,6 @@
   "item.gtceu.cpu_chip.tooltip": "ʇıu∩ buıssǝɔoɹԀ ןɐɹʇuǝƆㄥ§",
   "item.gtceu.cpu_wafer": "ɹǝɟɐM ∩ԀƆ",
   "item.gtceu.cpu_wafer.tooltip": "ʇıu∩ buıssǝɔoɹԀ ʍɐᴚㄥ§",
-  "item.gtceu.crafting_table_cover.tooltip": "˙ㄥ§ɹǝʌoƆɟ§ sɐ ǝuıɥɔɐW ɐ uo ㄥ§ɥɔuǝqʞɹoM pǝɔuɐʌpⱯɟ§",
   "item.gtceu.credit_casting_mold": ")ǝbɐuıoƆ( pןoW buıʇsɐƆ",
   "item.gtceu.credit_casting_mold.tooltip": ")¡ʇı ǝsoן ʇ,uoᗡ( suıoƆ buıʞɐɯ ɹoɟ pןoW ǝɹnɔǝSㄥ§",
   "item.gtceu.crushed_bentonite_ore": "ǝʇıuoʇuǝᗺ punoɹ⅁",
@@ -4810,7 +4809,7 @@
   "item.gtceu.sticky_resin": "uısǝᴚ ʎʞɔıʇS",
   "item.gtceu.sugar_gem": "ǝqnƆ ɹɐbnS",
   "item.gtceu.sus_record": "ɔsıᗡ ɔısnW",
-  "item.gtceu.sus_record.desc": "¡ʎssns",
+  "item.gtceu.sus_record.desc": "¡ʎssnsㄥ§",
   "item.gtceu.sword_extruder_mold.tooltip": "spɹoʍS buıʞɐɯ ɹoɟ ǝdɐɥS ɹǝpnɹʇxƎㄥ§",
   "item.gtceu.talc_dust": "ɔןɐ⟘",
   "item.gtceu.tantalum_capacitor": "ɹoʇıɔɐdɐƆ ɯnןɐʇuɐ⟘",

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

@@ -4108,7 +4108,7 @@
   "item.gtceu.basic_integrated_circuit.tooltip.0": "§7Smaller and more powerful",
   "item.gtceu.basic_integrated_circuit.tooltip.1": "§6LV-Tier Circuit",
   "item.gtceu.basic_tape": "Tape",
-  "item.gtceu.basic_tape.tooltip": "Not strong enough for mechanical issues",
+  "item.gtceu.basic_tape.tooltip": "N§7ot strong enough for mechanical issues\nCan be used to pick up crates without dropping their items",
   "item.gtceu.battery.charge_detailed.0": "§a%s/%s EU§7 - Tier %s §7(§a%s/%s %s remaining§7)",
   "item.gtceu.battery.charge_detailed.1": "§e%s/%s EU§7 - Tier %s §7(§e%s/%s %s remaining§7)",
   "item.gtceu.battery.charge_detailed.2": "§c%s/%s EU§7 - Tier %s §7(§c%s/%s %s remaining§7)",
@@ -4185,7 +4185,6 @@
   "item.gtceu.cpu_chip.tooltip": "§7Central Processing Unit",
   "item.gtceu.cpu_wafer": "CPU Wafer",
   "item.gtceu.cpu_wafer.tooltip": "§7Raw Processing Unit",
-  "item.gtceu.crafting_table_cover.tooltip": "§fAdvanced Workbench§7 on a Machine as §fCover§7.",
   "item.gtceu.credit_casting_mold": "Casting Mold (Coinage)",
   "item.gtceu.credit_casting_mold.tooltip": "§7Secure Mold for making Coins (Don't lose it!)",
   "item.gtceu.crushed_bentonite_ore": "Ground Bentonite",
@@ -4810,7 +4809,7 @@
   "item.gtceu.sticky_resin": "Sticky Resin",
   "item.gtceu.sugar_gem": "Sugar Cube",
   "item.gtceu.sus_record": "Music Disc",
-  "item.gtceu.sus_record.desc": "sussy!",
+  "item.gtceu.sus_record.desc": "§7sussy!",
   "item.gtceu.sword_extruder_mold.tooltip": "§7Extruder Shape for making Swords",
   "item.gtceu.talc_dust": "Talc",
   "item.gtceu.tantalum_capacitor": "Tantalum Capacitor",

src/generated/resources/data/minecraft/tags/blocks/mineable/axe.json

@@ -28,6 +28,8 @@
     "gtceu:treated_wood_wall_hanging_sign",
     "gtceu:treated_wood_pressure_plate",
     "gtceu:treated_wood_trapdoor",
-    "gtceu:treated_wood_stairs"
+    "gtceu:treated_wood_stairs",
+    "gtceu:wood_drum",
+    "gtceu:wood_crate"
   ]
 }

src/main/java/com/gregtechceu/gtceu/common/data/GTMaterials.java

@@ -176,8 +176,8 @@ public static void init() {
         rock.setIgnored(Deepslate, Blocks.DEEPSLATE);
         rock.setIgnored(Basalt, Blocks.BASALT);
         block.setIgnored(Sculk, Blocks.SCULK);
-        block.setIgnored(Concrete, SupplierMemoizer.memoizeBlockSupplier(() -> GTBlocks.LIGHT_CONCRETE.get()));
         block.setIgnored(Concrete, SupplierMemoizer.memoizeBlockSupplier(() -> GTBlocks.DARK_CONCRETE.get()));
+        block.setIgnored(Concrete, SupplierMemoizer.memoizeBlockSupplier(() -> GTBlocks.LIGHT_CONCRETE.get()));
 
         for (TagPrefix prefix : ORES.keySet()) {
             TagPrefix.OreType oreType = ORES.get(prefix);
@@ -921,6 +921,7 @@ private static void excludeAllGemsButNormal(Material material) {
     public static Material Gypsum;
     public static Material Zeolite;
     public static Material Concrete;
+    public static Material DarkConcrete;
     public static Material SteelMagnetic;
     public static Material VanadiumSteel;
     public static Material Potin;

src/main/java/com/gregtechceu/gtceu/data/lang/ItemLang.java

@@ -327,7 +327,6 @@ private static void initItemTooltips(RegistrateLangProvider provider) {
                 "§7Voids §fItems§7 with amount control as §fCover§7.\nActivate with §fSoft Mallet§7 after placement.");
         provider.add("item.gtceu.facade_cover.tooltip", "§7Decorative Outfit §fCover§7.");
         provider.add("item.gtceu.computer_monitor_cover.tooltip", "§7Displays §fData§7 as §fCover§7.");
-        provider.add("item.gtceu.crafting_table_cover.tooltip", "§fAdvanced Workbench§7 on a Machine as §fCover§7.");
         provider.add("item.gtceu.shutter_module_cover.tooltip",
                 "§fBlocks Transfer§7 through attached Side as §fCover§7.");
         multilineLang(provider, "item.gtceu.solar_panel.tooltip",
@@ -342,8 +341,9 @@ private static void initItemTooltips(RegistrateLangProvider provider) {
         multilineLang(provider, "item.gtceu.foam_sprayer.tooltip",
                 "§7Sprays Construction Foam\nUse on a frame to foam connected frames\nFoam can be colored");
         provider.add("item.gtceu.firebrick.tooltip", "§7Heat resistant");
-        provider.add("item.gtceu.basic_tape.tooltip", "Not strong enough for mechanical issues");
+        provider.add("item.gtceu.basic_tape.tooltip",
+                "N§7ot strong enough for mechanical issues\nCan be used to pick up crates without dropping their items");
 
-        provider.add("item.gtceu.sus_record.desc", "sussy!");
+        provider.add("item.gtceu.sus_record.desc", "§7sussy!");
     }
 }

src/main/java/com/gregtechceu/gtceu/data/recipe/configurable/RecipeAddition.java

@@ -1242,8 +1242,8 @@ private static void hardMiscRecipes(Consumer<FinishedRecipe> provider) {
 
             VanillaRecipeHelper.addShapedRecipe(provider, "lightning_rod", new ItemStack(Blocks.LIGHTNING_ROD), " B ",
                     "fRh", " R ",
-                    'R', rod, Copper,
-                    'B', plateDouble, Copper);
+                    'R', new UnificationEntry(rod, Copper),
+                    'B', new UnificationEntry(plateDouble, Copper));
 
             ASSEMBLER_RECIPES.recipeBuilder("lightning_rod")
                     .inputItems(rod, Copper, 2)
@@ -1324,17 +1324,36 @@ private static void hardMiscRecipes(Consumer<FinishedRecipe> provider) {
             // 'L', new ItemStack(Items.CRYING_OBSIDIAN),
             // 'G', new UnificationEntry(plate, Glowstone));
 
-            VanillaRecipeHelper.addShapedRecipe(provider, "chain", new ItemStack(Items.CHAIN), " R ",
+            VanillaRecipeHelper.addShapedRecipe(provider, "chain_iron", new ItemStack(Items.CHAIN), " R ",
                     "wR ", " R ",
                     'R', new UnificationEntry(ring, Iron));
 
-            ASSEMBLER_RECIPES.recipeBuilder("chain")
+            ASSEMBLER_RECIPES.recipeBuilder("chain_iron")
                     .inputItems(ring, Iron, 3)
-                    .outputItems(new ItemStack(Items.CHAIN))
+                    .outputItems(new ItemStack(Items.CHAIN, 2))
+                    .duration(40).EUt(10).save(provider);
+
+            VanillaRecipeHelper.addShapedRecipe(provider, "chain_wrought_iron", new ItemStack(Items.CHAIN, 2), " R ",
+                    "wR ", " R ",
+                    'R', new UnificationEntry(ring, WroughtIron));
+
+            ASSEMBLER_RECIPES.recipeBuilder("chain_wrought_iron")
+                    .inputItems(ring, WroughtIron, 3)
+                    .outputItems(new ItemStack(Items.CHAIN, 3))
+                    .duration(40).EUt(10).save(provider);
+
+            VanillaRecipeHelper.addShapedRecipe(provider, "chain_steel", new ItemStack(Items.CHAIN, 3), " R ",
+                    "wR ", " R ",
+                    'R', new UnificationEntry(ring, Steel));
+
+            ASSEMBLER_RECIPES.recipeBuilder("chain_steel")
+                    .inputItems(ring, Steel, 3)
+                    .outputItems(new ItemStack(Items.CHAIN, 4))
                     .duration(40).EUt(10).save(provider);
 
             for (DyeColor color : DyeColor.values()) {
                 addBedRecipe(provider, color);
+                addCarpetRecipe(provider, color);
             }
 
         } else {
@@ -1374,7 +1393,17 @@ private static void addBedRecipe(Consumer<FinishedRecipe> provider, DyeColor col
                 'F', ItemTags.WOODEN_FENCES);
     }
 
-    private static void hardGlassRecipes(Consumer<FinishedRecipe> provider) {}
+    private static void addCarpetRecipe(Consumer<FinishedRecipe> provider, DyeColor color) {
+        String colorName = color.getName();
+        VanillaRecipeHelper.addShapedRecipe(provider, colorName + "_carpet",
+                new ItemStack(BuiltInRegistries.ITEM.get(new ResourceLocation(colorName + "_carpet"))), "WW",
+                'W', BuiltInRegistries.ITEM.get(new ResourceLocation(colorName + "_wool")));
+    }
+
+    private static void hardGlassRecipes(Consumer<FinishedRecipe> provider) {
+        VanillaRecipeHelper.addShapedRecipe(provider, "glass_pane", new ItemStack(Blocks.GLASS_PANE, 2), "sG", 'G',
+                new ItemStack(Blocks.GLASS));
+    }
 
     private static void nerfPaperCrafting(Consumer<FinishedRecipe> provider) {
         VanillaRecipeHelper.addShapedRecipe(provider, "paper_dust",

src/main/java/com/gregtechceu/gtceu/data/recipe/configurable/RecipeRemoval.java

@@ -102,7 +102,8 @@ private static void disableManualCompression(Consumer<ResourceLocation> registry
         registry.accept(new ResourceLocation("minecraft:glowstone"));
         registry.accept(new ResourceLocation("minecraft:amethyst_block"));
         registry.accept(new ResourceLocation("minecraft:copper_block"));
-        registry.accept(new ResourceLocation("minecraft:copper"));
+        registry.accept(new ResourceLocation("minecraft:copper_ingot"));
+        registry.accept(new ResourceLocation("minecraft:copper_ingot_from_waxed_copper_block"));
         registry.accept(new ResourceLocation("minecraft:honeycomb_block"));
         registry.accept(new ResourceLocation("minecraft:snow_block"));
         registry.accept(new ResourceLocation("minecraft:netherite_block"));
@@ -265,6 +266,8 @@ private static void hardMiscRecipes(Consumer<ResourceLocation> registry) {
         registry.accept(new ResourceLocation("minecraft:recovery_compass"));
         registry.accept(new ResourceLocation("minecraft:spyglass"));
         registry.accept(new ResourceLocation("minecraft:chain"));
+        registry.accept(new ResourceLocation("minecraft:packed_ice"));
+        registry.accept(new ResourceLocation("minecraft:lodestone"));
     }
 
     private static void hardGlassRecipes(Consumer<ResourceLocation> registry) {
@@ -349,6 +352,7 @@ private static void removeVanillaBlockRecipes(Consumer<ResourceLocation> registr
         registry.accept(new ResourceLocation("minecraft:cracked_stone_bricks"));
         registry.accept(new ResourceLocation("minecraft:mossy_cobblestone_from_moss_block"));
         registry.accept(new ResourceLocation("minecraft:mossy_cobblestone_from_vine"));
+        // TODO add recipes for ALL of these. sigh where do the nitpicks end
         // registry.accept(new ResourceLocation("minecraft:deepslate_bricks"));
         // registry.accept(new ResourceLocation("minecraft:cracked_nether_bricks"));
         // registry.accept(new ResourceLocation("minecraft:chiseled_nether_bricks"));
@@ -374,8 +378,9 @@ private static void removeVanillaBlockRecipes(Consumer<ResourceLocation> registr
         // registry.accept(new ResourceLocation("minecraft:waxed_weathered_cut_copper"));
         // registry.accept(new ResourceLocation("minecraft:waxed_oxidized_cut_copper"));
         // registry.accept(new ResourceLocation("minecraft:end_crystal"));
-        // registry.accept(new ResourceLocation("minecraft:end_rod")); // wait for approval before uncommenting this one
+        registry.accept(new ResourceLocation("minecraft:end_rod"));
         // registry.accept(new ResourceLocation("minecraft:mud_bricks")); //no other way to obtain these rn
+        registry.accept(new ResourceLocation("minecraft:dripstone_block"));
 
         // Carpet replacement
         for (DyeColor color : DyeColor.values()) {

src/main/java/com/gregtechceu/gtceu/data/recipe/misc/CraftingRecipeLoader.java

@@ -88,6 +88,8 @@ public static void init(Consumer<FinishedRecipe> provider) {
 
         VanillaRecipeHelper.addSmeltingRecipe(provider, "wrought_iron_nugget", ChemicalHelper.getTag(nugget, Iron),
                 ChemicalHelper.get(nugget, WroughtIron));
+        VanillaRecipeHelper.addShapelessRecipe(provider, "nugget_disassembling_iron",
+                new ItemStack(Items.IRON_NUGGET, 9), new ItemStack(Items.IRON_INGOT), 's');
 
         // TODO clipboard
         // VanillaRecipeHelper.addShapedRecipe(provider, "clipboard", CLIPBOARD.asStack(), " Sd", "BWR", "PPP", 'P',

src/main/java/com/gregtechceu/gtceu/data/recipe/misc/MiscRecipeLoader.java

@@ -539,5 +539,12 @@ public static void init(Consumer<FinishedRecipe> provider) {
                 .inputItems(ring, Steel, 2)
                 .outputItems(STEEL_MINECART_WHEELS)
                 .duration(60).EUt(20).save(provider);
+
+        FLUID_SOLIDFICATION_RECIPES.recipeBuilder("light_concrete")
+        .inputFluids(Concrete.getFluid(144))
+        .inputItems(SHAPE_MOLD_BLOCK)
+        .outputItems(GTBlocks.LIGHT_CONCRETE)
+        .duration(100).EUt(VA[ULV])
+        .save(provider);
     }
 }

src/main/java/com/gregtechceu/gtceu/data/recipe/misc/VanillaStandardRecipes.java

@@ -92,20 +92,34 @@ private static void compressingRecipes(Consumer<FinishedRecipe> provider) {
                 .outputItems(new ItemStack(Blocks.GLOWSTONE))
                 .save(provider);
 
-        COMPRESSOR_RECIPES.recipeBuilder("packed_ice").inputItems(new ItemStack(Blocks.ICE, 9))
-                .outputItems(new ItemStack(Blocks.PACKED_ICE)).save(provider);
-        COMPRESSOR_RECIPES.recipeBuilder("blue_ice").inputItems(new ItemStack(Blocks.PACKED_ICE, 9))
-                .outputItems(new ItemStack(Blocks.BLUE_ICE)).save(provider);
-        COMPRESSOR_RECIPES.recipeBuilder("ice_from_dust").inputItems(dust, Ice).outputItems(new ItemStack(Blocks.ICE))
+        COMPRESSOR_RECIPES.recipeBuilder("packed_ice")
+                .inputItems(new ItemStack(Blocks.ICE, 9))
+                .outputItems(new ItemStack(Blocks.PACKED_ICE))
+                .duration(300).EUt(2)
                 .save(provider);
+
+        COMPRESSOR_RECIPES.recipeBuilder("blue_ice")
+                .inputItems(new ItemStack(Blocks.PACKED_ICE, 9))
+                .outputItems(new ItemStack(Blocks.BLUE_ICE))
+                .duration(300).EUt(2)
+                .save(provider);
+
+        COMPRESSOR_RECIPES.recipeBuilder("ice_from_dust")
+                .inputItems(dust, Ice)
+                .outputItems(new ItemStack(Blocks.ICE))
+                .duration(300).EUt(2)
+                .save(provider);
+
         COMPRESSOR_RECIPES.recipeBuilder("dripstone_block_from_pointed_dripstone")
                 .inputItems(new ItemStack(Items.POINTED_DRIPSTONE, 4))
                 .outputItems(new ItemStack(Blocks.DRIPSTONE_BLOCK))
+                .duration(300).EUt(2)
                 .save(provider);
 
         FORGE_HAMMER_RECIPES.recipeBuilder("pointed_dripstone_from_dripstone_block")
                 .inputItems(new ItemStack(Blocks.DRIPSTONE_BLOCK))
                 .outputItems(new ItemStack(Items.POINTED_DRIPSTONE, 4))
+                .duration(300).EUt(2)
                 .save(provider);
 
         PACKER_RECIPES.recipeBuilder("hay_block")
@@ -208,9 +222,6 @@ private static void glassRecipes(Consumer<FinishedRecipe> provider) {
         // .save(provider);
         // }
 
-        VanillaRecipeHelper.addShapedRecipe(provider, "glass_pane", new ItemStack(Blocks.GLASS_PANE, 2), "sG", 'G',
-                new ItemStack(Blocks.GLASS));
-
         CUTTER_RECIPES.recipeBuilder("cut_glass_block_to_plate").duration(50).EUt(VA[ULV])
                 .inputItems(new ItemStack(Blocks.GLASS, 3))
                 .outputItems(new ItemStack(Blocks.GLASS_PANE, 8))
@@ -396,13 +407,6 @@ private static void woodRecipes(Consumer<FinishedRecipe> provider) {
                 .duration(100).EUt(4)
                 .save(provider);
 
-        // todo trapdoors
-        // ASSEMBLER_RECIPES.recipeBuilder()
-        // .inputItems(ItemTags.PLANKS, 3).circuitMeta(3)
-        // .outputItems(new ItemStack(Blocks.TRAPDOOR, 2))
-        // .duration(100).EUt(4)
-        // .save(provider);
-
         ASSEMBLER_RECIPES.recipeBuilder("chest")
                 .inputItems(ItemTags.PLANKS, 8)
                 .outputItems(new ItemStack(Blocks.CHEST))
@@ -445,7 +449,7 @@ private static void woodRecipes(Consumer<FinishedRecipe> provider) {
                 .outputItems(new ItemStack(Blocks.SOUL_TORCH))
                 .duration(100).EUt(1).save(provider);
 
-        ASSEMBLER_RECIPES.recipeBuilder("soul_lantern")
+        ASSEMBLER_RECIPES.recipeBuilder("soul_lantern_from_lantern")
                 .inputItems(new ItemStack(Blocks.LANTERN))
                 .inputItems(ItemTags.SOUL_FIRE_BASE_BLOCKS)
                 .outputItems(new ItemStack(Blocks.SOUL_LANTERN))
@@ -547,6 +551,16 @@ private static void woodRecipes(Consumer<FinishedRecipe> provider) {
                 'W', ItemTags.WOOL, 'S', new ItemStack(Items.STICK), 'B', Creosote.getBucket());
         VanillaRecipeHelper.addShapedRecipe(provider, "soul_torch", new ItemStack(Blocks.SOUL_TORCH, 1), "WB",
                 'W', ItemTags.SOUL_FIRE_BASE_BLOCKS, 'B', new ItemStack(Blocks.TORCH));
+        if (!ConfigHolder.INSTANCE.recipes.hardMiscRecipes) {
+            VanillaRecipeHelper.addShapedRecipe(provider, "soul_lantern", new ItemStack(Blocks.SOUL_LANTERN, 1), "WB",
+                    'W', ItemTags.SOUL_FIRE_BASE_BLOCKS, 'B', new ItemStack(Blocks.SOUL_LANTERN));
+
+            ASSEMBLER_RECIPES.recipeBuilder("soul_lantern")
+                    .inputItems(new ItemStack(Blocks.LANTERN))
+                    .inputItems(ItemTags.SOUL_FIRE_BASE_BLOCKS)
+                    .outputItems(new ItemStack(Blocks.SOUL_LANTERN))
+                    .duration(100).EUt(1).save(provider);
+        }
 
         ASSEMBLER_RECIPES.recipeBuilder("redstone_torch").EUt(4).inputItems(dust, Redstone)
                 .inputItems(new ItemStack(Items.STICK)).outputItems(new ItemStack(Blocks.REDSTONE_TORCH, 1))
@@ -1177,6 +1191,9 @@ private static void miscRecipes(Consumer<FinishedRecipe> provider) {
         ASSEMBLER_RECIPES.recipeBuilder("hopper_minecart").EUt(4).duration(100)
                 .inputItems(new ItemStack(Items.MINECART)).inputItems(new ItemStack(Blocks.HOPPER))
                 .outputItems(new ItemStack(Items.HOPPER_MINECART)).save(provider);
+
+        VanillaRecipeHelper.addShapelessRecipe(provider, "hay_block_to_hay", new ItemStack(Items.WHEAT, 9),
+                Items.HAY_BLOCK, 'k');
     }
 
     /**