Browse Source

More Compat Updates for Et Futurum Requiem

Gregorius Techneticies 2 months ago
parent
commit
e8cbd4c87e
Signed by: Gregorius Techneticies <gregoriustech@gmail.com> GPG Key ID: 1B693EA14F2FD70F

+ 1
- 1
CHANGELOG.md View File

@@ -12,7 +12,7 @@ Nothing (I tend to only add finished Stuff to the Changelog).
12 12
 6.14.09: (Not released yet, released whenever it needs to be)
13 13
 [NOTE] The Default Config Pack updated to disable Fastcrafts Chunk Culling, so that Ocean Floors are now rendering properly again. Set "enableCullingTweaks" to false in the "config/fastcraft.ini" File, if you experience this Issue.
14 14
 [COMPAT] Aroma1997's Mining Dimension is now Compatible with my Worldgen.
15
-[COMPAT] Et Futurum Requiem is now supported properly and up to date. Its Netherite Items are preferred over the ones of Netherite Plus.
15
+[COMPAT] Et Futurum Requiem is now supported properly and up to date. Its Netherite Items are preferred over the ones of Netherite Plus. https://www.curseforge.com/minecraft/mc-mods/et-futurum-requiem/files
16 16
 [FIXED] Infinite Worldgen Loop with Oceans, because I forgot to set the Block Update Flag to 2 during Worldgen, because ofcourse I left it to default when I fixed another Ocean related Bug...
17 17
 [FIXED] Coal and Oil Shale Stone Layer Ore Blocks were flammable t othe point of burning up way too much. Now they are still flammable but Fire wont spread to them.
18 18
 [FIXED] Railcraft Crowbars should now be able to remove Covers again, even if they dont use the overlay for technical reasons.

+ 14
- 13
src/main/java/gregapi/GT_API_Post.java View File

@@ -551,31 +551,32 @@ public class GT_API_Post extends Abstract_Mod {
551 551
 		}
552 552
 		
553 553
 		if (MD.EtFu.mLoaded) {
554
-			BlocksGT.FLOWERS.add(ST.block(MD.EtFu, "rose"));
555
-			BlocksGT.FLOWERS.add(ST.block(MD.EtFu, "cornflower"));
554
+			BlocksGT.FLOWERS.add(ST.block(MD.EtFu, "rose"              ));
555
+			BlocksGT.FLOWERS.add(ST.block(MD.EtFu, "cornflower"        ));
556
+			BlocksGT.FLOWERS.add(ST.block(MD.EtFu, "lily_of_the_valley"));
556 557
 		}
557 558
 		if (MD.BoP.mLoaded) {
558
-			BlocksGT.FLOWERS.add(ST.block(MD.BoP, "flowers"));
559
-			BlocksGT.FLOWERS.add(ST.block(MD.BoP, "flowers2"));
559
+			BlocksGT.FLOWERS.add(ST.block(MD.BoP , "flowers"           ));
560
+			BlocksGT.FLOWERS.add(ST.block(MD.BoP , "flowers2"          ));
560 561
 		}
561 562
 		if (MD.EBXL.mLoaded) {
562
-			BlocksGT.FLOWERS.add(ST.block(MD.EBXL, "flower1"));
563
-			BlocksGT.FLOWERS.add(ST.block(MD.EBXL, "flower2"));
564
-			BlocksGT.FLOWERS.add(ST.block(MD.EBXL, "flower3"));
563
+			BlocksGT.FLOWERS.add(ST.block(MD.EBXL, "flower1"           ));
564
+			BlocksGT.FLOWERS.add(ST.block(MD.EBXL, "flower2"           ));
565
+			BlocksGT.FLOWERS.add(ST.block(MD.EBXL, "flower3"           ));
565 566
 		}
