projects/mmm
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

A few server mode fixes

Browse source
This commit is contained in:
Emmanuel BENOîT 2016-07-03 12:54:02 +02:00
parent 5033217643
commit 6b7e5c6e28
3 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/java/mmm/tech/base/alloy_furnace/AlloyFurnace.java
View file

@ -4,6 +4,7 @@ package mmm.tech.base.alloy_furnace;
import mmm.utils.UNetwork; import mmm.utils.UNetwork;
import mmm.utils.URegistry; import mmm.utils.URegistry;
import mmm.utils.gui.GUIUtils; import mmm.utils.gui.GUIUtils;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.Item; import net.minecraft.item.Item;
import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemBlock;
import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.fml.common.registry.GameRegistry;
@ -14,6 +15,8 @@ public enum AlloyFurnace {
INSTANCE; INSTANCE;
public final CreativeTabs CREATIVE_TAB = CreativeTabs.DECORATIONS;
public final TBAFBlock INACTIVE; public final TBAFBlock INACTIVE;
public final TBAFBlock ACTIVE; public final TBAFBlock ACTIVE;
public final Item ITEM; public final Item ITEM;
@ -22,11 +25,14 @@ public enum AlloyFurnace {
private AlloyFurnace( ) private AlloyFurnace( )
{ {
this.INACTIVE = new TBAFBlock( false ); this.INACTIVE = new TBAFBlock( false );
this.INACTIVE.setCreativeTab( this.CREATIVE_TAB );
this.ACTIVE = new TBAFBlock( true ); this.ACTIVE = new TBAFBlock( true );
this.ACTIVE.setCreativeTab( this.CREATIVE_TAB );
this.ITEM = new ItemBlock( this.INACTIVE )// this.ITEM = new ItemBlock( this.INACTIVE )//
.setMaxStackSize( 16 )// .setMaxStackSize( 16 )//
.setCreativeTab( this.INACTIVE.getCreativeTabToDisplayOn( ) ); .setCreativeTab( this.CREATIVE_TAB );
URegistry.setIdentifiers( this.ITEM , "tech" , "base" , "alloy_furnace" ); URegistry.setIdentifiers( this.ITEM , "tech" , "base" , "alloy_furnace" );
URegistry.addBlock( this.INACTIVE , this.ITEM ); URegistry.addBlock( this.INACTIVE , this.ITEM );

3
src/java/mmm/tech/base/alloy_furnace/TBAFBlock.java
View file

@ -20,7 +20,6 @@ import net.minecraft.block.properties.PropertyBool;
import net.minecraft.block.properties.PropertyDirection; import net.minecraft.block.properties.PropertyDirection;
import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.BlockStateContainer;
import net.minecraft.block.state.IBlockState; import net.minecraft.block.state.IBlockState;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.Entity; import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
@ -68,8 +67,6 @@ public class TBAFBlock
super( Material.ROCK ); super( Material.ROCK );
this.active = active; this.active = active;
this.setCreativeTab( CreativeTabs.DECORATIONS );
this.setResistance( 17.5f ); this.setResistance( 17.5f );
this.setHardness( 3.5f ); this.setHardness( 3.5f );
this.setHarvestLevel( "pickaxe" , 0 ); this.setHarvestLevel( "pickaxe" , 0 );

2
src/java/mmm/tech/tools/TTArmor.java
View file

@ -28,7 +28,7 @@ public class TTArmor
{ {
String l0 , l1 , l2; String l0 , l1 , l2;
switch ( this.getEquipmentSlot( ) ) { switch ( this.armorType ) {
case CHEST: case CHEST:
l0 = "I I"; l0 = "I I";