maciek/TechReborn
maciek/TechReborn
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rubber and recipe fixes

Browse source
This commit is contained in:
al132 2016-07-18 23:26:41 -05:00
parent 1fb668cad4
commit 7a6df30d10
5 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/main/java/techreborn/blocks/BlockRubberLeaves.java
View file

@ -7,6 +7,7 @@ import me.modmuss50.jsonDestroyer.api.IOpaqueBlock;
import me.modmuss50.jsonDestroyer.api.ITexturedBlock; import me.modmuss50.jsonDestroyer.api.ITexturedBlock;
import net.minecraft.block.BlockLeaves; import net.minecraft.block.BlockLeaves;
import net.minecraft.block.BlockPlanks; import net.minecraft.block.BlockPlanks;
import net.minecraft.block.material.Material;
import net.minecraft.block.properties.IProperty; import net.minecraft.block.properties.IProperty;
import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.BlockStateContainer;
import net.minecraft.block.state.IBlockState; import net.minecraft.block.state.IBlockState;
@ -31,12 +32,12 @@ public class BlockRubberLeaves extends BlockLeaves implements ITexturedBlock, IO
public BlockRubberLeaves() public BlockRubberLeaves()
{ {
super();
setUnlocalizedName("techreborn.rubberleaves"); setUnlocalizedName("techreborn.rubberleaves");
setCreativeTab(TechRebornCreativeTabMisc.instance); setCreativeTab(TechRebornCreativeTabMisc.instance);
RebornCore.jsonDestroyer.registerObject(this); RebornCore.jsonDestroyer.registerObject(this);
this.setDefaultState(this.getDefaultState().withProperty(CHECK_DECAY, true) this.setDefaultState(this.getDefaultState().withProperty(CHECK_DECAY, true)
.withProperty(DECAYABLE, true)); .withProperty(DECAYABLE, true));
Blocks.FIRE.setFireInfo(this, 30, 60);
} }
@Override @Override

4
src/main/java/techreborn/blocks/BlockRubberLog.java
View file

@ -14,6 +14,7 @@ import net.minecraft.block.state.BlockStateContainer;
import net.minecraft.block.state.IBlockState; import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.item.EntityItem;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Blocks;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumFacing;
import net.minecraft.util.EnumHand; import net.minecraft.util.EnumHand;
@ -47,6 +48,7 @@ public class BlockRubberLog extends Block implements ITexturedBlock
this.getDefaultState().withProperty(SAP_SIDE, EnumFacing.NORTH).withProperty(HAS_SAP, false)); this.getDefaultState().withProperty(SAP_SIDE, EnumFacing.NORTH).withProperty(HAS_SAP, false));
this.setTickRandomly(true); this.setTickRandomly(true);
this.setSoundType(SoundType.WOOD); this.setSoundType(SoundType.WOOD);
Blocks.FIRE.setFireInfo(this, 5, 5);
} }
protected BlockStateContainer createBlockState() protected BlockStateContainer createBlockState()
@ -89,7 +91,7 @@ public class BlockRubberLog extends Block implements ITexturedBlock
} }
if (state.getValue(HAS_SAP)) if (state.getValue(HAS_SAP))
{ {
tempMeta += 3; tempMeta += 4;
} }
return tempMeta; return tempMeta;
} }

2
src/main/java/techreborn/blocks/BlockRubberPlank.java
View file

@ -5,6 +5,7 @@ import net.minecraft.block.Block;
import net.minecraft.block.SoundType; import net.minecraft.block.SoundType;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import net.minecraft.block.state.IBlockState; import net.minecraft.block.state.IBlockState;
import net.minecraft.init.Blocks;
import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumFacing;
import reborncore.RebornCore; import reborncore.RebornCore;
import techreborn.client.TechRebornCreativeTabMisc; import techreborn.client.TechRebornCreativeTabMisc;
@ -23,6 +24,7 @@ public class BlockRubberPlank extends Block implements ITexturedBlock
setCreativeTab(TechRebornCreativeTabMisc.instance); setCreativeTab(TechRebornCreativeTabMisc.instance);
this.setHardness(2.0F); this.setHardness(2.0F);
this.setSoundType(SoundType.WOOD); this.setSoundType(SoundType.WOOD);
Blocks.FIRE.setFireInfo(this, 5, 20);
} }
@Override @Override

2
src/main/java/techreborn/client/container/ContainerExtractor.java
View file

@ -75,7 +75,7 @@ public class ContainerExtractor extends ContainerCrafting implements IContainerL
this.player = player; this.player = player;
} }
@Nullable
@Override @Override
public EntityPlayer getPlayer() { public EntityPlayer getPlayer() {
return player; return player;

8
src/main/java/techreborn/init/ModRecipes.java
View file

@ -430,6 +430,8 @@ public class ModRecipes
new GrinderRecipe(new ItemStack(Blocks.COBBLESTONE), new ItemStack(Blocks.SAND), ticktime, eutick)); new GrinderRecipe(new ItemStack(Blocks.COBBLESTONE), new ItemStack(Blocks.SAND), ticktime, eutick));
RecipeHandler.addRecipe( RecipeHandler.addRecipe(
new GrinderRecipe(new ItemStack(Blocks.GRAVEL), new ItemStack(Items.FLINT), ticktime, eutick)); new GrinderRecipe(new ItemStack(Blocks.GRAVEL), new ItemStack(Items.FLINT), ticktime, eutick));
RecipeHandler.addRecipe(
new GrinderRecipe(new ItemStack(Blocks.NETHERRACK), ItemDusts.getDustByName("netherrack"), ticktime, eutick));
// TechReborn // TechReborn
RecipeHandler.addRecipe( RecipeHandler.addRecipe(
@ -3412,9 +3414,9 @@ public class ModRecipes
ItemDusts.getDustByName("chrome", 2), ItemCells.getCellByName("silicon", 3), ItemDusts.getDustByName("chrome", 2), ItemCells.getCellByName("silicon", 3),
ItemCells.getCellByName("empty", 6), 480, 120)); ItemCells.getCellByName("empty", 6), 480, 120));
RecipeHandler.addRecipe(new IndustrialElectrolyzerRecipe(ItemCells.getCellByName("empty", 6), null, // RecipeHandler.addRecipe(new IndustrialElectrolyzerRecipe(ItemCells.getCellByName("empty", 6), null,
ItemCells.getCellByName("hydrogen", 4), ItemCells.getCellByName("empty", 5), // ItemCells.getCellByName("hydrogen", 4), ItemCells.getCellByName("empty", 5),
ItemCells.getCellByName("empty", 1), null, 100, 30)); // ItemCells.getCellByName("empty", 1), null, 100, 30));
RecipeHandler.addRecipe(new IndustrialElectrolyzerRecipe(ItemDusts.getDustByName("darkAshes"), RecipeHandler.addRecipe(new IndustrialElectrolyzerRecipe(ItemDusts.getDustByName("darkAshes"),
ItemCells.getCellByName("empty", 2), ItemCells.getCellByName("carbon", 2), null, null, null, 20, 30)); ItemCells.getCellByName("empty", 2), ItemCells.getCellByName("carbon", 2), null, null, null, 20, 30));