566 567
 		if (MD.TCFM.mLoaded) {
567
-			BlocksGT.FLOWERS.add(ST.block(MD.TCFM, "InkFlower"));
568
-			BlocksGT.FLOWERS.add(ST.block(MD.TCFM, "UmbralBush"));
568
+			BlocksGT.FLOWERS.add(ST.block(MD.TCFM, "InkFlower"         ));
569
+			BlocksGT.FLOWERS.add(ST.block(MD.TCFM, "UmbralBush"        ));
569 570
 		}
570 571
 		if (MD.BP.mLoaded) {
571
-			BlocksGT.FLOWERS.add(ST.block(MD.BP, "indigo_flower"));
572
+			BlocksGT.FLOWERS.add(ST.block(MD.BP  , "indigo_flower"     ));
572 573
 		}
573 574
 		if (MD.ARS.mLoaded) {
574
-			BlocksGT.FLOWERS.add(ST.block(MD.ARS, "blueOrchid"));
575
+			BlocksGT.FLOWERS.add(ST.block(MD.ARS , "blueOrchid"        ));
575 576
 		}
576 577
 		if (MD.BOTA.mLoaded) {
577
-			BlocksGT.FLOWERS.add(ST.block(MD.BOTA, "flower"));
578
-			BlocksGT.FLOWERS.add(ST.block(MD.BOTA, "shinyFlower"));
578
+			BlocksGT.FLOWERS.add(ST.block(MD.BOTA, "flower"            ));
579
+			BlocksGT.FLOWERS.add(ST.block(MD.BOTA, "shinyFlower"       ));
579 580
 		}
580 581
 		
