Merge branch '1.9' into 1.9-BTM
This commit is contained in:
commit
9035f2a21c
15 changed files with 198 additions and 330 deletions
|
@ -95,7 +95,7 @@ public class BlockOre extends BaseBlock implements ITexturedBlock, IOreNameProvi
|
|||
int meta = getMetaFromState(state);
|
||||
Random random = new Random();
|
||||
// Ruby
|
||||
if (variant.equals("Ruby"))
|
||||
if (variant.equalsIgnoreCase("Ruby"))
|
||||
{
|
||||
OreDrop ruby = new OreDrop(ItemGems.getGemByName("ruby"),
|
||||
ConfigTechReborn.FortuneSecondaryOreMultiplierPerLevel);
|
||||
|
@ -105,7 +105,7 @@ public class BlockOre extends BaseBlock implements ITexturedBlock, IOreNameProvi
|
|||
}
|
||||
|
||||
// Sapphire
|
||||
if (variant.equals("Sapphire"))
|
||||
if (variant.equalsIgnoreCase("Sapphire"))
|
||||
{
|
||||
OreDrop sapphire = new OreDrop(ItemGems.getGemByName("sapphire"),
|
||||
ConfigTechReborn.FortuneSecondaryOreMultiplierPerLevel);
|
||||
|
@ -115,7 +115,7 @@ public class BlockOre extends BaseBlock implements ITexturedBlock, IOreNameProvi
|
|||
}
|
||||
|
||||
// Pyrite
|
||||
if (variant.equals("Pyrite"))
|
||||
if (variant.equalsIgnoreCase("Pyrite"))
|
||||
{
|
||||
OreDrop pyriteDust = new OreDrop(ItemDusts.getDustByName("pyrite"),
|
||||
ConfigTechReborn.FortuneSecondaryOreMultiplierPerLevel);
|
||||
|
@ -124,7 +124,7 @@ public class BlockOre extends BaseBlock implements ITexturedBlock, IOreNameProvi
|
|||
}
|
||||
|
||||
// Sodalite
|
||||
if (variant.equals("Sodalite"))
|
||||
if (variant.equalsIgnoreCase("Sodalite"))
|
||||
{
|
||||
OreDrop sodalite = new OreDrop(ItemDusts.getDustByName("sodalite", 6),
|
||||
ConfigTechReborn.FortuneSecondaryOreMultiplierPerLevel);
|
||||
|
@ -134,7 +134,7 @@ public class BlockOre extends BaseBlock implements ITexturedBlock, IOreNameProvi
|
|||
}
|
||||
|
||||
// Cinnabar
|
||||
if (variant.equals("Cinnabar"))
|
||||
if (variant.equalsIgnoreCase("Cinnabar"))
|
||||
{
|
||||
OreDrop cinnabar = new OreDrop(ItemDusts.getDustByName("cinnabar"),
|
||||
ConfigTechReborn.FortuneSecondaryOreMultiplierPerLevel);
|
||||
|
@ -144,7 +144,7 @@ public class BlockOre extends BaseBlock implements ITexturedBlock, IOreNameProvi
|
|||
}
|
||||
|
||||
// Sphalerite 1, 1/8 yellow garnet
|
||||
if (variant.equals("Sphalerite"))
|
||||
if (variant.equalsIgnoreCase("Sphalerite"))
|
||||
{
|
||||
OreDrop sphalerite = new OreDrop(ItemDusts.getDustByName("sphalerite"),
|
||||
ConfigTechReborn.FortuneSecondaryOreMultiplierPerLevel);
|
||||
|
|
|
@ -36,12 +36,11 @@ public class BlockPlayerDetector extends BlockMachineBase implements ITexturedBl
|
|||
|
||||
public BlockPlayerDetector()
|
||||
{
|
||||
super();
|
||||
super(true);
|
||||
setUnlocalizedName("techreborn.playerDetector");
|
||||
setCreativeTab(TechRebornCreativeTab.instance);
|
||||
setHardness(2f);
|
||||
this.setDefaultState(this.getDefaultState().withProperty(METADATA, 0).withProperty(FACING, EnumFacing.NORTH)
|
||||
.withProperty(ACTIVE, false));
|
||||
this.setDefaultState(this.getDefaultState().withProperty(METADATA, 0));
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@ -158,10 +157,8 @@ public class BlockPlayerDetector extends BlockMachineBase implements ITexturedBl
|
|||
|
||||
protected BlockStateContainer createBlockState()
|
||||
{
|
||||
FACING = PropertyDirection.create("facing", EnumFacing.Plane.HORIZONTAL);
|
||||
ACTIVE = PropertyBool.create("active");
|
||||
METADATA = PropertyInteger.create("type", 0, types.length - 1);
|
||||
return new BlockStateContainer(this, METADATA, FACING, ACTIVE);
|
||||
return new BlockStateContainer(this, METADATA);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
package techreborn.blocks.fluid;
|
||||
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraft.util.BlockRenderLayer;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.world.IBlockAccess;
|
||||
import net.minecraft.world.World;
|
||||
|
@ -14,7 +15,6 @@ public class BlockFluidBase extends BlockFluidClassic
|
|||
public BlockFluidBase(Fluid fluid, Material material)
|
||||
{
|
||||
super(fluid, material);
|
||||
RebornCore.jsonDestroyer.registerObject(this);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@ -32,5 +32,4 @@ public class BlockFluidBase extends BlockFluidClassic
|
|||
return false;
|
||||
return super.displaceIfPossible(world, pos);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -3,6 +3,8 @@ package techreborn.blocks.fluid;
|
|||
import me.modmuss50.jsonDestroyer.api.ITexturedFluid;
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraftforge.fluids.Fluid;
|
||||
import reborncore.RebornCore;
|
||||
import techreborn.Core;
|
||||
|
||||
public class BlockFluidTechReborn extends BlockFluidBase implements ITexturedFluid
|
||||
{
|
||||
|
@ -14,11 +16,7 @@ public class BlockFluidTechReborn extends BlockFluidBase implements ITexturedFlu
|
|||
super(fluid, material);
|
||||
setUnlocalizedName(name);
|
||||
this.name = name;
|
||||
Core.proxy.registerFluidBlockRendering(this, name);
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getTextureName()
|
||||
{
|
||||
return "techreborn:blocks/fluids/" + name.replaceAll("techreborn.", "") + "_flowing";
|
||||
}
|
||||
}
|
||||
|
|
|
@ -2,6 +2,9 @@ package techreborn.blocks.fluid;
|
|||
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
import net.minecraftforge.fluids.Fluid;
|
||||
import net.minecraftforge.fluids.FluidRegistry;
|
||||
import reborncore.common.util.Color;
|
||||
import techreborn.Core;
|
||||
|
||||
public class TechRebornFluid extends Fluid
|
||||
{
|
||||
|
@ -10,5 +13,6 @@ public class TechRebornFluid extends Fluid
|
|||
super(fluidName,
|
||||
new ResourceLocation("techreborn:blocks/fluids/" + fluidName.replaceFirst("fluid", "") + "_flowing"),
|
||||
new ResourceLocation("techreborn:blocks/fluids/" + fluidName.replaceFirst("fluid", "") + "_flowing"));
|
||||
FluidRegistry.addBucketForFluid(this);
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue