mirror of
https://github.com/GTNewHorizons/Botania.git
synced 2026-11-19 03:39:17 +00:00
Byebye Future (hah) stones!
This commit is contained in:
55 files changed
+2
-1261
No files matched your search
@@ -30,14 +30,11 @@ import vazkii.botania.api.state.enums.CratePattern;
|
||||
import vazkii.botania.api.state.enums.CrateVariant;
|
||||
import vazkii.botania.api.state.enums.CustomBrickVariant;
|
||||
import vazkii.botania.api.state.enums.DrumVariant;
|
||||
import vazkii.botania.api.state.enums.EndBrickVariant;
|
||||
import vazkii.botania.api.state.enums.FutureStoneVariant;
|
||||
import vazkii.botania.api.state.enums.LivingRockVariant;
|
||||
import vazkii.botania.api.state.enums.LivingWoodVariant;
|
||||
import vazkii.botania.api.state.enums.LuminizerVariant;
|
||||
import vazkii.botania.api.state.enums.PlatformVariant;
|
||||
import vazkii.botania.api.state.enums.PoolVariant;
|
||||
import vazkii.botania.api.state.enums.PrismarineVariant;
|
||||
import vazkii.botania.api.state.enums.PylonVariant;
|
||||
import vazkii.botania.api.state.enums.QuartzVariant;
|
||||
import vazkii.botania.api.state.enums.SpreaderVariant;
|
||||
@@ -90,18 +87,6 @@ public final class BotaniaStateProps {
|
||||
|
||||
/** Properties for individual blocks **/
|
||||
|
||||
// Block18Stone
|
||||
public static final PropertyEnum<FutureStoneVariant> FUTURESTONE_VARIANT = PropertyEnum.create("variant", FutureStoneVariant.class);
|
||||
|
||||
// Block18StoneWall
|
||||
public static final PropertyEnum<FutureStoneVariant> FUTURESTONEWALL_VARIANT = PropertyEnum.create("fswall_variant", FutureStoneVariant.class, new Predicate<FutureStoneVariant>() {
|
||||
@Override
|
||||
public boolean apply(FutureStoneVariant variant) {
|
||||
// Just the four kinds (no polished, chiseled, etc.)
|
||||
return variant.ordinal() >= 0 && variant.ordinal() <= 3;
|
||||
}
|
||||
});
|
||||
|
||||
// BlockAlfPortal
|
||||
public static final PropertyEnum<AlfPortalState> ALFPORTAL_STATE = PropertyEnum.create("state", AlfPortalState.class);
|
||||
|
||||
@@ -134,9 +119,6 @@ public final class BotaniaStateProps {
|
||||
// BlockEnchanter
|
||||
public static final PropertyEnum<EnumFacing.Axis> ENCHANTER_DIRECTION = PropertyEnum.create("facing", EnumFacing.Axis.class, Predicates.not(Predicates.equalTo(EnumFacing.Axis.Y)));
|
||||
|
||||
// BlockEndStoneBrick
|
||||
public static final PropertyEnum<EndBrickVariant> ENDBRICK_VARIANT = PropertyEnum.create("variant", EndBrickVariant.class);
|
||||
|
||||
// BlockForestDrum
|
||||
public static final PropertyEnum<DrumVariant> DRUM_VARIANT = PropertyEnum.create("variant", DrumVariant.class);
|
||||
|
||||
@@ -188,9 +170,6 @@ public final class BotaniaStateProps {
|
||||
// BlockPrism
|
||||
public static final PropertyBool HAS_LENS = PropertyBool.create("has_lens");
|
||||
|
||||
// BlockPrismarine
|
||||
public static final PropertyEnum<PrismarineVariant> PRISMARINE_VARIANT = PropertyEnum.create("variant", PrismarineVariant.class);
|
||||
|
||||
// BlockPylon
|
||||
public static final PropertyEnum<PylonVariant> PYLON_VARIANT = PropertyEnum.create("variant", PylonVariant.class);
|
||||
|
||||
|
||||
@@ -1,26 +0,0 @@
|
||||
/**
|
||||
* This class was created by <williewillus>. It's distributed as
|
||||
* part of the Botania Mod. Get the Source Code in github:
|
||||
* https://github.com/Vazkii/Botania
|
||||
* <p>
|
||||
* Botania is Open Source and distributed under the
|
||||
* Botania License: http://botaniamod.net/license.php
|
||||
*/
|
||||
package vazkii.botania.api.state.enums;
|
||||
|
||||
import net.minecraft.util.IStringSerializable;
|
||||
|
||||
import java.util.Locale;
|
||||
|
||||
public enum EndBrickVariant implements IStringSerializable {
|
||||
END_STONE_BRICKS,
|
||||
CHISELED_END_STONE_BRICKS,
|
||||
ENDER_BRICKS,
|
||||
PILLAR_ENDER_BRICKS;
|
||||
|
||||
@Override
|
||||
public String getName() {
|
||||
return name().toLowerCase(Locale.ROOT);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,38 +0,0 @@
|
||||
/**
|
||||
* This class was created by <williewillus>. It's distributed as
|
||||
* part of the Botania Mod. Get the Source Code in github:
|
||||
* https://github.com/Vazkii/Botania
|
||||
* <p>
|
||||
* Botania is Open Source and distributed under the
|
||||
* Botania License: http://botaniamod.net/license.php
|
||||
*/
|
||||
package vazkii.botania.api.state.enums;
|
||||
|
||||
import net.minecraft.util.IStringSerializable;
|
||||
|
||||
import java.util.Locale;
|
||||
|
||||
public enum FutureStoneVariant implements IStringSerializable {
|
||||
ANDESITE,
|
||||
BASALT,
|
||||
DIORITE,
|
||||
GRANITE,
|
||||
POLISHED_ANDESITE,
|
||||
POLISHED_BASALT,
|
||||
POLISHED_DIORITE,
|
||||
POLISHED_GRANITE,
|
||||
ANDESITE_BRICK,
|
||||
BASALT_BRICK,
|
||||
DIORITE_BRICK,
|
||||
GRANITE_BRICK,
|
||||
CHISELED_ANDESITE,
|
||||
CHISELED_BASALT,
|
||||
CHISELED_DIORITE,
|
||||
CHISELED_GRANITE;
|
||||
|
||||
@Override
|
||||
public String getName() {
|
||||
return name().toLowerCase(Locale.ROOT);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,25 +0,0 @@
|
||||
/**
|
||||
* This class was created by <williewillus>. It's distributed as
|
||||
* part of the Botania Mod. Get the Source Code in github:
|
||||
* https://github.com/Vazkii/Botania
|
||||
* <p>
|
||||
* Botania is Open Source and distributed under the
|
||||
* Botania License: http://botaniamod.net/license.php
|
||||
*/
|
||||
package vazkii.botania.api.state.enums;
|
||||
|
||||
import net.minecraft.util.IStringSerializable;
|
||||
|
||||
import java.util.Locale;
|
||||
|
||||
public enum PrismarineVariant implements IStringSerializable {
|
||||
PRISMARINE,
|
||||
PRISMARINE_BRICKS,
|
||||
DARK_PRISMARINE;
|
||||
|
||||
@Override
|
||||
public String getName() {
|
||||
return name().toLowerCase(Locale.ROOT);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -39,14 +39,11 @@ import vazkii.botania.api.state.enums.BiomeStoneVariant;
|
||||
import vazkii.botania.api.state.enums.CrateVariant;
|
||||
import vazkii.botania.api.state.enums.CustomBrickVariant;
|
||||
import vazkii.botania.api.state.enums.DrumVariant;
|
||||
import vazkii.botania.api.state.enums.EndBrickVariant;
|
||||
import vazkii.botania.api.state.enums.FutureStoneVariant;
|
||||
import vazkii.botania.api.state.enums.LivingRockVariant;
|
||||
import vazkii.botania.api.state.enums.LivingWoodVariant;
|
||||
import vazkii.botania.api.state.enums.LuminizerVariant;
|
||||
import vazkii.botania.api.state.enums.PlatformVariant;
|
||||
import vazkii.botania.api.state.enums.PoolVariant;
|
||||
import vazkii.botania.api.state.enums.PrismarineVariant;
|
||||
import vazkii.botania.api.state.enums.PylonVariant;
|
||||
import vazkii.botania.api.state.enums.SpreaderVariant;
|
||||
import vazkii.botania.api.state.enums.StorageVariant;
|
||||
@@ -355,7 +352,6 @@ public final class ModelHandler {
|
||||
registerVariantsDefaulted(ModBlocks.platform, PlatformVariant.class, "variant");
|
||||
registerVariantsDefaulted(ModBlocks.spreader, SpreaderVariant.class, "variant");
|
||||
// todo 1.8 this is temporary until animation API is done, currnetly item model textures will not match true spreader texture
|
||||
registerVariantsDefaulted(ModFluffBlocks.stone, FutureStoneVariant.class, "variant");
|
||||
registerVariantsDefaulted(ModBlocks.storage, StorageVariant.class, "variant");
|
||||
}
|
||||
|
||||
@@ -618,7 +614,6 @@ public final class ModelHandler {
|
||||
ModelLoader.setCustomStateMapper(ModFluffBlocks.dreamwoodWall, (new StateMap.Builder()).ignore(BlockWall.VARIANT).build());
|
||||
ModelLoader.setCustomStateMapper(ModFluffBlocks.livingrockWall, (new StateMap.Builder()).ignore(BlockWall.VARIANT).build());
|
||||
ModelLoader.setCustomStateMapper(ModFluffBlocks.livingwoodWall, (new StateMap.Builder()).ignore(BlockWall.VARIANT).build());
|
||||
ModelLoader.setCustomStateMapper(ModFluffBlocks.stoneWall, (new StateMap.Builder()).ignore(BlockWall.VARIANT).build());
|
||||
|
||||
// Ignore dummy variant in slabs
|
||||
for (Block b : ModFluffBlocks.biomeStoneSlabs) {
|
||||
@@ -629,10 +624,6 @@ public final class ModelHandler {
|
||||
ModelLoader.setCustomStateMapper(b, (new StateMap.Builder()).ignore(BlockModSlab.DUMMY).build());
|
||||
}
|
||||
|
||||
for (Block b : ModFluffBlocks.stoneSlabs) {
|
||||
ModelLoader.setCustomStateMapper(b, (new StateMap.Builder()).ignore(BlockModSlab.DUMMY).build());
|
||||
}
|
||||
|
||||
List<Block> otherSlabs = Lists.newArrayList(ModFluffBlocks.livingwoodSlab, ModFluffBlocks.livingwoodPlankSlab, ModFluffBlocks.livingrockSlab, ModFluffBlocks.dreamwoodSlab, ModFluffBlocks.livingrockBrickSlab,
|
||||
ModFluffBlocks.dreamwoodPlankSlab,
|
||||
ModFluffBlocks.netherBrickSlab, ModFluffBlocks.soulBrickSlab, ModFluffBlocks.snowBrickSlab,
|
||||
@@ -655,10 +646,6 @@ public final class ModelHandler {
|
||||
ModelLoader.setCustomStateMapper(b, (new StateMap.Builder()).ignore(BlockModSlab.DUMMY, BlockSlab.HALF).build());
|
||||
}
|
||||
|
||||
for (Block b : ModFluffBlocks.stoneFullSlabs) {
|
||||
ModelLoader.setCustomStateMapper(b, (new StateMap.Builder()).ignore(BlockModSlab.DUMMY, BlockSlab.HALF).build());
|
||||
}
|
||||
|
||||
List<Block> otherFullSlabs = Lists.newArrayList(ModFluffBlocks.livingwoodSlabFull, ModFluffBlocks.livingwoodPlankSlabFull, ModFluffBlocks.livingrockSlabFull, ModFluffBlocks.dreamwoodSlabFull, ModFluffBlocks.livingrockBrickSlabFull,
|
||||
ModFluffBlocks.dreamwoodPlankSlabFull,
|
||||
ModFluffBlocks.netherBrickSlabFull, ModFluffBlocks.soulBrickSlabFull, ModFluffBlocks.snowBrickSlabFull,
|
||||
@@ -753,10 +740,6 @@ public final class ModelHandler {
|
||||
}
|
||||
|
||||
private static void registerStairs() {
|
||||
for (Block b : ModFluffBlocks.stoneStairs) {
|
||||
registerItemModel(b);
|
||||
}
|
||||
|
||||
for (Block b : ModFluffBlocks.pavementStairs) {
|
||||
registerItemModel(b);
|
||||
}
|
||||
@@ -796,10 +779,6 @@ public final class ModelHandler {
|
||||
registerItemModel(b);
|
||||
}
|
||||
|
||||
for (Block b : ModFluffBlocks.stoneSlabs) {
|
||||
registerItemModel(b);
|
||||
}
|
||||
|
||||
registerItemModel(ModFluffBlocks.livingwoodSlab);
|
||||
registerItemModel(ModFluffBlocks.livingwoodPlankSlab);
|
||||
registerItemModel(ModFluffBlocks.livingrockSlab);
|
||||
@@ -832,12 +811,6 @@ public final class ModelHandler {
|
||||
ModelLoader.setCustomModelResourceLocation(item, variant.ordinal() - 8, new ModelResourceLocation("botania:biomeStoneA0Wall", variantName));
|
||||
}
|
||||
|
||||
item = Item.getItemFromBlock(ModFluffBlocks.stoneWall);
|
||||
for (FutureStoneVariant variant : BotaniaStateProps.FUTURESTONEWALL_VARIANT.getAllowedValues()) {
|
||||
String variantName = "inventory_" + variant.getName();
|
||||
ModelLoader.setCustomModelResourceLocation(item, variant.ordinal(), new ModelResourceLocation("botania:stone0Wall", variantName));
|
||||
}
|
||||
|
||||
registerItemModel(ModFluffBlocks.livingrockWall);
|
||||
registerItemModel(ModFluffBlocks.livingwoodWall);
|
||||
registerItemModel(ModFluffBlocks.dreamwoodWall);
|
||||
|
||||
@@ -11,14 +11,11 @@
|
||||
package vazkii.botania.common.block;
|
||||
|
||||
import com.google.common.collect.ImmutableList;
|
||||
import com.google.common.collect.ImmutableSet;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.item.EnumDyeColor;
|
||||
import vazkii.botania.api.state.BotaniaStateProps;
|
||||
import vazkii.botania.api.state.enums.BiomeBrickVariant;
|
||||
import vazkii.botania.api.state.enums.BiomeStoneVariant;
|
||||
import vazkii.botania.api.state.enums.FutureStoneVariant;
|
||||
import vazkii.botania.common.block.decor.Block18Stone;
|
||||
import vazkii.botania.common.block.decor.BlockPavement;
|
||||
import vazkii.botania.common.block.decor.biomestone.BlockBiomeStoneA;
|
||||
import vazkii.botania.common.block.decor.biomestone.BlockBiomeStoneB;
|
||||
@@ -28,7 +25,6 @@ import vazkii.botania.common.block.decor.panes.BlockManaglassPane;
|
||||
import vazkii.botania.common.block.decor.quartz.BlockSpecialQuartz;
|
||||
import vazkii.botania.common.block.decor.quartz.BlockSpecialQuartzSlab;
|
||||
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.BlockModSlab;
|
||||
@@ -45,7 +41,6 @@ import vazkii.botania.common.block.decor.slabs.living.BlockLivingwoodPlankSlab;
|
||||
import vazkii.botania.common.block.decor.slabs.living.BlockLivingwoodSlab;
|
||||
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.BlockPavementStairs;
|
||||
import vazkii.botania.common.block.decor.stairs.bricks.BlockCustomBrickStairs;
|
||||
@@ -60,7 +55,6 @@ import vazkii.botania.common.block.decor.stairs.living.BlockLivingwoodPlankStair
|
||||
import vazkii.botania.common.block.decor.stairs.living.BlockLivingwoodStairs;
|
||||
import vazkii.botania.common.block.decor.stairs.living.BlockShimmerrockStairs;
|
||||
import vazkii.botania.common.block.decor.stairs.living.BlockShimmerwoodPlankStairs;
|
||||
import vazkii.botania.common.block.decor.walls.Block18StoneWall;
|
||||
import vazkii.botania.common.block.decor.walls.BlockBiomeStoneWall;
|
||||
import vazkii.botania.common.block.decor.walls.living.BlockDreamwoodWall;
|
||||
import vazkii.botania.common.block.decor.walls.living.BlockLivingrockWall;
|
||||
@@ -69,7 +63,6 @@ import vazkii.botania.common.core.handler.ConfigHandler;
|
||||
import vazkii.botania.common.lib.LibBlockNames;
|
||||
|
||||
import java.util.Locale;
|
||||
import java.util.Set;
|
||||
|
||||
public final class ModFluffBlocks {
|
||||
|
||||
@@ -142,7 +135,6 @@ public final class ModFluffBlocks {
|
||||
|
||||
public static Block biomeStoneA;
|
||||
public static Block biomeStoneB;
|
||||
public static Block stone;
|
||||
public static Block pavement;
|
||||
|
||||
public static final Block[] biomeStoneStairs = new Block[24];
|
||||
@@ -150,11 +142,6 @@ public final class ModFluffBlocks {
|
||||
public static final Block[] biomeStoneFullSlabs = new Block[24];
|
||||
public static Block biomeStoneWall;
|
||||
|
||||
public static final Block[] stoneStairs = new Block[8];
|
||||
public static final Block[] stoneSlabs = new Block[8];
|
||||
public static final Block[] stoneFullSlabs = new Block[8];
|
||||
public static Block stoneWall;
|
||||
|
||||
public static final Block[] pavementStairs = new Block[BlockPavement.TYPES];
|
||||
public static final Block[] pavementSlabs = new Block[BlockPavement.TYPES];
|
||||
public static final Block[] pavementFullSlabs = new Block[BlockPavement.TYPES];
|
||||
@@ -208,7 +195,6 @@ public final class ModFluffBlocks {
|
||||
|
||||
biomeStoneA = new BlockBiomeStoneA();
|
||||
biomeStoneB = new BlockBiomeStoneB();
|
||||
stone = new Block18Stone();
|
||||
pavement = new BlockPavement();
|
||||
|
||||
if(ConfigHandler.darkQuartzEnabled) {
|
||||
@@ -266,24 +252,6 @@ public final class ModFluffBlocks {
|
||||
}
|
||||
biomeStoneWall = new BlockBiomeStoneWall();
|
||||
|
||||
Set<FutureStoneVariant> allowed = ImmutableSet.of(FutureStoneVariant.ANDESITE, FutureStoneVariant.ANDESITE_BRICK,
|
||||
FutureStoneVariant.BASALT, FutureStoneVariant.BASALT_BRICK, FutureStoneVariant.DIORITE, FutureStoneVariant.DIORITE_BRICK,
|
||||
FutureStoneVariant.GRANITE, FutureStoneVariant.GRANITE_BRICK);
|
||||
|
||||
count = 0;
|
||||
for(FutureStoneVariant variant : FutureStoneVariant.values()) {
|
||||
if (!allowed.contains(variant)) {
|
||||
// Filter - only get the base blocks, and the brick versions
|
||||
continue;
|
||||
}
|
||||
|
||||
stoneStairs[count] = new Block18StoneStairs(variant);
|
||||
stoneSlabs[count] = new Block18StoneSlab(false, variant, count);
|
||||
stoneFullSlabs[count] = new Block18StoneSlab(true, variant, count);
|
||||
count++;
|
||||
}
|
||||
stoneWall = new Block18StoneWall();
|
||||
|
||||
count = 0;
|
||||
for (EnumDyeColor color : ImmutableList.of(EnumDyeColor.WHITE, EnumDyeColor.BLACK, EnumDyeColor.BLUE,
|
||||
EnumDyeColor.RED, EnumDyeColor.YELLOW, EnumDyeColor.GREEN)) {
|
||||
@@ -356,11 +324,6 @@ public final class ModFluffBlocks {
|
||||
((BlockModSlab) biomeStoneFullSlabs[i]).register();
|
||||
}
|
||||
|
||||
for(int i = 0; i < 8; i++) {
|
||||
((BlockModSlab) stoneSlabs[i]).register();
|
||||
((BlockModSlab) stoneFullSlabs[i]).register();
|
||||
}
|
||||
|
||||
for(int i = 0; i < pavementSlabs.length; i++) {
|
||||
((BlockModSlab) pavementSlabs[i]).register();
|
||||
((BlockModSlab) pavementFullSlabs[i]).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 @ [Apr 10, 2015, 7:34:31 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.FutureStoneVariant;
|
||||
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 Block18Stone extends BlockMod implements ILexiconable {
|
||||
|
||||
public Block18Stone() {
|
||||
super(Material.ROCK, LibBlockNames.STONE);
|
||||
setHardness(1.5F);
|
||||
setResistance(10F);
|
||||
setSoundType(SoundType.STONE);
|
||||
setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.FUTURESTONE_VARIANT, FutureStoneVariant.ANDESITE));
|
||||
}
|
||||
|
||||
@Nonnull
|
||||
@Override
|
||||
public BlockStateContainer createBlockState() {
|
||||
return new BlockStateContainer(this, BotaniaStateProps.FUTURESTONE_VARIANT);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getMetaFromState(IBlockState state) {
|
||||
return state.getValue(BotaniaStateProps.FUTURESTONE_VARIANT).ordinal();
|
||||
}
|
||||
|
||||
@Nonnull
|
||||
@Override
|
||||
public IBlockState getStateFromMeta(int meta) {
|
||||
if (meta >= FutureStoneVariant.values().length) {
|
||||
meta = 0;
|
||||
}
|
||||
return getDefaultState().withProperty(BotaniaStateProps.FUTURESTONE_VARIANT, FutureStoneVariant.values()[meta]);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, List<ItemStack> list) {
|
||||
for(int i = 0; i < 16; 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.stoneAlchemy;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -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 @ [Apr 10, 2015, 7:52:06 PM (GMT)]
|
||||
*/
|
||||
package vazkii.botania.common.block.decor.slabs;
|
||||
|
||||
import net.minecraft.block.BlockSlab;
|
||||
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.FutureStoneVariant;
|
||||
import vazkii.botania.common.block.ModFluffBlocks;
|
||||
import vazkii.botania.common.lexicon.LexiconData;
|
||||
|
||||
public class Block18StoneSlab extends BlockLivingSlab {
|
||||
|
||||
final int index;
|
||||
|
||||
public Block18StoneSlab(boolean full, FutureStoneVariant variant, int index) {
|
||||
super(full, ModFluffBlocks.stone.getDefaultState().withProperty(BotaniaStateProps.FUTURESTONE_VARIANT, variant));
|
||||
this.index = index;
|
||||
setHardness(1.5F);
|
||||
setResistance(10F);
|
||||
}
|
||||
|
||||
@Override
|
||||
public BlockSlab getFullBlock() {
|
||||
return (BlockSlab) ModFluffBlocks.stoneFullSlabs[index];
|
||||
}
|
||||
|
||||
@Override
|
||||
public BlockSlab getSingleBlock() {
|
||||
return (BlockSlab) ModFluffBlocks.stoneSlabs[index];
|
||||
}
|
||||
|
||||
@Override
|
||||
public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) {
|
||||
return LexiconData.stoneAlchemy;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -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 @ [Apr 10, 2015, 7:51:29 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.FutureStoneVariant;
|
||||
import vazkii.botania.common.block.ModFluffBlocks;
|
||||
import vazkii.botania.common.lexicon.LexiconData;
|
||||
|
||||
public class Block18StoneStairs extends BlockLivingStairs {
|
||||
|
||||
public Block18StoneStairs(FutureStoneVariant variant) {
|
||||
super(ModFluffBlocks.stone.getDefaultState().withProperty(BotaniaStateProps.FUTURESTONE_VARIANT, variant));
|
||||
}
|
||||
|
||||
@Override
|
||||
public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) {
|
||||
return LexiconData.stoneAlchemy;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,80 +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 18, 2015, 8:41:10 PM (GMT)]
|
||||
*/
|
||||
package vazkii.botania.common.block.decor.walls;
|
||||
|
||||
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.ResourceLocation;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.fml.common.registry.GameRegistry;
|
||||
import vazkii.botania.api.lexicon.LexiconEntry;
|
||||
import vazkii.botania.api.state.BotaniaStateProps;
|
||||
import vazkii.botania.api.state.enums.FutureStoneVariant;
|
||||
import vazkii.botania.common.block.ModFluffBlocks;
|
||||
import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName;
|
||||
import vazkii.botania.common.lexicon.LexiconData;
|
||||
import vazkii.botania.common.lib.LibMisc;
|
||||
|
||||
import javax.annotation.Nonnull;
|
||||
import java.util.List;
|
||||
|
||||
public class Block18StoneWall extends BlockModWall {
|
||||
|
||||
public Block18StoneWall() {
|
||||
super(ModFluffBlocks.stone, 0);
|
||||
setHardness(1.5F);
|
||||
setResistance(10F);
|
||||
setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.FUTURESTONEWALL_VARIANT, FutureStoneVariant.ANDESITE).withProperty(VARIANT, EnumType.NORMAL));
|
||||
}
|
||||
|
||||
@Nonnull
|
||||
@Override
|
||||
public BlockStateContainer createBlockState() {
|
||||
return new BlockStateContainer(this, VARIANT, UP, NORTH, SOUTH, WEST, EAST, BotaniaStateProps.FUTURESTONEWALL_VARIANT);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getMetaFromState(IBlockState state) {
|
||||
return state.getValue(BotaniaStateProps.FUTURESTONEWALL_VARIANT).ordinal();
|
||||
}
|
||||
|
||||
@Nonnull
|
||||
@Override
|
||||
public IBlockState getStateFromMeta(int meta) {
|
||||
if (meta < 0 || meta > 3) {
|
||||
meta = 0;
|
||||
}
|
||||
return getDefaultState().withProperty(BotaniaStateProps.FUTURESTONEWALL_VARIANT, FutureStoneVariant.values()[meta]);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void register(String name) {
|
||||
GameRegistry.register(this, new ResourceLocation(LibMisc.MOD_ID, name));
|
||||
GameRegistry.register(new ItemBlockWithMetadataAndName(this), getRegistryName());
|
||||
}
|
||||
|
||||
@Override
|
||||
public void getSubBlocks(@Nonnull Item item, CreativeTabs tabs, @Nonnull List<ItemStack> list) {
|
||||
for(int i = 0; i < 4; i++)
|
||||
list.add(new ItemStack(item, 1, i));
|
||||
}
|
||||
|
||||
@Override
|
||||
public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) {
|
||||
return LexiconData.stoneAlchemy;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -363,15 +363,6 @@ public final class BotaniaCreativeTab extends CreativeTabs {
|
||||
addBlock(ModFluffBlocks.sunnyQuartzSlab);
|
||||
addBlock(ModFluffBlocks.sunnyQuartzStairs);
|
||||
|
||||
if(ConfigHandler.stones18Enabled) {
|
||||
addBlock(ModFluffBlocks.stone);
|
||||
for(int i = 0; i < 8; i++)
|
||||
addBlock(ModFluffBlocks.stoneStairs[i]);
|
||||
for(int i = 0; i < 8; i++)
|
||||
addBlock(ModFluffBlocks.stoneSlabs[i]);
|
||||
addBlock(ModFluffBlocks.stoneWall);
|
||||
}
|
||||
|
||||
addBlock(ModFluffBlocks.biomeStoneA);
|
||||
addBlock(ModFluffBlocks.biomeStoneB);
|
||||
for(int i = 0; i < 24; i++)
|
||||
|
||||
@@ -1764,12 +1764,12 @@ public final class ModCraftingRecipes {
|
||||
new ItemStack(Block.REGISTRY.getObject(new ResourceLocation("Quark", "world_stone_bricks")), 1, 0),
|
||||
};
|
||||
|
||||
for(int i = 0; i < 4; i++) {
|
||||
/*for(int i = 0; i < 4; i++) { todo readd chiseled versions
|
||||
addOreDictRecipe(new ItemStack(ModFluffBlocks.stone, 4, i + 12),
|
||||
"SS", "SS",
|
||||
'S', quarkBlocks[i]);
|
||||
recipe18StoneChisel.add(BotaniaAPI.getLatestAddedRecipe());
|
||||
}
|
||||
}*/
|
||||
}
|
||||
|
||||
// Blaze Light Recipe
|
||||
|
||||
@@ -1,15 +1,8 @@
|
||||
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;
|
||||
|
||||
/**
|
||||
@@ -18,81 +11,8 @@ import vazkii.botania.common.item.ModItems;
|
||||
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));
|
||||
|
||||
// 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]));
|
||||
// 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]));
|
||||
// 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]));
|
||||
// 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]));
|
||||
// Granite chiseled brick - not in quark
|
||||
// Granite wall
|
||||
GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("stone_granite_wall")), new ItemStack(ModFluffBlocks.stoneWall, 1, FutureStoneVariant.GRANITE.ordinal()));
|
||||
}
|
||||
}
|
||||
|
||||
private static Block findQuarkBlock(String name) {
|
||||
return Block.REGISTRY.getObject(new ResourceLocation("Quark", name));
|
||||
}
|
||||
|
||||
private ModMigrationRecipes() {}
|
||||
|
||||
Reference in new issue
Block a user