581 582
 		for (Enchantment tEnchant : Enchantment.enchantmentsList) if (tEnchant != null) {

+ 1
- 1
src/main/java/gregapi/data/IL.java View File

@@ -91,7 +91,7 @@ public enum IL implements IItemContainer {
91 91
 	NeLi_Torch_Soul, NeLi_Torch_Fox, NeLi_Torch_Shadow, NeLi_Fire_Soul, NeLi_Fire_Shadow, NeLi_Fire_Fox, NeLi_Obsidian, NeLi_Blackstone_Crying, NeLi_Bowl_DevilishMaize, NeLi_Bowl_DevilishPopcorn, NeLi_Bowl_CrimsonStew, NeLi_Bowl_WarpedStew, NeLi_Bowl_FoxfireStew, NeLi_Bottle_Hellderberryjuice, NeLi_Bucket_Spectral_Dew, NeLi_ShroomLight, NeLi_Gloomstone, NeLi_Reed, NeLi_Wither_Rose, NeLi_Foxfire_Lily, NeLi_Foxfire_Powder, NeLi_Wart_Crimson, NeLi_Wart_Warped, NeLi_Wart_Soggy, NeLi_Bread, NeLi_Cookie, NeLi_SoulSoil, NeLi_SoulFarm, NeLi_Gravel, NeLi_Magmatic_Netherrack, NeLi_Magmatic_Blackstone, NeLi_Strider_Flank_Raw, NeLi_Strider_Flank_Cooked,
92 92
 	NeLi_Quartz_Bricks, NeLi_Quartz_Smooth, NeLi_Quartz_Chiseled_Pillar, NeLi_Void_Block, NeLi_Void_Bricks, NeLi_Void_Smooth, NeLi_Void_Chiseled, NeLi_Void_Pillar, NeLi_Void_Chiseled_Pillar,
93 93
 	NeLi_Stem_Crimson, NeLi_Stem_Warped, NeLi_Stem_FoxFire, NeLi_Beam1_Crimson, NeLi_Beam1_Warped, NeLi_Beam1_FoxFire, NeLi_Hyphae_Crimson, NeLi_Hyphae_Warped, NeLi_Hyphae_FoxFire, NeLi_Beam2_Crimson, NeLi_Beam2_Warped, NeLi_Beam2_FoxFire,
94
-	EtFu_Chorus_Fruit, EtFu_Chorus_Popped, EtFu_Rabbit_Foot, EtFu_Beet_Seeds, EtFu_Dragon_Breath, EtFu_Lingering_Potion, EtFu_Path, EtFu_Dirt, EtFu_Gravel, EtFu_Sandstone, EtFu_Obsidian, EtFu_Quartz_Bricks, EtFu_Magmatic_Netherrack, EtFu_Barrel,
94
+	EtFu_Chorus_Fruit, EtFu_Chorus_Popped, EtFu_Rabbit_Foot, EtFu_Beet_Seeds, EtFu_Dragon_Breath, EtFu_Lingering_Potion, EtFu_Path, EtFu_Dirt, EtFu_Gravel, EtFu_Sandstone, EtFu_Obsidian, EtFu_Quartz_Bricks, EtFu_Magmatic_Netherrack, EtFu_Barrel, EtFu_Wither_Rose,
95 95
 	EtFu_Granite, EtFu_Diorite, EtFu_Andesite, EtFu_Granite_Smooth, EtFu_Diorite_Smooth, EtFu_Andesite_Smooth,
96 96
 	GaSu_Granite, GaSu_Diorite, GaSu_Andesite, GaSu_Granite_Smooth, GaSu_Diorite_Smooth, GaSu_Andesite_Smooth, GaSu_Basalt, GaSu_Basalt_Smooth, GaSu_Beet_Seeds,
97 97
 	CHSL_Granite, CHSL_Diorite, CHSL_Andesite, CHSL_Granite_Smooth, CHSL_Diorite_Smooth, CHSL_Andesite_Smooth,

+ 2
- 1
src/main/java/gregapi/data/OD.java View File

@@ -1,5 +1,5 @@
1 1
 /**
2
- * Copyright (c) 2020 GregTech-6 Team
2
+ * Copyright (c) 2021 GregTech-6 Team
3 3
  *
4 4
  * This file is part of GregTech.
5 5
  *
@@ -117,6 +117,7 @@ public enum OD {
117 117
 	, woodLog
118 118
 	, woodRubber
119 119
 	, flower
120
+	, flowerWither
120 121
 	, bamboo
121 122
 	, record
122 123
 	, beeComb

+ 3
- 2
src/main/java/gregapi/load/LoaderItemList.java View File

@@ -1102,7 +1102,7 @@ public class LoaderItemList implements Runnable {
1102 1102
 		IL.NeLi_SoulFarm                        .set(ST.make(MD.NeLi, "SoulFarmland"                        , 1, 0), null, OD.soulsand);
1103 1103
 		IL.NeLi_Gravel                          .set(ST.make(MD.NeLi, "Nether_Gravel"                       , 1, 0), null, OD.gravel);
1104 1104
 		IL.NeLi_Foxfire_Lily                    .set(ST.make(MD.NeLi, "FoxfireLily"                         , 1, 0), null, OD.flower);
1105
-		IL.NeLi_Wither_Rose                     .set(ST.make(MD.NeLi, "WitherRose"                          , 1, 0), null, OD.flower);
1105
+		IL.NeLi_Wither_Rose                     .set(ST.make(MD.NeLi, "WitherRose"                          , 1, 0), null, OD.flower, OD.flowerWither);
1106 1106
 		IL.NeLi_Strider_Flank_Raw               .set(ST.make(MD.NeLi, "StriderFlankRaw"                     , 1, 0), new OreDictItemData(MT.MeatRaw   , U*2, MT.Bone, U9), "listAllmeatraw");
1107 1107
 		IL.NeLi_Strider_Flank_Cooked            .set(ST.make(MD.NeLi, "StriderFlankCooked"                  , 1, 0), new OreDictItemData(MT.MeatCooked, U*2, MT.Bone, U9), "listAllmeatcooked");
1108 1108
 		IL.NeLi_Bread                           .set(ST.make(MD.NeLi, "AbyssalBread"                        , 1, 0), null, "foodBread");
@@ -1137,10 +1137,11 @@ public class LoaderItemList implements Runnable {
1137 1137
 		IL.EtFu_Beet_Seeds                      .set(ST.make(MD.EtFu, "beetroot_seeds"                      , 1, 0), null, "seedBeet");
1138 1138
 		IL.EtFu_Dragon_Breath                   .set(ST.make(MD.EtFu, "dragon_breath"                       , 1, 0));
1139 1139
 		IL.EtFu_Lingering_Potion                .set(ST.make(MD.EtFu, "lingering_potion"                    , 1, 0));
1140
+		IL.EtFu_Wither_Rose                     .set(ST.make(MD.EtFu, "wither_rose"                         , 1, 0), null, OD.flower, OD.flowerWither);
1140 1141
 		IL.EtFu_Barrel                          .set(ST.make(MD.EtFu, "barrel"                              , 1, 0), new OreDictItemData(ANY.Wood, 7*U), OD.craftingChest);
1141 1142
 		IL.EtFu_Obsidian                        .set(ST.make(MD.EtFu, "crying_obsidian"                     , 1, 0), new OreDictItemData(MT.Obsidian, U*9, MT.Lapis, U), OD.cryingObsidian);
1142 1143
 		IL.EtFu_Quartz_Bricks                   .set(ST.make(MD.EtFu, "quartz_bricks"                       , 1, 0), new OreDictItemData(MT.NetherQuartz   , U*4));
1143
-		IL.EtFu_Magmatic_Netherrack             .set(ST.make(MD.EtFu, "magma"                               , 1, 1), new OreDictItemData(MT.Netherrack, U));
1144
+		IL.EtFu_Magmatic_Netherrack             .set(ST.make(MD.EtFu, "magma"                               , 1, 0), new OreDictItemData(MT.Netherrack, U));
1144 1145
 		IL.EtFu_Sandstone                       .set(ST.make(MD.EtFu, "red_sandstone"                       , 1, 0));
1145 1146
 		IL.EtFu_Path                            .set(ST.make(MD.EtFu, "grass_path"                          , 1, 0));
1146 1147
 		IL.EtFu_Dirt                            .set(ST.make(MD.EtFu, "coarse_dirt"                         , 1, 0));

+ 1
- 0
src/main/java/gregapi/load/LoaderUnificationTargets.java View File

@@ -743,6 +743,7 @@ public class LoaderUnificationTargets implements Runnable {
743 743
 		OreDictManager.INSTANCE.setTarget(OP.ingot          , MT.Netherite              , ST.make(MD.EtFu, "netherite_ingot", 1, 0));
744 744
 		OreDictManager.INSTANCE.setTarget(OP.blockIngot     , MT.Netherite              , ST.make(MD.EtFu, "netherite_block", 1, 0));
745 745
 		OreDictManager.INSTANCE.setTarget(OP.ingot          , MT.AncientDebris          , ST.make(MD.EtFu, "netherite_scrap", 1, 0));
746
+		OreDictManager.INSTANCE.setTarget(OP.oreNetherrack  , MT.AncientDebris          , ST.make(MD.EtFu, "ancient_debris", 1, 0));
746 747
 		OreDictManager.INSTANCE.setTarget(OP.oreNetherrack  , MT.Au                     , ST.make(MD.EtFu, "nether_gold_ore", 1, 0));
747 748
 		OreDictManager.INSTANCE.setTarget(OP.bottle         , MT.Empty                  , ST.make(Items.glass_bottle, 1, 0));
748 749
 		OreDictManager.INSTANCE.setTarget(OP.bottle         , MT.H2O                    , ST.make(Items.potionitem, 1, 0));

+ 23
- 10
src/main/java/gregtech/compat/Compat_Recipes_Ganys.java View File

@@ -53,12 +53,6 @@ public class Compat_Recipes_Ganys extends CompatMods {
53 53
 			RM.Boxinator.addRecipe2(T, 16, 16,      ST.make(Items.slime_ball, 9, W), ST.tag(9), ST.make(MD.EtFu, "slime", 1, 0));
54 54
 			RM.Unboxinator.addRecipe1(T, 16, 16,    ST.make(MD.EtFu, "slime", 1, 0), ST.make(Items.slime_ball, 9, 0));
55 55
 			RM.ic2_extractor(                       ST.make(MD.EtFu, "slime", 1, 0), ST.make(Items.slime_ball, 9, 0));
56
-			RM.Squeezer.addRecipe1(T, 16, 16,       ST.make(MD.EtFu, "rose", 1, 0), NF, DYE_FLUIDS_FLOWER[DYE_INDEX_Red], ST.make(Items.dye, 1, DYE_INDEX_Red));
57
-			RM.Juicer.addRecipe1(T, 16, 16,         ST.make(MD.EtFu, "rose", 1, 0), NF, DYE_FLUIDS_FLOWER[DYE_INDEX_Red], ST.make(Items.dye, 1, DYE_INDEX_Red));
58
-			RM.ic2_extractor(                       ST.make(MD.EtFu, "rose", 1, 0), ST.make(Items.dye, 2, DYE_INDEX_Red));
59
-			RM.Squeezer.addRecipe1(T, 16, 16,       ST.make(MD.EtFu, "cornflower", 1, 0), NF, DYE_FLUIDS_FLOWER[DYE_INDEX_Blue], ST.make(MD.EtFu, "dye", 1, 1));
60
-			RM.Juicer.addRecipe1(T, 16, 16,         ST.make(MD.EtFu, "cornflower", 1, 0), NF, DYE_FLUIDS_FLOWER[DYE_INDEX_Blue], ST.make(MD.EtFu, "dye", 1, 1));
61
-			RM.ic2_extractor(                       ST.make(MD.EtFu, "cornflower", 1, 0), ST.make(MD.EtFu, "dye", 2, 1));
62 56
 			RM.Squeezer.addRecipe1(T, 16, 16,       ST.make(MD.EtFu, "sponge", 1, 1), ST.make(MD.EtFu, "sponge", 1, 0));
63 57
 			RM.Drying.addRecipe1(T, 16, 16,         ST.make(MD.EtFu, "sponge", 1, 1), ST.make(MD.EtFu, "sponge", 1, 0));
64 58
 			RM.smash(                               ST.make(MD.EtFu, "red_sandstone", 1, W), ST.make(Blocks.sand, 1, 1));
@@ -79,12 +73,31 @@ public class Compat_Recipes_Ganys extends CompatMods {
79 73
 			CR.shapeless(                           IL.Plank.get(7), CR.DEF_NAC_NCC, new Object[] {OreDictToolNames.saw, IL.EtFu_Barrel});
80 74
 			RM.sawing(16, 112, F, 100,              IL.EtFu_Barrel.get(1), IL.Plank.get(7));
81 75
 			
76
+			RM.Squeezer.addRecipe1(T, 16, 16,       ST.make(MD.EtFu, "rose"              , 1, 0), NF, DYE_FLUIDS_FLOWER[DYE_INDEX_Red], ST.make(Items.dye, 1, DYE_INDEX_Red));
77
+			RM.Juicer  .addRecipe1(T, 16, 16,       ST.make(MD.EtFu, "rose"              , 1, 0), NF, DYE_FLUIDS_FLOWER[DYE_INDEX_Red], ST.make(Items.dye, 1, DYE_INDEX_Red));
78
+			RM.ic2_extractor(                       ST.make(MD.EtFu, "rose"              , 1, 0), ST.make(Items.dye, 2, DYE_INDEX_Red));
79
+			RM.Squeezer.addRecipe1(T, 16, 16,       ST.make(MD.EtFu, "lily_of_the_valley", 1, 0), NF, DYE_FLUIDS_FLOWER[DYE_INDEX_White], ST.make(MD.EtFu, "dye", 1, 0));
80
+			RM.Juicer  .addRecipe1(T, 16, 16,       ST.make(MD.EtFu, "lily_of_the_valley", 1, 0), NF, DYE_FLUIDS_FLOWER[DYE_INDEX_White], ST.make(MD.EtFu, "dye", 1, 0));
81
+			RM.ic2_extractor(                       ST.make(MD.EtFu, "lily_of_the_valley", 1, 0), ST.make(MD.EtFu, "dye", 2, 0));
82
+			RM.Squeezer.addRecipe1(T, 16, 16,       ST.make(MD.EtFu, "cornflower"        , 1, 0), NF, DYE_FLUIDS_FLOWER[DYE_INDEX_Blue], ST.make(MD.EtFu, "dye", 1, 1));
83
+			RM.Juicer  .addRecipe1(T, 16, 16,       ST.make(MD.EtFu, "cornflower"        , 1, 0), NF, DYE_FLUIDS_FLOWER[DYE_INDEX_Blue], ST.make(MD.EtFu, "dye", 1, 1));
84
+			RM.ic2_extractor(                       ST.make(MD.EtFu, "cornflower"        , 1, 0), ST.make(MD.EtFu, "dye", 2, 1));
85
+			RM.Squeezer.addRecipe1(T, 16, 16,       ST.make(MD.EtFu, "wither_rose"       , 1, 0), NF, DYE_FLUIDS_FLOWER[DYE_INDEX_Black], ST.make(MD.EtFu, "dye", 1, 3));
86
+			RM.Juicer  .addRecipe1(T, 16, 16,       ST.make(MD.EtFu, "wither_rose"       , 1, 0), NF, DYE_FLUIDS_FLOWER[DYE_INDEX_Black], ST.make(MD.EtFu, "dye", 1, 3));
87
+			RM.ic2_extractor(                       ST.make(MD.EtFu, "wither_rose"       , 1, 0), ST.make(MD.EtFu, "dye", 2, 3));
88
+			
89
+			RM.Distillery.addRecipe1(T, 16, 48, IL.EtFu_Wither_Rose   .get(1), FL.Potion_Thick  .make(750), FL.Potion_Harm_2          .make(750), ZL_IS);
90
+			
82 91
 			RM.smash(ST.make(MD.EtFu, "brown_mushroom", 1, W), ST.make(Blocks.brown_mushroom, 1, 0));
83 92
 			RM.smash(ST.make(MD.EtFu, "red_mushroom"  , 1, W), ST.make(Blocks.red_mushroom, 1, 0));
84
-			RM.biomass(ST.make(MD.EtFu, "brown_mushroom", 1, W));
85
-			RM.biomass(ST.make(MD.EtFu, "red_mushroom"  , 1, W));
93
+			RM.biomass(ST.make(MD.EtFu, "brown_mushroom"    , 8, W));
94
+			RM.biomass(ST.make(MD.EtFu, "red_mushroom"      , 8, W));
95
+			RM.biomass(ST.make(MD.EtFu, "rose"              , 8, W));
96
+			RM.biomass(ST.make(MD.EtFu, "wither_rose"       , 8, W));
97
+			RM.biomass(ST.make(MD.EtFu, "cornflower"        , 8, W));
98
+			RM.biomass(ST.make(MD.EtFu, "lily_of_the_valley", 8, W));
86 99
 			
87
-			CR.delate(MD.EtFu, "netherite_sword", "netherite_pickaxe", "netherite_spade", "netherite_axe", "netherite_hoe", "netherite_helmet", "netherite_chestplate", "netherite_leggins", "netherite_boots");
100
+			CR.delate(MD.EtFu, "netherite_ingot", "netherite_sword", "netherite_pickaxe", "netherite_spade", "netherite_axe", "netherite_hoe", "netherite_helmet", "netherite_chestplate", "netherite_leggings", "netherite_boots");
88 101
 			
89 102
 			RM.Bath.addRecipe1(T, 0, 128, ST.make(Items.diamond_sword     , 1, 0), MT.Netherite.liquid(2*U4, T), NF, ST.make(MD.EtFu, "netherite_sword"     , 1, 0));
90 103
 			RM.Bath.addRecipe1(T, 0, 128, ST.make(Items.diamond_pickaxe   , 1, 0), MT.Netherite.liquid(3*U4, T), NF, ST.make(MD.EtFu, "netherite_pickaxe"   , 1, 0));
@@ -93,7 +106,7 @@ public class Compat_Recipes_Ganys extends CompatMods {
93 106
 			RM.Bath.addRecipe1(T, 0, 128, ST.make(Items.diamond_hoe       , 1, 0), MT.Netherite.liquid(2*U4, T), NF, ST.make(MD.EtFu, "netherite_hoe"       , 1, 0));
94 107
 			RM.Bath.addRecipe1(T, 0, 128, ST.make(Items.diamond_helmet    , 1, 0), MT.Netherite.liquid(5*U4, T), NF, ST.make(MD.EtFu, "netherite_helmet"    , 1, 0));
95 108
 			RM.Bath.addRecipe1(T, 0, 128, ST.make(Items.diamond_chestplate, 1, 0), MT.Netherite.liquid(8*U4, T), NF, ST.make(MD.EtFu, "netherite_chestplate", 1, 0));
96
-			RM.Bath.addRecipe1(T, 0, 128, ST.make(Items.diamond_leggings  , 1, 0), MT.Netherite.liquid(7*U4, T), NF, ST.make(MD.EtFu, "netherite_leggins"   , 1, 0));
109
+			RM.Bath.addRecipe1(T, 0, 128, ST.make(Items.diamond_leggings  , 1, 0), MT.Netherite.liquid(7*U4, T), NF, ST.make(MD.EtFu, "netherite_leggings"  , 1, 0));
97 110
 			RM.Bath.addRecipe1(T, 0, 128, ST.make(Items.diamond_boots     , 1, 0), MT.Netherite.liquid(4*U4, T), NF, ST.make(MD.EtFu, "netherite_boots"     , 1, 0));
98 111
 			
99 112
 			CR.delate(IL.EtFu_Granite.get(1));

+ 5
- 4
src/main/java/gregtech/items/MultiItemBumbles.java View File

@@ -245,11 +245,12 @@ public class MultiItemBumbles extends MultiItemRandom implements IItemBumbleBee
245 245
 			for (int j : tOrderY) for (int i : tOrderX) for (int k : tOrderZ) {
246 246
 				Block tBlock = WD.block(aWorld, aX+i, aY+j, aZ+k, F);
247 247
 				if (tBlock == NB) continue;
248
-				if (tBlock == Blocks.nether_wart    ) return new ChunkCoordinates(aX+i, aY+j, aZ+k);
249
-				if (tBlock == tWartCrimson          ) return new ChunkCoordinates(aX+i, aY+j, aZ+k);
250
-				if (tBlock == tWartWarped           ) return new ChunkCoordinates(aX+i, aY+j, aZ+k);
251
-				if (tBlock == tWartSoggy            ) return new ChunkCoordinates(aX+i, aY+j, aZ+k);
248
+				if (tBlock == Blocks.nether_wart     ) return new ChunkCoordinates(aX+i, aY+j, aZ+k);
249
+				if (tBlock == tWartCrimson           ) return new ChunkCoordinates(aX+i, aY+j, aZ+k);
250
+				if (tBlock == tWartWarped            ) return new ChunkCoordinates(aX+i, aY+j, aZ+k);
251
+				if (tBlock == tWartSoggy             ) return new ChunkCoordinates(aX+i, aY+j, aZ+k);
252 252
 				if (IL.NeLi_Wither_Rose.equal(tBlock)) return new ChunkCoordinates(aX+i, aY+j, aZ+k);
253
+				if (IL.EtFu_Wither_Rose.equal(tBlock)) return new ChunkCoordinates(aX+i, aY+j, aZ+k);
253 254
 				if (tBlock == tFireFlower) {
254 255
 					if (WD.meta(aWorld, aX+i, aY+j, aZ+k) == 2) return new ChunkCoordinates(aX+i, aY+j, aZ+k);
255 256
 					continue;

+ 4
- 4
src/main/java/gregtech/loaders/c/Loader_Recipes_Temporary.java View File

@@ -229,13 +229,13 @@ public class Loader_Recipes_Temporary implements Runnable {
229 229
 			CR.shaped(IL.Torch.get(4), DEF_NAC, "X", "S", 'X', IL.NeLi_ShroomLight, 'S', OD.stickAnyWood);
230 230
 			
231 231
 			CR.shapeless(IL.NeLi_Torch_Soul  .get(4), DEF_NCC, new Object[] {OD.soulsand              , OD.blockTorch, OD.blockTorch, OD.blockTorch, OD.blockTorch});
232
-			CR.shapeless(IL.NeLi_Torch_Soul  .get(4), DEF_NCC, new Object[] {IL.NeLi_Wither_Rose      , OD.blockTorch, OD.blockTorch, OD.blockTorch, OD.blockTorch});
232
+			CR.shapeless(IL.NeLi_Torch_Soul  .get(4), DEF_NCC, new Object[] {OD.flowerWither          , OD.blockTorch, OD.blockTorch, OD.blockTorch, OD.blockTorch});
233 233
 			CR.shapeless(IL.NeLi_Torch_Soul  .get(3), DEF_NCC, new Object[] {OD.soulsand              , OD.blockTorch, OD.blockTorch, OD.blockTorch});
234
-			CR.shapeless(IL.NeLi_Torch_Soul  .get(3), DEF_NCC, new Object[] {IL.NeLi_Wither_Rose      , OD.blockTorch, OD.blockTorch, OD.blockTorch});
234
+			CR.shapeless(IL.NeLi_Torch_Soul  .get(3), DEF_NCC, new Object[] {OD.flowerWither          , OD.blockTorch, OD.blockTorch, OD.blockTorch});
235 235
 			CR.shapeless(IL.NeLi_Torch_Soul  .get(2), DEF_NCC, new Object[] {OD.soulsand              , OD.blockTorch, OD.blockTorch});
236
-			CR.shapeless(IL.NeLi_Torch_Soul  .get(2), DEF_NCC, new Object[] {IL.NeLi_Wither_Rose      , OD.blockTorch, OD.blockTorch});
236
+			CR.shapeless(IL.NeLi_Torch_Soul  .get(2), DEF_NCC, new Object[] {OD.flowerWither          , OD.blockTorch, OD.blockTorch});
237 237
 			CR.shapeless(IL.NeLi_Torch_Soul  .get(1), DEF_NCC, new Object[] {OD.soulsand              , OD.blockTorch});
238
-			CR.shapeless(IL.NeLi_Torch_Soul  .get(1), DEF_NCC, new Object[] {IL.NeLi_Wither_Rose      , OD.blockTorch});
238
+			CR.shapeless(IL.NeLi_Torch_Soul  .get(1), DEF_NCC, new Object[] {OD.flowerWither          , OD.blockTorch});
239 239
 			CR.shapeless(IL.NeLi_Torch_Fox   .get(4), DEF_NCC, new Object[] {IL.NeLi_Foxfire_Powder   , OD.blockTorch, OD.blockTorch, OD.blockTorch, OD.blockTorch});
240 240
 			CR.shapeless(IL.NeLi_Torch_Fox   .get(4), DEF_NCC, new Object[] {IL.NeLi_Foxfire_Lily     , OD.blockTorch, OD.blockTorch, OD.blockTorch, OD.blockTorch});
241 241
 			CR.shapeless(IL.NeLi_Torch_Fox   .get(3), DEF_NCC, new Object[] {IL.NeLi_Foxfire_Powder   , OD.blockTorch, OD.blockTorch, OD.blockTorch});

Loading…
Cancel
Save