More purging

This commit is contained in:
Vasco Lavos committed 2016-09-11 19:19:07 +01:00
1 parent 1edbc41b12
commit 46befb879d
15 files changed
+1 -307

No files matched your search

@@ -54,8 +54,6 @@ public final class LibResources {
public static final String ENTRY_APOTHECARY = PREFIX_ENTRIES + "apothecary.png";
public static final String ENTRY_PURE_DAISY = PREFIX_ENTRIES + "pureDaisy.png";
public static final String ENTRY_SPREADER = PREFIX_ENTRIES + "spreader.png";
public static final String ENTRY_UNSTABLE_BLOCK = PREFIX_ENTRIES + "unstableBlock.png";
public static final String ENTRY_UNSTABLE_BEACON = PREFIX_ENTRIES + "unstableBeacon.png";
public static final String ENTRY_BAUBLES = PREFIX_ENTRIES + "baubles.png";
public static final String ENTRY_ELVEN_GARDE = PREFIX_ENTRIES + "elvenGarde.png";
public static final String ENTRY_DIMINISHING_RETURNS = PREFIX_ENTRIES + "diminishingReturns.png";
@@ -30,10 +30,6 @@ import vazkii.botania.common.block.decor.quartz.BlockSpecialQuartzSlab;
import vazkii.botania.common.block.decor.quartz.BlockSpecialQuartzStairs;
import vazkii.botania.common.block.decor.slabs.BlockBiomeStoneSlab;
import vazkii.botania.common.block.decor.slabs.BlockPavementSlab;
import vazkii.botania.common.block.decor.slabs.bricks.BlockCustomBrickSlab;
import vazkii.botania.common.block.decor.slabs.bricks.BlockSnowBrickSlab;
import vazkii.botania.common.block.decor.slabs.bricks.BlockSoulBrickSlab;
import vazkii.botania.common.block.decor.slabs.bricks.BlockTileSlab;
import vazkii.botania.common.block.decor.slabs.living.BlockDreamwoodPlankSlab;
import vazkii.botania.common.block.decor.slabs.living.BlockDreamwoodSlab;
import vazkii.botania.common.block.decor.slabs.living.BlockLivingrockBrickSlab;
@@ -44,10 +40,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.BlockBiomeStoneStairs;
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;
import vazkii.botania.common.block.decor.stairs.bricks.BlockSoulBrickStairs;
import vazkii.botania.common.block.decor.stairs.bricks.BlockTileStairs;
import vazkii.botania.common.block.decor.stairs.living.BlockDreamwoodPlankStairs;
import vazkii.botania.common.block.decor.stairs.living.BlockDreamwoodStairs;
import vazkii.botania.common.block.decor.stairs.living.BlockLivingrockBrickStairs;
@@ -87,19 +79,6 @@ public final class ModFluffBlocks {
public static Block dreamwoodPlankSlab;
public static Block dreamwoodPlankSlabFull;
public static Block netherBrickStairs;
public static Block netherBrickSlab;
public static Block netherBrickSlabFull;
public static Block soulBrickStairs;
public static Block soulBrickSlab;
public static Block soulBrickSlabFull;
public static Block snowBrickStairs;
public static Block snowBrickSlab;
public static Block snowBrickSlabFull;
public static Block tileStairs;
public static Block tileSlab;
public static Block tileSlabFull;
public static Block darkQuartz;
public static Block darkQuartzSlab;
public static Block darkQuartzSlabFull;
@@ -176,19 +155,6 @@ public final class ModFluffBlocks {
dreamwoodPlankSlab = new BlockDreamwoodPlankSlab(false);
dreamwoodPlankSlabFull = new BlockDreamwoodPlankSlab(true);
netherBrickStairs = new BlockCustomBrickStairs();
netherBrickSlab = new BlockCustomBrickSlab(false);
netherBrickSlabFull = new BlockCustomBrickSlab(true);
soulBrickStairs = new BlockSoulBrickStairs();
soulBrickSlab = new BlockSoulBrickSlab(false);
soulBrickSlabFull = new BlockSoulBrickSlab(true);
snowBrickStairs = new BlockSnowBrickStairs();
snowBrickSlab = new BlockSnowBrickSlab(false);
snowBrickSlabFull = new BlockSnowBrickSlab(true);
tileStairs = new BlockTileStairs();
tileSlab = new BlockTileSlab(false);
tileSlabFull = new BlockTileSlab(true);
biomeStoneA = new BlockBiomeStoneA();
biomeStoneB = new BlockBiomeStoneB();
pavement = new BlockPavement();
@@ -1,55 +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 28, 2014, 10:15:41 PM (GMT)]
*/
package vazkii.botania.common.block.decor.slabs.bricks;
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.CustomBrickVariant;
import vazkii.botania.common.block.ModBlocks;
import vazkii.botania.common.block.ModFluffBlocks;
import vazkii.botania.common.block.decor.slabs.BlockLivingSlab;
import vazkii.botania.common.lexicon.LexiconData;
public class BlockCustomBrickSlab extends BlockLivingSlab {
public BlockCustomBrickSlab(boolean full) {
this(full, CustomBrickVariant.HELLISH_BRICK);
}
public BlockCustomBrickSlab(boolean full, CustomBrickVariant variant) {
super(full, ModBlocks.customBrick.getDefaultState().withProperty(BotaniaStateProps.CUSTOMBRICK_VARIANT, variant));
setHardness(2.0F);
setResistance(5.0F);
setSoundType(SoundType.STONE);
}
@Override
public BlockSlab getFullBlock() {
return (BlockSlab) ModFluffBlocks.netherBrickSlabFull;
}
@Override
public BlockSlab getSingleBlock() {
return (BlockSlab) ModFluffBlocks.netherBrickSlab;
}
@Override
public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) {
return LexiconData.decorativeBlocks;
}
}
@@ -1,33 +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 28, 2014, 11:32:45 PM (GMT)]
*/
package vazkii.botania.common.block.decor.slabs.bricks;
import net.minecraft.block.BlockSlab;
import vazkii.botania.api.state.enums.CustomBrickVariant;
import vazkii.botania.common.block.ModFluffBlocks;
public class BlockSnowBrickSlab extends BlockCustomBrickSlab {
public BlockSnowBrickSlab(boolean full) {
super(full, CustomBrickVariant.FROSTY_BRICK);
}
@Override
public BlockSlab getFullBlock() {
return (BlockSlab) ModFluffBlocks.snowBrickSlabFull;
}
@Override
public BlockSlab getSingleBlock() {
return (BlockSlab) ModFluffBlocks.snowBrickSlab;
}
}
@@ -1,33 +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 28, 2014, 10:19:46 PM (GMT)]
*/
package vazkii.botania.common.block.decor.slabs.bricks;
import net.minecraft.block.BlockSlab;
import vazkii.botania.api.state.enums.CustomBrickVariant;
import vazkii.botania.common.block.ModFluffBlocks;
public class BlockSoulBrickSlab extends BlockCustomBrickSlab {
public BlockSoulBrickSlab(boolean full) {
super(full, CustomBrickVariant.SOUL_BRICK);
}
@Override
public BlockSlab getFullBlock() {
return (BlockSlab) ModFluffBlocks.soulBrickSlabFull;
}
@Override
public BlockSlab getSingleBlock() {
return (BlockSlab) ModFluffBlocks.soulBrickSlab;
}
}
@@ -1,33 +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 28, 2014, 11:49:42 PM (GMT)]
*/
package vazkii.botania.common.block.decor.slabs.bricks;
import net.minecraft.block.BlockSlab;
import vazkii.botania.api.state.enums.CustomBrickVariant;
import vazkii.botania.common.block.ModFluffBlocks;
public class BlockTileSlab extends BlockCustomBrickSlab {
public BlockTileSlab(boolean full) {
super(full, CustomBrickVariant.ROOF_TILE);
}
@Override
public BlockSlab getFullBlock() {
return (BlockSlab) ModFluffBlocks.tileSlabFull;
}
@Override
public BlockSlab getSingleBlock() {
return (BlockSlab) ModFluffBlocks.tileSlab;
}
}
@@ -1,29 +0,0 @@
package vazkii.botania.common.block.decor.stairs.bricks;
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.CustomBrickVariant;
import vazkii.botania.common.block.ModBlocks;
import vazkii.botania.common.block.decor.stairs.BlockLivingStairs;
import vazkii.botania.common.lexicon.LexiconData;
public class BlockCustomBrickStairs extends BlockLivingStairs {
public BlockCustomBrickStairs() {
this(CustomBrickVariant.HELLISH_BRICK);
}
public BlockCustomBrickStairs(CustomBrickVariant variant) {
super(ModBlocks.customBrick.getDefaultState().withProperty(BotaniaStateProps.CUSTOMBRICK_VARIANT, variant));
}
@Override
public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) {
return LexiconData.decorativeBlocks;
}
}
@@ -1,21 +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 28, 2014, 11:28:47 PM (GMT)]
*/
package vazkii.botania.common.block.decor.stairs.bricks;
import vazkii.botania.api.state.enums.CustomBrickVariant;
public class BlockSnowBrickStairs extends BlockCustomBrickStairs {
public BlockSnowBrickStairs() {
super(CustomBrickVariant.FROSTY_BRICK);
}
}
@@ -1,21 +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 28, 2014, 10:10:00 PM (GMT)]
*/
package vazkii.botania.common.block.decor.stairs.bricks;
import vazkii.botania.api.state.enums.CustomBrickVariant;
public class BlockSoulBrickStairs extends BlockCustomBrickStairs {
public BlockSoulBrickStairs() {
super(CustomBrickVariant.SOUL_BRICK);
}
}
@@ -1,21 +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 28, 2014, 10:10:00 PM (GMT)]
*/
package vazkii.botania.common.block.decor.stairs.bricks;
import vazkii.botania.api.state.enums.CustomBrickVariant;
public class BlockTileStairs extends BlockCustomBrickStairs {
public BlockTileStairs() {
super(CustomBrickVariant.ROOF_TILE);
}
}
@@ -300,14 +300,6 @@ public final class BotaniaCreativeTab extends CreativeTabs {
addBlock(ModBlocks.blazeBlock);
addBlock(ModBlocks.customBrick);
addBlock(ModFluffBlocks.netherBrickStairs);
addBlock(ModFluffBlocks.netherBrickSlab);
addBlock(ModFluffBlocks.soulBrickStairs);
addBlock(ModFluffBlocks.soulBrickSlab);
addBlock(ModFluffBlocks.snowBrickStairs);
addBlock(ModFluffBlocks.snowBrickSlab);
addBlock(ModFluffBlocks.tileStairs);
addBlock(ModFluffBlocks.tileSlab);
addBlock(ModFluffBlocks.livingwoodStairs);
addBlock(ModFluffBlocks.livingwoodSlab);
@@ -2034,10 +2034,6 @@ public final class ModCraftingRecipes {
addStairsAndSlabs(ModBlocks.livingrock, 1, ModFluffBlocks.livingrockBrickStairs, ModFluffBlocks.livingrockBrickSlab);
addStairsAndSlabs(ModBlocks.dreamwood, 0, ModFluffBlocks.dreamwoodStairs, ModFluffBlocks.dreamwoodSlab);
addStairsAndSlabs(ModBlocks.dreamwood, 1, ModFluffBlocks.dreamwoodPlankStairs, ModFluffBlocks.dreamwoodPlankSlab);
addStairsAndSlabs(ModBlocks.customBrick, 0, ModFluffBlocks.netherBrickStairs, ModFluffBlocks.netherBrickSlab);
addStairsAndSlabs(ModBlocks.customBrick, 1, ModFluffBlocks.soulBrickStairs, ModFluffBlocks.soulBrickSlab);
addStairsAndSlabs(ModBlocks.customBrick, 2, ModFluffBlocks.snowBrickStairs, ModFluffBlocks.snowBrickSlab);
addStairsAndSlabs(ModBlocks.customBrick, 3, ModFluffBlocks.tileStairs, ModFluffBlocks.tileSlab);
addStairsAndSlabs(ModBlocks.shimmerrock, 0, ModFluffBlocks.shimmerrockStairs, ModFluffBlocks.shimmerrockSlab);
addStairsAndSlabs(ModBlocks.shimmerwoodPlanks, 0, ModFluffBlocks.shimmerwoodPlankStairs, ModFluffBlocks.shimmerwoodPlankSlab);
@@ -268,7 +268,6 @@ public final class LexiconData {
public static LexiconEntry unstableBlocks;
public static LexiconEntry decorativeBlocks;
public static LexiconEntry dispenserTweaks;
public static LexiconEntry shinyFlowers;
public static LexiconEntry shedding;
public static LexiconEntry tinyPotato;
@@ -1325,9 +1324,6 @@ public final class LexiconData {
new PageCraftingRecipe("15", ModCraftingRecipes.recipeRedQuartz),
new PageCraftingRecipe("23", ModCraftingRecipes.recipeSunnyQuartz), new PageText("16"));
dispenserTweaks = new BasicLexiconEntry(LibLexicon.MISC_DISPENSER_TWEAKS, categoryMisc);
dispenserTweaks.setLexiconPages(new PageText("0")).setPriority().setIcon(new ItemStack(Blocks.DISPENSER));
shinyFlowers = new BasicLexiconEntry(LibLexicon.MISC_SHINY_FLOWERS, categoryMisc);
shinyFlowers.setLexiconPages(new PageText("0"), new PageText("3"),
new PageCraftingRecipe("1", ModCraftingRecipes.recipesShinyFlowers),
@@ -241,9 +241,7 @@ public final class LibLexicon {
public static final String ALF_LOKI_RING = "lokiRing";
public static final String ALF_ODIN_RING = "odinRing";
public static final String MISC_UNSTABLE_BLOCKS = "unstableBlocks";
public static final String MISC_DECORATIVE_BLOCKS = "decorativeBlocks";
public static final String MISC_DISPENSER_TWEAKS = "dispenserTweaks";
public static final String MISC_SHINY_FLOWERS = "shinyFlowers";
public static final String MISC_PRISMARINE = "prismarine";
public static final String MISC_SHEDDING = "shedding";
@@ -251,7 +249,6 @@ public final class LibLexicon {
public static final String MISC_HEAD_CREATING = "headCreating";
public static final String MISC_AZULEJO = "azulejo";
public static final String MISC_STARFIELD = "starfield";
public static final String MISC_DIRT_PATH = "dirtPath";
public static final String MISC_MUSHROOMS = "mushrooms";
public static final String MISC_PHANTOM_INK = "phantomInk";
public static final String MISC_STONE_ALCHEMY = "stoneAlchemy";