mirror of
https://github.com/GTNewHorizons/Botania.git
synced 2026-11-19 03:39:17 +00:00
Update nag message, add migration recipes for everything
This commit is contained in:
5 files changed
+152
-21
No files matched your search
@@ -54,6 +54,7 @@ public class Botania {
|
||||
public static boolean etFuturumLoaded = false;
|
||||
public static boolean rfApiLoaded = false;
|
||||
public static boolean storageDrawersLoaded = false;
|
||||
public static boolean quarkLoaded = false;
|
||||
|
||||
public static ILightHelper lightHelper;
|
||||
|
||||
@@ -73,6 +74,7 @@ public class Botania {
|
||||
coloredLightsLoaded = Loader.isModLoaded("easycoloredlights");
|
||||
etFuturumLoaded = Loader.isModLoaded("etfuturum");
|
||||
rfApiLoaded = ModAPIManager.INSTANCE.hasAPI("CoFHAPI|energy");
|
||||
quarkLoaded = Loader.isModLoaded("Quark");
|
||||
|
||||
storageDrawersLoaded = Loader.isModLoaded("StorageDrawers");
|
||||
|
||||
@@ -86,13 +88,13 @@ public class Botania {
|
||||
public void nagUnofficial(PlayerEvent.PlayerLoggedInEvent evt) {
|
||||
EntityPlayer player = evt.player;
|
||||
|
||||
ITextComponent message = new TextComponentTranslation("botaniamisc.unofficial.nag");
|
||||
ITextComponent message = new TextComponentTranslation("botaniamisc.unofficial.warnRemove");
|
||||
message.setStyle(new Style().setColor(TextFormatting.RED));
|
||||
|
||||
ITextComponent message2 = new TextComponentTranslation("botaniamisc.unofficial.report");
|
||||
message2.setStyle(new Style().setColor(TextFormatting.YELLOW));
|
||||
|
||||
ITextComponent url = new TextComponentString("https://github.com/williewillus/Botania/issues");
|
||||
ITextComponent url = new TextComponentString(" https://github.com/williewillus/Botania/issues");
|
||||
url.getStyle().setClickEvent(new ClickEvent(ClickEvent.Action.OPEN_URL, "https://github.com/williewillus/Botania/issues"));
|
||||
url.getStyle().setHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, new TextComponentString("CLICK")));
|
||||
|
||||
|
||||
@@ -71,6 +71,7 @@ import vazkii.botania.common.crafting.ModElvenTradeRecipes;
|
||||
import vazkii.botania.common.crafting.ModManaAlchemyRecipes;
|
||||
import vazkii.botania.common.crafting.ModManaConjurationRecipes;
|
||||
import vazkii.botania.common.crafting.ModManaInfusionRecipes;
|
||||
import vazkii.botania.common.crafting.ModMigrationRecipes;
|
||||
import vazkii.botania.common.crafting.ModPetalRecipes;
|
||||
import vazkii.botania.common.crafting.ModPureDaisyRecipes;
|
||||
import vazkii.botania.common.crafting.ModRuneRecipes;
|
||||
@@ -121,6 +122,7 @@ public class CommonProxy {
|
||||
|
||||
public void init(FMLInitializationEvent event) {
|
||||
ModCraftingRecipes.init();
|
||||
ModMigrationRecipes.init();
|
||||
ModPetalRecipes.init();
|
||||
ModPureDaisyRecipes.init();
|
||||
ModRuneRecipes.init();
|
||||
|
||||
@@ -322,22 +322,6 @@ public final class ModCraftingRecipes {
|
||||
public static void init() {
|
||||
int recipeListSize = CraftingManager.getInstance().getRecipeList().size();
|
||||
|
||||
// The future is now (botania -> vanilla recipes for future added items and blocks)
|
||||
addShapelessOreDictRecipe(new ItemStack(Items.prismarine_shard), new ItemStack(ModItems.manaResource, 1, 10));
|
||||
|
||||
addShapelessOreDictRecipe(new ItemStack(Blocks.prismarine, 1, 0), new ItemStack(ModBlocks.prismarine, 1, 0));
|
||||
addShapelessOreDictRecipe(new ItemStack(Blocks.prismarine, 1, 1), new ItemStack(ModBlocks.prismarine, 1, 1));
|
||||
addShapelessOreDictRecipe(new ItemStack(Blocks.prismarine, 1, 2), new ItemStack(ModBlocks.prismarine, 1, 2));
|
||||
|
||||
addShapelessOreDictRecipe(new ItemStack(Blocks.sea_lantern), new ItemStack(ModBlocks.seaLamp));
|
||||
|
||||
addShapelessOreDictRecipe(new ItemStack(Blocks.stone, 1, 1), new ItemStack(ModFluffBlocks.stone, 1, FutureStoneVariant.GRANITE.ordinal()));
|
||||
addShapelessOreDictRecipe(new ItemStack(Blocks.stone, 1, 2), new ItemStack(ModFluffBlocks.stone, 1, FutureStoneVariant.POLISHED_GRANITE.ordinal()));
|
||||
addShapelessOreDictRecipe(new ItemStack(Blocks.stone, 1, 3), new ItemStack(ModFluffBlocks.stone, 1, FutureStoneVariant.DIORITE.ordinal()));
|
||||
addShapelessOreDictRecipe(new ItemStack(Blocks.stone, 1, 4), new ItemStack(ModFluffBlocks.stone, 1, FutureStoneVariant.POLISHED_DIORITE.ordinal()));
|
||||
addShapelessOreDictRecipe(new ItemStack(Blocks.stone, 1, 5), new ItemStack(ModFluffBlocks.stone, 1, FutureStoneVariant.ANDESITE.ordinal()));
|
||||
addShapelessOreDictRecipe(new ItemStack(Blocks.stone, 1, 6), new ItemStack(ModFluffBlocks.stone, 1, FutureStoneVariant.POLISHED_ANDESITE.ordinal()));
|
||||
|
||||
// Lexicon Recipe
|
||||
addShapelessOreDictRecipe(new ItemStack(ModItems.lexicon), "treeSapling", Items.book);
|
||||
recipeLexicon = BotaniaAPI.getLatestAddedRecipe();
|
||||
|
||||
@@ -0,0 +1,144 @@
|
||||
package vazkii.botania.common.crafting;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.init.Blocks;
|
||||
import net.minecraft.init.Items;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
import net.minecraftforge.fml.common.registry.GameRegistry;
|
||||
import vazkii.botania.api.state.enums.FutureStoneVariant;
|
||||
import vazkii.botania.common.Botania;
|
||||
import vazkii.botania.common.block.ModBlocks;
|
||||
import vazkii.botania.common.block.ModFluffBlocks;
|
||||
import vazkii.botania.common.item.ModItems;
|
||||
|
||||
/**
|
||||
* Migration recipes for things that will be removed in the future
|
||||
*/
|
||||
public final class ModMigrationRecipes {
|
||||
|
||||
public static void init() {
|
||||
boolean quark = Botania.quarkLoaded;
|
||||
|
||||
// Prismarine -> vanilla
|
||||
GameRegistry.addShapelessRecipe(new ItemStack(Items.prismarine_shard), new ItemStack(ModItems.manaResource, 1, 10));
|
||||
GameRegistry.addShapelessRecipe(new ItemStack(Blocks.prismarine, 1, 0), new ItemStack(ModBlocks.prismarine, 1, 0));
|
||||
GameRegistry.addShapelessRecipe(new ItemStack(Blocks.prismarine, 1, 1), new ItemStack(ModBlocks.prismarine, 1, 1));
|
||||
GameRegistry.addShapelessRecipe(new ItemStack(Blocks.prismarine, 1, 2), new ItemStack(ModBlocks.prismarine, 1, 2));
|
||||
GameRegistry.addShapelessRecipe(new ItemStack(Blocks.sea_lantern), new ItemStack(ModBlocks.seaLamp));
|
||||
|
||||
// Prismarine -> quark
|
||||
if (quark) {
|
||||
GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("prismarine_rough_wall")), new ItemStack(ModFluffBlocks.prismarineWall));
|
||||
GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("prismarine_stairs")), new ItemStack(ModFluffBlocks.prismarineStairs));
|
||||
GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("prismarine_slab")), new ItemStack(ModFluffBlocks.prismarineSlab));
|
||||
GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("prismarine_bricks_stairs")), new ItemStack(ModFluffBlocks.prismarineBrickStairs));
|
||||
GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("prismarine_bricks_slab")), new ItemStack(ModFluffBlocks.prismarineBrickSlab));
|
||||
GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("dark_prismarine_stairs")), new ItemStack(ModFluffBlocks.darkPrismarineStairs));
|
||||
GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("dark_prismarine_slab")), new ItemStack(ModFluffBlocks.darkPrismarineSlab));
|
||||
}
|
||||
|
||||
// End stuff -> vanilla
|
||||
GameRegistry.addShapelessRecipe(new ItemStack(Blocks.end_bricks), new ItemStack(ModBlocks.endStoneBrick));
|
||||
GameRegistry.addShapelessRecipe(new ItemStack(Blocks.purpur_block), new ItemStack(ModBlocks.endStoneBrick, 1, 2));
|
||||
GameRegistry.addShapelessRecipe(new ItemStack(Blocks.purpur_pillar), new ItemStack(ModBlocks.endStoneBrick, 1, 3));
|
||||
GameRegistry.addShapelessRecipe(new ItemStack(Blocks.purpur_slab), new ItemStack(ModFluffBlocks.enderBrickSlab));
|
||||
GameRegistry.addShapelessRecipe(new ItemStack(Blocks.purpur_stairs), new ItemStack(ModFluffBlocks.enderBrickStairs));
|
||||
|
||||
// End stuff -> quark
|
||||
if (quark) {
|
||||
GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("end_bricks_stairs")), new ItemStack(ModFluffBlocks.endStoneStairs));
|
||||
GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("end_bricks_slab")), new ItemStack(ModFluffBlocks.endStoneSlab));
|
||||
// todo End stone chiseled brick? (not in quark)
|
||||
}
|
||||
|
||||
// Andesite normal + polished -> vanilla
|
||||
GameRegistry.addShapelessRecipe(new ItemStack(Blocks.stone, 1, 5), new ItemStack(ModFluffBlocks.stone, 1, FutureStoneVariant.ANDESITE.ordinal()));
|
||||
GameRegistry.addShapelessRecipe(new ItemStack(Blocks.stone, 1, 6), new ItemStack(ModFluffBlocks.stone, 1, FutureStoneVariant.POLISHED_ANDESITE.ordinal()));
|
||||
|
||||
if (quark) {
|
||||
// Andesite rough stairs and slab
|
||||
GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("stone_andesite_stairs")), new ItemStack(ModFluffBlocks.stoneStairs[0]));
|
||||
GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("stone_andesite_slab")), new ItemStack(ModFluffBlocks.stoneSlabs[0]));
|
||||
// Andesite bricks, brick stairs, brick slab
|
||||
GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("world_stone_bricks"), 1, 2), new ItemStack(ModFluffBlocks.stone, 1, FutureStoneVariant.ANDESITE_BRICK.ordinal()));
|
||||
GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("stone_andesite_bricks_stairs")), new ItemStack(ModFluffBlocks.stoneStairs[4]));
|
||||
GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("stone_andesite_bricks_slab")), new ItemStack(ModFluffBlocks.stoneSlabs[4]));
|
||||
// todo Andesite chiseled brick? (not in quark)
|
||||
// Andesite wall
|
||||
GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("stone_andesite_wall")), new ItemStack(ModFluffBlocks.stoneWall, 1, FutureStoneVariant.ANDESITE.ordinal()));
|
||||
}
|
||||
|
||||
if (quark) {
|
||||
// Basalt normal + polished -> quark
|
||||
GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("basalt")), new ItemStack(ModFluffBlocks.stone, 1, FutureStoneVariant.BASALT.ordinal()));
|
||||
GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("basalt"), 1, 1), new ItemStack(ModFluffBlocks.stone, 1, FutureStoneVariant.POLISHED_BASALT.ordinal()));
|
||||
// Basalt rough stairs and slab
|
||||
GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("stone_basalt_stairs")), new ItemStack(ModFluffBlocks.stoneStairs[1]));
|
||||
GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("stone_basalt_slab")), new ItemStack(ModFluffBlocks.stoneSlabs[1]));
|
||||
// Basalt bricks, brick stairs, brick slab
|
||||
GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("world_stone_bricks"), 1, 3), new ItemStack(ModFluffBlocks.stone, 1, FutureStoneVariant.BASALT_BRICK.ordinal()));
|
||||
GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("stone_basalt_bricks_stairs")), new ItemStack(ModFluffBlocks.stoneStairs[5]));
|
||||
GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("stone_basalt_bricks_slab")), new ItemStack(ModFluffBlocks.stoneSlabs[5]));
|
||||
// todo Basalt chiseled brick? (not in quark)
|
||||
// Basalt wall
|
||||
GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("basalt_wall")), new ItemStack(ModFluffBlocks.stoneWall, 1, FutureStoneVariant.BASALT.ordinal()));
|
||||
}
|
||||
|
||||
// Diorite normal + polished -> vanilla
|
||||
GameRegistry.addShapelessRecipe(new ItemStack(Blocks.stone, 1, 3), new ItemStack(ModFluffBlocks.stone, 1, FutureStoneVariant.DIORITE.ordinal()));
|
||||
GameRegistry.addShapelessRecipe(new ItemStack(Blocks.stone, 1, 4), new ItemStack(ModFluffBlocks.stone, 1, FutureStoneVariant.POLISHED_DIORITE.ordinal()));
|
||||
|
||||
if (quark) {
|
||||
// Diorite rough stairs and slab
|
||||
GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("stone_diorite_stairs")), new ItemStack(ModFluffBlocks.stoneStairs[2]));
|
||||
GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("stone_diorite_slab")), new ItemStack(ModFluffBlocks.stoneSlabs[2]));
|
||||
// Diorite bricks, brick stairs, brick slab
|
||||
GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("world_stone_bricks"), 1, 1), new ItemStack(ModFluffBlocks.stone, 1, FutureStoneVariant.DIORITE_BRICK.ordinal()));
|
||||
GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("stone_diorite_bricks_stairs")), new ItemStack(ModFluffBlocks.stoneStairs[6]));
|
||||
GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("stone_diorite_bricks_slab")), new ItemStack(ModFluffBlocks.stoneSlabs[6]));
|
||||
// todo Diorite chiseled brick? (not in quark)
|
||||
// Diorite wall
|
||||
GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("stone_diorite_wall")), new ItemStack(ModFluffBlocks.stoneWall, 1, FutureStoneVariant.DIORITE.ordinal()));
|
||||
}
|
||||
|
||||
// Granite normal + polished -> vanilla
|
||||
GameRegistry.addShapelessRecipe(new ItemStack(Blocks.stone, 1, 1), new ItemStack(ModFluffBlocks.stone, 1, FutureStoneVariant.GRANITE.ordinal()));
|
||||
GameRegistry.addShapelessRecipe(new ItemStack(Blocks.stone, 1, 2), new ItemStack(ModFluffBlocks.stone, 1, FutureStoneVariant.POLISHED_GRANITE.ordinal()));
|
||||
|
||||
if (quark) {
|
||||
// Granite rough stairs and slab
|
||||
GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("stone_granite_stairs")), new ItemStack(ModFluffBlocks.stoneStairs[3]));
|
||||
GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("stone_granite_slab")), new ItemStack(ModFluffBlocks.stoneSlabs[3]));
|
||||
// Granite bricks, brick stairs, brick slab
|
||||
GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("world_stone_bricks"), 1, 0), new ItemStack(ModFluffBlocks.stone, 1, FutureStoneVariant.GRANITE_BRICK.ordinal()));
|
||||
GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("stone_granite_bricks_stairs")), new ItemStack(ModFluffBlocks.stoneStairs[7]));
|
||||
GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("stone_granite_bricks_slab")), new ItemStack(ModFluffBlocks.stoneSlabs[7]));
|
||||
// todo Granite chiseled brick? (not in quark)
|
||||
// Granite wall
|
||||
GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("stone_granite_wall")), new ItemStack(ModFluffBlocks.stoneWall, 1, FutureStoneVariant.GRANITE.ordinal()));
|
||||
}
|
||||
|
||||
// Thatch
|
||||
if (quark) {
|
||||
GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("thatch")), new ItemStack(ModBlocks.thatch));
|
||||
GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("thatch_slab")), new ItemStack(ModFluffBlocks.thatchSlab));
|
||||
GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("thatch_stairs")), new ItemStack(ModFluffBlocks.thatchStairs));
|
||||
}
|
||||
|
||||
// Reeds
|
||||
if (quark) {
|
||||
GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("reed_block")), new ItemStack(ModBlocks.reedBlock));
|
||||
GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("reed_block_slab")), new ItemStack(ModFluffBlocks.reedSlab));
|
||||
GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("reed_block_stairs")), new ItemStack(ModFluffBlocks.reedStairs));
|
||||
GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("reed_block_wall")), new ItemStack(ModFluffBlocks.reedWall));
|
||||
}
|
||||
}
|
||||
|
||||
private static Block findQuarkBlock(String name) {
|
||||
return Block.blockRegistry.getObject(new ResourceLocation("Quark", name));
|
||||
}
|
||||
|
||||
private ModMigrationRecipes() {}
|
||||
|
||||
}
|
||||
@@ -6,9 +6,8 @@ generator.botania-skyblock.info=Not recommended for botania newcomers
|
||||
# Something that is not localized, translators, do NOT change this line.
|
||||
botaniamisc.noloc=botaniamisc.noloc
|
||||
|
||||
# todo 1.8 remove when merging into master
|
||||
botaniamisc.unofficial.nag=WARNING !!!!! This port of Botania is UNOFFICIAL! Do NOT report bugs to Vazkii!!!
|
||||
botaniamisc.unofficial.report=Report issues to the porter HERE:
|
||||
botaniamisc.unofficial.warnRemove=[Botania] Warning: Some decorative blocks are being removed, please migrate to either the vanilla or Quark versions.
|
||||
botaniamisc.unofficial.report=[Botania] This port is unofficial! Report issues to the porter HERE:
|
||||
|
||||
botaniamisc.nextPage=Next Page
|
||||
botaniamisc.prevPage=Previous Page
|
||||
|
||||
Reference in new issue
Block a user