Flora based extractor recipes

This commit is contained in:
drcrazy 2019-02-21 12:23:07 +03:00
parent 398cb9617d
commit 860068b27a
13 changed files with 40 additions and 74 deletions

View file

@ -24,6 +24,8 @@
package techreborn.blocks;
import net.minecraft.block.Block;
import net.minecraft.block.SoundType;
import net.minecraft.block.material.Material;
import net.minecraft.state.BooleanProperty;
import net.minecraft.state.DirectionProperty;
@ -63,7 +65,7 @@ public class BlockAlarm extends BaseTileBlock {
private AxisAlignedBB[] bbs;
public BlockAlarm() {
super(Material.ROCK);
super(Block.Properties.create(Material.ROCK));
this.setDefaultState(this.blockState.getBaseState().with(FACING, EnumFacing.NORTH).with(ACTIVE, false));
this.bbs = GenBoundingBoxes(0.19, 0.81);
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/lighting"));

View file

@ -25,11 +25,11 @@
package techreborn.blocks;
import net.minecraft.block.Block;
import net.minecraft.block.SoundType;
import net.minecraft.block.material.Material;
import net.minecraft.block.state.IBlockState;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.IBlockReader;
import net.minecraft.world.World;
import reborncore.common.multiblock.BlockMultiblockBase;
import techreborn.tiles.TileMachineCasing;
@ -38,9 +38,8 @@ public class BlockMachineCasing extends BlockMultiblockBase {
public final int heatCapacity;
public BlockMachineCasing(int heatCapacity) {
super(Material.IRON);
super(Block.Properties.create(Material.IRON).hardnessAndResistance(2f).sound(SoundType.METAL));
this.heatCapacity = heatCapacity;
setHardness(2F);
}
public static int getHeatFromState(IBlockState state) {

View file

@ -24,13 +24,14 @@
package techreborn.blocks;
import net.minecraft.block.Block;
import net.minecraft.block.SoundType;
import net.minecraft.block.material.Material;
import reborncore.common.BaseBlock;
public class BlockMachineFrame extends BaseBlock {
public BlockMachineFrame() {
super(Material.IRON);
setHardness(1f);
super(Block.Properties.create(Material.IRON).hardnessAndResistance(1f).sound(SoundType.METAL));
}
}

View file

@ -25,6 +25,7 @@
package techreborn.blocks;
import net.minecraft.block.Block;
import net.minecraft.block.SoundType;
import net.minecraft.block.material.Material;
import net.minecraft.block.state.IBlockState;
import net.minecraft.item.ItemStack;
@ -67,10 +68,7 @@ public class BlockOre extends Block {
public static int sphaleriteMaxQuantity = 2;
public BlockOre() {
super(Block.Builder
.create(Material.ROCK)
.hardnessAndResistance(2F)
);
super(Block.Properties.create(Material.ROCK).hardnessAndResistance(2f));
}
@Override

View file

@ -24,13 +24,11 @@
package techreborn.blocks;
import net.minecraft.block.Block;
import net.minecraft.block.BlockGlass;
import net.minecraft.block.SoundType;
import net.minecraft.block.material.Material;
import net.minecraft.block.state.IBlockState;
import net.minecraft.util.BlockRenderLayer;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
import reborncore.client.models.ModelCompound;
import reborncore.client.models.RebornModelRegistry;
import techreborn.TechReborn;
@ -39,30 +37,12 @@ import java.util.Random;
public class BlockReinforcedGlass extends BlockGlass {
public BlockReinforcedGlass() {
super(Material.GLASS, false);
setSoundType(SoundType.STONE);
setHardness(4.0F);
setResistance(60F);
super(Block.Properties.create(Material.GLASS).hardnessAndResistance(4f, 60f).sound(SoundType.STONE));
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this));
}
@Override
public int quantityDropped(Random random) {
public int quantityDropped(IBlockState state, Random random) {
return 1;
}
@Override
public boolean isOpaqueCube(IBlockState state) {
return false;
}
@Override
@OnlyIn(Dist.CLIENT)
public BlockRenderLayer getRenderLayer() {
return BlockRenderLayer.CUTOUT;
}
public boolean isFullCube() {
return false;
}
}

View file

@ -25,6 +25,7 @@
package techreborn.blocks;
import net.minecraft.block.Block;
import net.minecraft.block.BlockFire;
import net.minecraft.block.SoundType;
import net.minecraft.block.material.Material;
import net.minecraft.init.Blocks;
@ -38,10 +39,8 @@ import techreborn.TechReborn;
public class BlockRubberPlank extends Block {
public BlockRubberPlank() {
super(Material.WOOD);
this.setHardness(2.0F);
this.setSoundType(SoundType.WOOD);
Blocks.FIRE.setFireInfo(this, 5, 20);
super(Block.Properties.create(Material.WOOD).hardnessAndResistance(2f).sound(SoundType.WOOD));
((BlockFire) Blocks.FIRE).setFireInfo(this, 5, 20);
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this));
}
}

View file

@ -24,6 +24,7 @@
package techreborn.blocks;
import net.minecraft.block.Block;
import net.minecraft.block.SoundType;
import net.minecraft.block.material.Material;
import reborncore.common.BaseBlock;
@ -31,9 +32,7 @@ import reborncore.common.BaseBlock;
public class BlockStorage extends BaseBlock {
public BlockStorage() {
super(Material.IRON);
setHardness(2f);
setSoundType(SoundType.METAL);
super(Block.Properties.create(Material.IRON).hardnessAndResistance(2f).sound(SoundType.METAL));
}
// public static ItemStack getStorageBlockByName(String name, int count) {

View file

@ -24,6 +24,7 @@
package techreborn.blocks.cable;
import net.minecraft.block.Block;
import net.minecraft.block.BlockContainer;
import net.minecraft.block.material.Material;
import net.minecraft.block.properties.IProperty;
@ -82,10 +83,8 @@ public class BlockCable extends BlockContainer {
public final TRContent.Cables type;
public BlockCable(TRContent.Cables type) {
super(Material.ROCK);
super(Block.Properties.create(Material.ROCK).hardnessAndResistance(1f, 8f));
this.type = type;
setHardness(1F);
setResistance(8F);
setDefaultState(getDefaultState().with(EAST, false).with(WEST, false).with(NORTH, false).with(SOUTH, false).with(UP, false).with(DOWN, false));
BlockWrenchEventHandler.wrenableBlocks.add(this);
}

View file

@ -53,9 +53,7 @@ import java.util.List;
public class BlockFusionCoil extends Block {
public BlockFusionCoil() {
super(Material.IRON);
setHardness(2f);
setSoundType(SoundType.METAL);
super(Block.Properties.create(Material.IRON).hardnessAndResistance(2f).sound(SoundType.METAL));
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/generators"));
}

View file

@ -27,6 +27,7 @@ package techreborn.blocks.storage;
import com.google.common.base.Predicate;
import com.google.common.collect.Iterators;
import net.minecraft.block.Block;
import net.minecraft.block.SoundType;
import net.minecraft.block.material.Material;
import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.EntityLivingBase;
@ -57,8 +58,7 @@ public abstract class BlockEnergyStorage extends BaseTileBlock {
public int guiID;
public BlockEnergyStorage(String name, int guiID) {
super(Material.IRON);
setHardness(2f);
super(Block.Properties.create(Material.IRON).hardnessAndResistance(2f));
this.setDefaultState(this.blockState.getBaseState().with(FACING, EnumFacing.NORTH));
this.name = name;
this.guiID = guiID;

View file

@ -70,7 +70,7 @@ public class BlockPlayerDetector extends BlockMachineBase {
public PropertyString TYPE;
public BlockPlayerDetector() {
super(true);
super();
this.setDefaultState(this.getStateFromMeta(0));
for (int i = 0; i < types.length; i++) {
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, i, "machines/tier1_machines").setInvVariant("type=" + types[i]));

View file

@ -27,6 +27,7 @@ package techreborn.blocks.transformers;
import com.google.common.base.Predicate;
import com.google.common.collect.Iterators;
import net.minecraft.block.Block;
import net.minecraft.block.SoundType;
import net.minecraft.block.material.Material;
import net.minecraft.state.DirectionProperty;
import net.minecraft.block.state.BlockStateContainer;
@ -57,8 +58,7 @@ public abstract class BlockTransformer extends BaseTileBlock {
public String name;
public BlockTransformer(String name) {
super(Material.IRON);
setHardness(2f);
super(Block.Properties.create(Material.IRON).hardnessAndResistance(2f));
this.setDefaultState(this.blockState.getBaseState().with(FACING, EnumFacing.NORTH));
this.name = name;
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/energy"));