mirror of
https://github.com/GTNewHorizons/Botania.git
synced 2026-11-21 12:42:50 +00:00
Byebye ender stuff!
This commit is contained in:
23 files changed
+2
-494
No files matched your search
@@ -347,7 +347,6 @@ public final class ModelHandler {
|
||||
registerVariantsDefaulted(ModFluffBlocks.biomeStoneA, BiomeStoneVariant.class, "variant");
|
||||
registerVariantsDefaulted(ModFluffBlocks.biomeStoneB, BiomeBrickVariant.class, "variant");
|
||||
registerVariantsDefaulted(ModBlocks.customBrick, CustomBrickVariant.class, "variant");
|
||||
registerVariantsDefaulted(ModBlocks.endStoneBrick, EndBrickVariant.class, "variant");
|
||||
registerVariantsDefaulted(ModBlocks.dreamwood, LivingWoodVariant.class, "variant");
|
||||
registerVariantsDefaulted(ModBlocks.forestDrum, DrumVariant.class, "variant");
|
||||
registerVariantsDefaulted(ModBlocks.livingrock, LivingRockVariant.class, "variant");
|
||||
@@ -639,7 +638,7 @@ public final class ModelHandler {
|
||||
ModFluffBlocks.netherBrickSlab, ModFluffBlocks.soulBrickSlab, ModFluffBlocks.snowBrickSlab,
|
||||
ModFluffBlocks.tileSlab, ModFluffBlocks.manaQuartzSlab, ModFluffBlocks.blazeQuartzSlab, ModFluffBlocks.darkQuartzSlab,
|
||||
ModFluffBlocks.lavenderQuartzSlab, ModFluffBlocks.redQuartzSlab, ModFluffBlocks.elfQuartzSlab, ModFluffBlocks.sunnyQuartzSlab, ModFluffBlocks.dirtPathSlab,
|
||||
ModFluffBlocks.shimmerrockSlab, ModFluffBlocks.shimmerwoodPlankSlab, ModFluffBlocks.endStoneSlab, ModFluffBlocks.enderBrickSlab);
|
||||
ModFluffBlocks.shimmerrockSlab, ModFluffBlocks.shimmerwoodPlankSlab);
|
||||
|
||||
for (Block b : otherSlabs) {
|
||||
if (b == null) // Dark quartz disabled
|
||||
@@ -665,7 +664,7 @@ public final class ModelHandler {
|
||||
ModFluffBlocks.netherBrickSlabFull, ModFluffBlocks.soulBrickSlabFull, ModFluffBlocks.snowBrickSlabFull,
|
||||
ModFluffBlocks.tileSlabFull, ModFluffBlocks.darkQuartzSlabFull, ModFluffBlocks.manaQuartzSlabFull, ModFluffBlocks.blazeQuartzSlabFull,
|
||||
ModFluffBlocks.lavenderQuartzSlabFull, ModFluffBlocks.redQuartzSlabFull, ModFluffBlocks.elfQuartzSlabFull, ModFluffBlocks.sunnyQuartzSlabFull, ModFluffBlocks.dirtPathSlabFull,
|
||||
ModFluffBlocks.shimmerrockSlabFull, ModFluffBlocks.shimmerwoodPlankSlabFull, ModFluffBlocks.endStoneSlabFull, ModFluffBlocks.enderBrickSlabFull);
|
||||
ModFluffBlocks.shimmerrockSlabFull, ModFluffBlocks.shimmerwoodPlankSlabFull);
|
||||
|
||||
for (Block b : otherFullSlabs) {
|
||||
if (b == null) // Dark quartz disabled
|
||||
@@ -772,8 +771,6 @@ public final class ModelHandler {
|
||||
registerItemModel(ModFluffBlocks.dreamwoodStairs);
|
||||
registerItemModel(ModFluffBlocks.dreamwoodPlankStairs);
|
||||
registerItemModel(ModFluffBlocks.elfQuartzStairs);
|
||||
registerItemModel(ModFluffBlocks.enderBrickStairs);
|
||||
registerItemModel(ModFluffBlocks.endStoneStairs);
|
||||
registerItemModel(ModFluffBlocks.lavenderQuartzStairs);
|
||||
registerItemModel(ModFluffBlocks.livingrockStairs);
|
||||
registerItemModel(ModFluffBlocks.livingrockBrickStairs);
|
||||
@@ -822,8 +819,6 @@ public final class ModelHandler {
|
||||
registerItemModel(ModFluffBlocks.dirtPathSlab);
|
||||
registerItemModel(ModFluffBlocks.shimmerrockSlab);
|
||||
registerItemModel(ModFluffBlocks.shimmerwoodPlankSlab);
|
||||
registerItemModel(ModFluffBlocks.endStoneSlab);
|
||||
registerItemModel(ModFluffBlocks.enderBrickSlab);
|
||||
registerItemModel(ModFluffBlocks.netherBrickSlab);
|
||||
registerItemModel(ModFluffBlocks.soulBrickSlab);
|
||||
registerItemModel(ModFluffBlocks.snowBrickSlab);
|
||||
|
||||
@@ -34,7 +34,6 @@ import vazkii.botania.common.block.decor.BlockBuriedPetals;
|
||||
import vazkii.botania.common.block.decor.BlockCustomBrick;
|
||||
import vazkii.botania.common.block.decor.BlockDirtPath;
|
||||
import vazkii.botania.common.block.decor.BlockElfGlass;
|
||||
import vazkii.botania.common.block.decor.BlockEndStoneBrick;
|
||||
import vazkii.botania.common.block.decor.BlockFloatingFlower;
|
||||
import vazkii.botania.common.block.decor.BlockManaBeacon;
|
||||
import vazkii.botania.common.block.decor.BlockManaFlame;
|
||||
@@ -233,7 +232,6 @@ public final class ModBlocks {
|
||||
public static Block petalBlock;
|
||||
public static Block corporeaIndex;
|
||||
public static Block corporeaFunnel;
|
||||
public static Block endStoneBrick;
|
||||
public static Block mushroom;
|
||||
public static Block pump;
|
||||
public static Block doubleFlower1;
|
||||
@@ -321,7 +319,6 @@ public final class ModBlocks {
|
||||
petalBlock = new BlockPetalBlock();
|
||||
corporeaIndex = new BlockCorporeaIndex();
|
||||
corporeaFunnel = new BlockCorporeaFunnel();
|
||||
endStoneBrick = new BlockEndStoneBrick();
|
||||
mushroom = new BlockModMushroom();
|
||||
pump = new BlockPump();
|
||||
doubleFlower1 = new BlockModDoubleFlower1();
|
||||
|
||||
@@ -31,8 +31,6 @@ import vazkii.botania.common.block.decor.quartz.BlockSpecialQuartzStairs;
|
||||
import vazkii.botania.common.block.decor.slabs.Block18StoneSlab;
|
||||
import vazkii.botania.common.block.decor.slabs.BlockBiomeStoneSlab;
|
||||
import vazkii.botania.common.block.decor.slabs.BlockDirtPathSlab;
|
||||
import vazkii.botania.common.block.decor.slabs.BlockEndStoneSlab;
|
||||
import vazkii.botania.common.block.decor.slabs.BlockEnderBrickSlab;
|
||||
import vazkii.botania.common.block.decor.slabs.BlockModSlab;
|
||||
import vazkii.botania.common.block.decor.slabs.BlockPavementSlab;
|
||||
import vazkii.botania.common.block.decor.slabs.bricks.BlockCustomBrickSlab;
|
||||
@@ -49,8 +47,6 @@ import vazkii.botania.common.block.decor.slabs.living.BlockShimmerrockSlab;
|
||||
import vazkii.botania.common.block.decor.slabs.living.BlockShimmerwoodPlankSlab;
|
||||
import vazkii.botania.common.block.decor.stairs.Block18StoneStairs;
|
||||
import vazkii.botania.common.block.decor.stairs.BlockBiomeStoneStairs;
|
||||
import vazkii.botania.common.block.decor.stairs.BlockEndStoneStairs;
|
||||
import vazkii.botania.common.block.decor.stairs.BlockEnderBrickStairs;
|
||||
import vazkii.botania.common.block.decor.stairs.BlockPavementStairs;
|
||||
import vazkii.botania.common.block.decor.stairs.bricks.BlockCustomBrickStairs;
|
||||
import vazkii.botania.common.block.decor.stairs.bricks.BlockSnowBrickStairs;
|
||||
@@ -163,13 +159,6 @@ public final class ModFluffBlocks {
|
||||
public static final Block[] pavementSlabs = new Block[BlockPavement.TYPES];
|
||||
public static final Block[] pavementFullSlabs = new Block[BlockPavement.TYPES];
|
||||
|
||||
public static Block endStoneSlab;
|
||||
public static Block endStoneSlabFull;
|
||||
public static Block endStoneStairs;
|
||||
public static Block enderBrickSlab;
|
||||
public static Block enderBrickSlabFull;
|
||||
public static Block enderBrickStairs;
|
||||
|
||||
public static Block shimmerrockSlab;
|
||||
public static Block shimmerrockSlabFull;
|
||||
public static Block shimmerrockStairs;
|
||||
@@ -304,13 +293,6 @@ public final class ModFluffBlocks {
|
||||
count++;
|
||||
}
|
||||
|
||||
endStoneSlab = new BlockEndStoneSlab(false);
|
||||
endStoneSlabFull = new BlockEndStoneSlab(true);
|
||||
endStoneStairs = new BlockEndStoneStairs();
|
||||
enderBrickSlab = new BlockEnderBrickSlab(false);
|
||||
enderBrickSlabFull = new BlockEnderBrickSlab(true);
|
||||
enderBrickStairs = new BlockEnderBrickStairs();
|
||||
|
||||
shimmerrockSlab = new BlockShimmerrockSlab(false);
|
||||
shimmerrockSlabFull = new BlockShimmerrockSlab(true);
|
||||
shimmerrockStairs = new BlockShimmerrockStairs();
|
||||
@@ -364,11 +346,6 @@ public final class ModFluffBlocks {
|
||||
((BlockModSlab) dirtPathSlab).register();
|
||||
((BlockModSlab) dirtPathSlabFull).register();
|
||||
|
||||
((BlockModSlab) endStoneSlab).register();
|
||||
((BlockModSlab) endStoneSlabFull).register();
|
||||
((BlockModSlab) enderBrickSlab).register();
|
||||
((BlockModSlab) enderBrickSlabFull).register();
|
||||
|
||||
((BlockModSlab) shimmerrockSlab).register();
|
||||
((BlockModSlab) shimmerrockSlabFull).register();
|
||||
((BlockModSlab) shimmerwoodPlankSlab).register();
|
||||
|
||||
@@ -1,94 +0,0 @@
|
||||
/**
|
||||
* This class was created by <Vazkii>. It's distributed as
|
||||
* part of the Botania Mod. Get the Source Code in github:
|
||||
* https://github.com/Vazkii/Botania
|
||||
*
|
||||
* Botania is Open Source and distributed under the
|
||||
* Botania License: http://botaniamod.net/license.php
|
||||
*
|
||||
* File Created @ [Feb 16, 2015, 8:17:12 PM (GMT)]
|
||||
*/
|
||||
package vazkii.botania.common.block.decor;
|
||||
|
||||
import net.minecraft.block.SoundType;
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraft.block.state.BlockStateContainer;
|
||||
import net.minecraft.block.state.IBlockState;
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.util.math.RayTraceResult;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.fml.common.registry.GameRegistry;
|
||||
import vazkii.botania.api.lexicon.ILexiconable;
|
||||
import vazkii.botania.api.lexicon.LexiconEntry;
|
||||
import vazkii.botania.api.state.BotaniaStateProps;
|
||||
import vazkii.botania.api.state.enums.EndBrickVariant;
|
||||
import vazkii.botania.common.block.BlockMod;
|
||||
import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName;
|
||||
import vazkii.botania.common.lexicon.LexiconData;
|
||||
import vazkii.botania.common.lib.LibBlockNames;
|
||||
|
||||
import javax.annotation.Nonnull;
|
||||
import java.util.List;
|
||||
|
||||
public class BlockEndStoneBrick extends BlockMod implements ILexiconable {
|
||||
|
||||
public BlockEndStoneBrick() {
|
||||
super(Material.ROCK, LibBlockNames.END_STONE_BRICK);
|
||||
setHardness(1.5F);
|
||||
setResistance(10F);
|
||||
setSoundType(SoundType.STONE);
|
||||
setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.ENDBRICK_VARIANT, EndBrickVariant.END_STONE_BRICKS));
|
||||
}
|
||||
|
||||
@Nonnull
|
||||
@Override
|
||||
public BlockStateContainer createBlockState() {
|
||||
return new BlockStateContainer(this, BotaniaStateProps.ENDBRICK_VARIANT);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getMetaFromState(IBlockState state) {
|
||||
return state.getValue(BotaniaStateProps.ENDBRICK_VARIANT).ordinal();
|
||||
}
|
||||
|
||||
@Nonnull
|
||||
@Override
|
||||
public IBlockState getStateFromMeta(int meta) {
|
||||
if (meta >= EndBrickVariant.values().length) {
|
||||
meta = 0;
|
||||
}
|
||||
return getDefaultState().withProperty(BotaniaStateProps.ENDBRICK_VARIANT, EndBrickVariant.values()[meta]);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, List<ItemStack> list) {
|
||||
for(int i = 0; i < EndBrickVariant.values().length; i++)
|
||||
list.add(new ItemStack(item, 1, i));
|
||||
}
|
||||
|
||||
@Override
|
||||
public int damageDropped(IBlockState state) {
|
||||
return getMetaFromState(state);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void registerItemForm() {
|
||||
GameRegistry.register(new ItemBlockWithMetadataAndName(this), getRegistryName());
|
||||
}
|
||||
|
||||
@Nonnull
|
||||
@Override
|
||||
public ItemStack getPickBlock(@Nonnull IBlockState state, RayTraceResult target, @Nonnull World world, @Nonnull BlockPos pos, EntityPlayer player) {
|
||||
return new ItemStack(this, 1, getMetaFromState(world.getBlockState(pos)));
|
||||
}
|
||||
|
||||
@Override
|
||||
public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) {
|
||||
return LexiconData.endStoneDecor;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,48 +0,0 @@
|
||||
/**
|
||||
* This class was created by <Vazkii>. It's distributed as
|
||||
* part of the Botania Mod. Get the Source Code in github:
|
||||
* https://github.com/Vazkii/Botania
|
||||
*
|
||||
* Botania is Open Source and distributed under the
|
||||
* Botania License: http://botaniamod.net/license.php
|
||||
*
|
||||
* File Created @ [Feb 16, 2015, 8:45:00 PM (GMT)]
|
||||
*/
|
||||
package vazkii.botania.common.block.decor.slabs;
|
||||
|
||||
import net.minecraft.block.BlockSlab;
|
||||
import net.minecraft.block.SoundType;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.world.World;
|
||||
import vazkii.botania.api.lexicon.LexiconEntry;
|
||||
import vazkii.botania.common.block.ModBlocks;
|
||||
import vazkii.botania.common.block.ModFluffBlocks;
|
||||
import vazkii.botania.common.lexicon.LexiconData;
|
||||
|
||||
public class BlockEndStoneSlab extends BlockLivingSlab {
|
||||
|
||||
public BlockEndStoneSlab(boolean full) {
|
||||
super(full, ModBlocks.endStoneBrick.getDefaultState());
|
||||
setHardness(1.5F);
|
||||
setResistance(10F);
|
||||
setSoundType(SoundType.STONE);
|
||||
}
|
||||
|
||||
@Override
|
||||
public BlockSlab getFullBlock() {
|
||||
return (BlockSlab) ModFluffBlocks.endStoneSlabFull;
|
||||
}
|
||||
|
||||
@Override
|
||||
public BlockSlab getSingleBlock() {
|
||||
return (BlockSlab) ModFluffBlocks.endStoneSlab;
|
||||
}
|
||||
|
||||
@Override
|
||||
public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) {
|
||||
return LexiconData.endStoneDecor;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,50 +0,0 @@
|
||||
/**
|
||||
* This class was created by <Vazkii>. It's distributed as
|
||||
* part of the Botania Mod. Get the Source Code in github:
|
||||
* https://github.com/Vazkii/Botania
|
||||
*
|
||||
* Botania is Open Source and distributed under the
|
||||
* Botania License: http://botaniamod.net/license.php
|
||||
*
|
||||
* File Created @ [Jul 7, 2015, 10:37:15 PM (GMT)]
|
||||
*/
|
||||
package vazkii.botania.common.block.decor.slabs;
|
||||
|
||||
import net.minecraft.block.BlockSlab;
|
||||
import net.minecraft.block.SoundType;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.world.World;
|
||||
import vazkii.botania.api.lexicon.LexiconEntry;
|
||||
import vazkii.botania.api.state.BotaniaStateProps;
|
||||
import vazkii.botania.api.state.enums.EndBrickVariant;
|
||||
import vazkii.botania.common.block.ModBlocks;
|
||||
import vazkii.botania.common.block.ModFluffBlocks;
|
||||
import vazkii.botania.common.lexicon.LexiconData;
|
||||
|
||||
public class BlockEnderBrickSlab extends BlockLivingSlab {
|
||||
|
||||
public BlockEnderBrickSlab(boolean full) {
|
||||
super(full, ModBlocks.endStoneBrick.getDefaultState().withProperty(BotaniaStateProps.ENDBRICK_VARIANT, EndBrickVariant.ENDER_BRICKS));
|
||||
setHardness(1.5F);
|
||||
setResistance(10F);
|
||||
setSoundType(SoundType.STONE);
|
||||
}
|
||||
|
||||
@Override
|
||||
public BlockSlab getFullBlock() {
|
||||
return (BlockSlab) ModFluffBlocks.enderBrickSlabFull;
|
||||
}
|
||||
|
||||
@Override
|
||||
public BlockSlab getSingleBlock() {
|
||||
return (BlockSlab) ModFluffBlocks.enderBrickSlab;
|
||||
}
|
||||
|
||||
@Override
|
||||
public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) {
|
||||
return LexiconData.endStoneDecor;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,32 +0,0 @@
|
||||
/**
|
||||
* This class was created by <Vazkii>. It's distributed as
|
||||
* part of the Botania Mod. Get the Source Code in github:
|
||||
* https://github.com/Vazkii/Botania
|
||||
*
|
||||
* Botania is Open Source and distributed under the
|
||||
* Botania License: http://botaniamod.net/license.php
|
||||
*
|
||||
* File Created @ [Feb 16, 2015, 8:44:03 PM (GMT)]
|
||||
*/
|
||||
package vazkii.botania.common.block.decor.stairs;
|
||||
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.world.World;
|
||||
import vazkii.botania.api.lexicon.LexiconEntry;
|
||||
import vazkii.botania.common.block.ModBlocks;
|
||||
import vazkii.botania.common.lexicon.LexiconData;
|
||||
|
||||
public class BlockEndStoneStairs extends BlockLivingStairs {
|
||||
|
||||
public BlockEndStoneStairs() {
|
||||
super(ModBlocks.endStoneBrick.getDefaultState());
|
||||
}
|
||||
|
||||
@Override
|
||||
public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) {
|
||||
return LexiconData.endStoneDecor;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,34 +0,0 @@
|
||||
/**
|
||||
* This class was created by <Vazkii>. It's distributed as
|
||||
* part of the Botania Mod. Get the Source Code in github:
|
||||
* https://github.com/Vazkii/Botania
|
||||
*
|
||||
* Botania is Open Source and distributed under the
|
||||
* Botania License: http://botaniamod.net/license.php
|
||||
*
|
||||
* File Created @ [Jul 7, 2015, 10:38:15 PM (GMT)]
|
||||
*/
|
||||
package vazkii.botania.common.block.decor.stairs;
|
||||
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.world.World;
|
||||
import vazkii.botania.api.lexicon.LexiconEntry;
|
||||
import vazkii.botania.api.state.BotaniaStateProps;
|
||||
import vazkii.botania.api.state.enums.EndBrickVariant;
|
||||
import vazkii.botania.common.block.ModBlocks;
|
||||
import vazkii.botania.common.lexicon.LexiconData;
|
||||
|
||||
public class BlockEnderBrickStairs extends BlockLivingStairs {
|
||||
|
||||
public BlockEnderBrickStairs() {
|
||||
super(ModBlocks.endStoneBrick.getDefaultState().withProperty(BotaniaStateProps.ENDBRICK_VARIANT, EndBrickVariant.ENDER_BRICKS));
|
||||
}
|
||||
|
||||
@Override
|
||||
public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) {
|
||||
return LexiconData.endStoneDecor;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -386,14 +386,6 @@ public final class BotaniaCreativeTab extends CreativeTabs {
|
||||
for (Block pavementSlab : ModFluffBlocks.pavementSlabs)
|
||||
addBlock(pavementSlab);
|
||||
|
||||
if(ConfigHandler.enderStuff19Enabled) {
|
||||
addBlock(ModBlocks.endStoneBrick);
|
||||
addBlock(ModFluffBlocks.endStoneSlab);
|
||||
addBlock(ModFluffBlocks.endStoneStairs);
|
||||
addBlock(ModFluffBlocks.enderBrickSlab);
|
||||
addBlock(ModFluffBlocks.enderBrickStairs);
|
||||
}
|
||||
|
||||
addItem(ModItems.cosmetic);
|
||||
}
|
||||
|
||||
|
||||
@@ -82,7 +82,6 @@ public final class ConfigHandler {
|
||||
public static boolean relicsEnabled = true;
|
||||
public static boolean stones18Enabled = true;
|
||||
public static boolean ringOfOdinFireResist = true;
|
||||
public static boolean enderStuff19Enabled = true;
|
||||
public static boolean invertMagnetRing = false;
|
||||
public static boolean enableThaumcraftStablizers = true;
|
||||
|
||||
@@ -226,9 +225,6 @@ public final class ConfigHandler {
|
||||
desc = "Set this to false to make the Ring of Odin not apply fire resistance. Mostly for people who use Witchery transformations.";
|
||||
ringOfOdinFireResist = loadPropBool("ringOfOdin.fireResist", desc, ringOfOdinFireResist);
|
||||
|
||||
desc = "Set this to false to disable the 1.9 Ender features available as recipes. This only disables the recipes and entries. Old ones that are already in the world will stay.";
|
||||
enderStuff19Enabled = loadPropBool("19enderStuff.enabled", desc, enderStuff19Enabled);
|
||||
|
||||
desc = "Set this to true to invert the Ring of Magnetization's controls (from shift to stop to shift to work)";
|
||||
invertMagnetRing = loadPropBool("magnetRing.invert", desc, invertMagnetRing);
|
||||
|
||||
|
||||
@@ -23,20 +23,6 @@ public final class ModMigrationRecipes {
|
||||
// Prismarine -> vanilla
|
||||
GameRegistry.addShapelessRecipe(new ItemStack(Items.PRISMARINE_SHARD), new ItemStack(ModItems.manaResource, 1, 10));
|
||||
|
||||
// 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));
|
||||
// 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()));
|
||||
|
||||
Reference in new issue
Block a user