New ore textures

This commit is contained in:
ProfessorProspector 2018-06-14 19:17:53 -07:00
parent 9ed05fb7ff
commit 603e346c0f
22 changed files with 61 additions and 67 deletions

View file

@ -48,9 +48,9 @@ import prospector.shootingstar.model.ModelCompound;
import reborncore.api.ToolManager; import reborncore.api.ToolManager;
import reborncore.common.BaseTileBlock; import reborncore.common.BaseTileBlock;
import reborncore.common.items.WrenchHelper; import reborncore.common.items.WrenchHelper;
import techreborn.client.TechRebornCreativeTab;
import techreborn.lib.ModInfo; import techreborn.lib.ModInfo;
import techreborn.tiles.TileAlarm; import techreborn.tiles.TileAlarm;
import techreborn.utils.TechRebornCreativeTab;
import javax.annotation.Nullable; import javax.annotation.Nullable;
import java.util.List; import java.util.List;
@ -58,6 +58,16 @@ import java.util.List;
public class BlockAlarm extends BaseTileBlock { public class BlockAlarm extends BaseTileBlock {
public static PropertyDirection FACING; public static PropertyDirection FACING;
public static PropertyBool ACTIVE; public static PropertyBool ACTIVE;
private AxisAlignedBB[] bbs;
public BlockAlarm() {
super(Material.ROCK);
setUnlocalizedName("techreborn.alarm");
this.setDefaultState(this.blockState.getBaseState().withProperty(FACING, EnumFacing.NORTH).withProperty(ACTIVE, false));
this.bbs = GenBoundingBoxes(0.19, 0.81);
setCreativeTab(TechRebornCreativeTab.instance);
ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/lighting"));
}
private static AxisAlignedBB[] GenBoundingBoxes(double depth, double width) { private static AxisAlignedBB[] GenBoundingBoxes(double depth, double width) {
AxisAlignedBB[] dimm = { AxisAlignedBB[] dimm = {
@ -71,15 +81,22 @@ public class BlockAlarm extends BaseTileBlock {
return dimm; return dimm;
} }
private AxisAlignedBB[] bbs; public static boolean isActive(IBlockState state) {
return state.getValue(ACTIVE);
}
public BlockAlarm() { public static EnumFacing getFacing(IBlockState state) {
super(Material.ROCK); return (EnumFacing) state.getValue(FACING);
setUnlocalizedName("techreborn.alarm"); }
this.setDefaultState(this.blockState.getBaseState().withProperty(FACING, EnumFacing.NORTH).withProperty(ACTIVE, false));
this.bbs = GenBoundingBoxes(0.19, 0.81); public static void setFacing(EnumFacing facing, World world, BlockPos pos) {
setCreativeTab(TechRebornCreativeTab.instance); world.setBlockState(pos, world.getBlockState(pos).withProperty(FACING, facing));
ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/lighting")); }
public static void setActive(boolean active, World world, BlockPos pos) {
EnumFacing facing = world.getBlockState(pos).getValue(FACING);
IBlockState state = world.getBlockState(pos).withProperty(ACTIVE, active).withProperty(FACING, facing);
world.setBlockState(pos, state, 3);
} }
@Override @Override
@ -91,7 +108,7 @@ public class BlockAlarm extends BaseTileBlock {
@Override @Override
public boolean onBlockActivated(World worldIn, BlockPos pos, IBlockState state, EntityPlayer playerIn, public boolean onBlockActivated(World worldIn, BlockPos pos, IBlockState state, EntityPlayer playerIn,
EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ) { EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ) {
ItemStack stack = playerIn.getHeldItem(EnumHand.MAIN_HAND); ItemStack stack = playerIn.getHeldItem(EnumHand.MAIN_HAND);
TileEntity tileEntity = worldIn.getTileEntity(pos); TileEntity tileEntity = worldIn.getTileEntity(pos);
@ -129,24 +146,6 @@ public class BlockAlarm extends BaseTileBlock {
return this.getDefaultState().withProperty(FACING, facing).withProperty(ACTIVE, active); return this.getDefaultState().withProperty(FACING, facing).withProperty(ACTIVE, active);
} }
public static boolean isActive(IBlockState state) {
return state.getValue(ACTIVE);
}
public static EnumFacing getFacing(IBlockState state) {
return (EnumFacing) state.getValue(FACING);
}
public static void setFacing(EnumFacing facing, World world, BlockPos pos) {
world.setBlockState(pos, world.getBlockState(pos).withProperty(FACING, facing));
}
public static void setActive(boolean active, World world, BlockPos pos) {
EnumFacing facing = world.getBlockState(pos).getValue(FACING);
IBlockState state = world.getBlockState(pos).withProperty(ACTIVE, active).withProperty(FACING, facing);
world.setBlockState(pos, state, 3);
}
@Nullable @Nullable
@Override @Override
public TileEntity createNewTileEntity(World worldIn, int meta) { public TileEntity createNewTileEntity(World worldIn, int meta) {
@ -183,7 +182,7 @@ public class BlockAlarm extends BaseTileBlock {
public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess source, BlockPos pos) { public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess source, BlockPos pos) {
return this.bbs[getFacing(state).getIndex()]; return this.bbs[getFacing(state).getIndex()];
} }
@Override @Override
public void addInformation(final ItemStack stack, final World world, final List<String> tooltip, ITooltipFlag flag) { public void addInformation(final ItemStack stack, final World world, final List<String> tooltip, ITooltipFlag flag) {
tooltip.add(TextFormatting.GRAY + I18n.format("techreborn.tooltip.alarm")); tooltip.add(TextFormatting.GRAY + I18n.format("techreborn.tooltip.alarm"));

View file

@ -24,8 +24,6 @@
package techreborn.blocks.generator; package techreborn.blocks.generator;
import java.util.List;
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.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
@ -44,10 +42,12 @@ import reborncore.common.BaseTileBlock;
import reborncore.common.RebornCoreConfig; import reborncore.common.RebornCoreConfig;
import reborncore.common.blocks.BlockWrenchEventHandler; import reborncore.common.blocks.BlockWrenchEventHandler;
import reborncore.common.items.WrenchHelper; import reborncore.common.items.WrenchHelper;
import techreborn.client.TechRebornCreativeTab;
import techreborn.init.ModBlocks; import techreborn.init.ModBlocks;
import techreborn.lib.ModInfo; import techreborn.lib.ModInfo;
import techreborn.tiles.generator.TileCreativeSolarPanel; import techreborn.tiles.generator.TileCreativeSolarPanel;
import techreborn.utils.TechRebornCreativeTab;
import java.util.List;
/** /**
* Created by modmuss50 on 25/02/2016. * Created by modmuss50 on 25/02/2016.
@ -61,7 +61,7 @@ public class BlockCreativeSolarPanel extends BaseTileBlock {
ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/generators")); ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/generators"));
BlockWrenchEventHandler.wrenableBlocks.add(this); BlockWrenchEventHandler.wrenableBlocks.add(this);
} }
@Override @Override
public boolean onBlockActivated(World worldIn, BlockPos pos, IBlockState state, EntityPlayer playerIn, EnumHand hand, public boolean onBlockActivated(World worldIn, BlockPos pos, IBlockState state, EntityPlayer playerIn, EnumHand hand,
EnumFacing side, float hitX, float hitY, float hitZ) { EnumFacing side, float hitX, float hitY, float hitZ) {
@ -72,7 +72,7 @@ public class BlockCreativeSolarPanel extends BaseTileBlock {
if (tileEntity == null) { if (tileEntity == null) {
return false; return false;
} }
if (!stack.isEmpty() && ToolManager.INSTANCE.canHandleTool(stack)) { if (!stack.isEmpty() && ToolManager.INSTANCE.canHandleTool(stack)) {
if (WrenchHelper.handleWrench(stack, worldIn, pos, playerIn, side)) { if (WrenchHelper.handleWrench(stack, worldIn, pos, playerIn, side)) {
return true; return true;
@ -81,18 +81,17 @@ public class BlockCreativeSolarPanel extends BaseTileBlock {
return super.onBlockActivated(worldIn, pos, state, playerIn, hand, side, hitX, hitY, hitZ); return super.onBlockActivated(worldIn, pos, state, playerIn, hand, side, hitX, hitY, hitZ);
} }
@Override @Override
public List<ItemStack> getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune) { public List<ItemStack> getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune) {
NonNullList<ItemStack> items = NonNullList.create(); NonNullList<ItemStack> items = NonNullList.create();
if (RebornCoreConfig.wrenchRequired){ if (RebornCoreConfig.wrenchRequired) {
items.add(new ItemStack(ModBlocks.MACHINE_FRAMES, 1, 1)); items.add(new ItemStack(ModBlocks.MACHINE_FRAMES, 1, 1));
} } else {
else {
super.getDrops(items, world, pos, state, fortune); super.getDrops(items, world, pos, state, fortune);
} }
return items; return items;
} }

View file

@ -30,9 +30,9 @@ import prospector.shootingstar.ShootingStar;
import prospector.shootingstar.model.ModelCompound; import prospector.shootingstar.model.ModelCompound;
import reborncore.api.tile.IMachineGuiHandler; import reborncore.api.tile.IMachineGuiHandler;
import reborncore.common.blocks.BlockMachineBase; import reborncore.common.blocks.BlockMachineBase;
import techreborn.client.TechRebornCreativeTab;
import techreborn.lib.ModInfo; import techreborn.lib.ModInfo;
import techreborn.tiles.generator.TileWaterMill; import techreborn.tiles.generator.TileWaterMill;
import techreborn.utils.TechRebornCreativeTab;
/** /**
* Created by modmuss50 on 25/02/2016. * Created by modmuss50 on 25/02/2016.

View file

@ -26,7 +26,6 @@ package techreborn.blocks.storage;
import com.google.common.base.Predicate; import com.google.common.base.Predicate;
import com.google.common.collect.Iterators; import com.google.common.collect.Iterators;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import net.minecraft.block.properties.PropertyDirection; import net.minecraft.block.properties.PropertyDirection;
@ -47,8 +46,8 @@ import reborncore.common.BaseTileBlock;
import reborncore.common.blocks.BlockWrenchEventHandler; import reborncore.common.blocks.BlockWrenchEventHandler;
import reborncore.common.items.WrenchHelper; import reborncore.common.items.WrenchHelper;
import techreborn.Core; import techreborn.Core;
import techreborn.client.TechRebornCreativeTab;
import techreborn.lib.ModInfo; import techreborn.lib.ModInfo;
import techreborn.utils.TechRebornCreativeTab;
import java.util.Iterator; import java.util.Iterator;
import java.util.Random; import java.util.Random;
@ -135,7 +134,7 @@ public abstract class BlockEnergyStorage extends BaseTileBlock {
} }
return fullName.toLowerCase(); return fullName.toLowerCase();
} }
// Block // Block
@Override @Override
public boolean rotateBlock(World world, BlockPos pos, EnumFacing side) { public boolean rotateBlock(World world, BlockPos pos, EnumFacing side) {
@ -165,21 +164,21 @@ public abstract class BlockEnergyStorage extends BaseTileBlock {
if (tileEntity == null) { if (tileEntity == null) {
return false; return false;
} }
if (!stack.isEmpty() && ToolManager.INSTANCE.canHandleTool(stack)) { if (!stack.isEmpty() && ToolManager.INSTANCE.canHandleTool(stack)) {
if (WrenchHelper.handleWrench(stack, worldIn, pos, playerIn, side)) { if (WrenchHelper.handleWrench(stack, worldIn, pos, playerIn, side)) {
return true; return true;
} }
} }
if (!playerIn.isSneaking()) { if (!playerIn.isSneaking()) {
playerIn.openGui(Core.INSTANCE, guiID, worldIn, pos.getX(), pos.getY(), pos.getZ()); playerIn.openGui(Core.INSTANCE, guiID, worldIn, pos.getX(), pos.getY(), pos.getZ());
return true; return true;
} }
return super.onBlockActivated(worldIn, pos, state, playerIn, hand, side, hitX, hitY, hitZ); return super.onBlockActivated(worldIn, pos, state, playerIn, hand, side, hitX, hitY, hitZ);
} }
@Override @Override
protected BlockStateContainer createBlockState() { protected BlockStateContainer createBlockState() {
FACING = PropertyDirection.create("facing", Facings.ALL); FACING = PropertyDirection.create("facing", Facings.ALL);

View file

@ -24,8 +24,6 @@
package techreborn.blocks.storage; package techreborn.blocks.storage;
import java.util.List;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import net.minecraft.block.state.IBlockState; import net.minecraft.block.state.IBlockState;
@ -45,13 +43,15 @@ import reborncore.api.ToolManager;
import reborncore.common.BaseTileBlock; import reborncore.common.BaseTileBlock;
import reborncore.common.RebornCoreConfig; import reborncore.common.RebornCoreConfig;
import reborncore.common.items.WrenchHelper; import reborncore.common.items.WrenchHelper;
import techreborn.client.TechRebornCreativeTab;
import techreborn.init.ModBlocks; import techreborn.init.ModBlocks;
import techreborn.lib.ModInfo; import techreborn.lib.ModInfo;
import techreborn.tiles.lesu.TileLSUStorage; import techreborn.tiles.lesu.TileLSUStorage;
import techreborn.utils.TechRebornCreativeTab;
import java.util.List;
/** /**
* Energy storage block for LESU * Energy storage block for LESU
*/ */
public class BlockLSUStorage extends BaseTileBlock { public class BlockLSUStorage extends BaseTileBlock {
@ -60,7 +60,7 @@ public class BlockLSUStorage extends BaseTileBlock {
setCreativeTab(TechRebornCreativeTab.instance); setCreativeTab(TechRebornCreativeTab.instance);
ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/energy")); ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/energy"));
} }
// BaseTileBlock // BaseTileBlock
@Override @Override
public void breakBlock(World world, BlockPos pos, IBlockState state) { public void breakBlock(World world, BlockPos pos, IBlockState state) {
@ -72,12 +72,12 @@ public class BlockLSUStorage extends BaseTileBlock {
} }
super.breakBlock(world, pos, state); super.breakBlock(world, pos, state);
} }
@Override @Override
public TileEntity createNewTileEntity(final World world, final int meta) { public TileEntity createNewTileEntity(final World world, final int meta) {
return new TileLSUStorage(); return new TileLSUStorage();
} }
// Block // Block
@Override @Override
public void onBlockPlacedBy(World world, BlockPos pos, IBlockState state, EntityLivingBase player, ItemStack itemstack) { public void onBlockPlacedBy(World world, BlockPos pos, IBlockState state, EntityLivingBase player, ItemStack itemstack) {
@ -100,7 +100,7 @@ public class BlockLSUStorage extends BaseTileBlock {
if (tileEntity == null) { if (tileEntity == null) {
return false; return false;
} }
if (!stack.isEmpty() && ToolManager.INSTANCE.canHandleTool(stack)) { if (!stack.isEmpty() && ToolManager.INSTANCE.canHandleTool(stack)) {
if (WrenchHelper.handleWrench(stack, worldIn, pos, playerIn, side)) { if (WrenchHelper.handleWrench(stack, worldIn, pos, playerIn, side)) {
return true; return true;
@ -109,24 +109,22 @@ public class BlockLSUStorage extends BaseTileBlock {
return super.onBlockActivated(worldIn, pos, state, playerIn, hand, side, hitX, hitY, hitZ); return super.onBlockActivated(worldIn, pos, state, playerIn, hand, side, hitX, hitY, hitZ);
} }
@Override @Override
public List<ItemStack> getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune) { public List<ItemStack> getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune) {
NonNullList<ItemStack> items = NonNullList.create(); NonNullList<ItemStack> items = NonNullList.create();
if (RebornCoreConfig.wrenchRequired){ if (RebornCoreConfig.wrenchRequired) {
items.add(new ItemStack(ModBlocks.MACHINE_FRAMES, 1, 0)); items.add(new ItemStack(ModBlocks.MACHINE_FRAMES, 1, 0));
} } else {
else {
super.getDrops(items, world, pos, state, fortune); super.getDrops(items, world, pos, state, fortune);
} }
return items; return items;
} }
@Override @Override
public boolean canBeConnectedTo(IBlockAccess world, BlockPos pos, EnumFacing facing) public boolean canBeConnectedTo(IBlockAccess world, BlockPos pos, EnumFacing facing) {
{
Block block = world.getBlockState(pos).getBlock(); Block block = world.getBlockState(pos).getBlock();
return this == block; return this == block;
} }

View file

@ -26,7 +26,6 @@ package techreborn.blocks.transformers;
import com.google.common.base.Predicate; import com.google.common.base.Predicate;
import com.google.common.collect.Iterators; import com.google.common.collect.Iterators;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import net.minecraft.block.properties.PropertyDirection; import net.minecraft.block.properties.PropertyDirection;
@ -46,8 +45,8 @@ import reborncore.api.ToolManager;
import reborncore.common.BaseTileBlock; import reborncore.common.BaseTileBlock;
import reborncore.common.blocks.BlockWrenchEventHandler; import reborncore.common.blocks.BlockWrenchEventHandler;
import reborncore.common.items.WrenchHelper; import reborncore.common.items.WrenchHelper;
import techreborn.client.TechRebornCreativeTab;
import techreborn.lib.ModInfo; import techreborn.lib.ModInfo;
import techreborn.utils.TechRebornCreativeTab;
import java.util.Iterator; import java.util.Iterator;
import java.util.Random; import java.util.Random;

Binary file not shown.

Before

(image error) Size: 323 B

After

(image error) Size: 462 B

Binary file not shown.

Before

(image error) Size: 633 B

After

(image error) Size: 823 B

Binary file not shown.

Before

(image error) Size: 320 B

After

(image error) Size: 715 B

Binary file not shown.

Before

(image error) Size: 385 B

After

(image error) Size: 377 B

Binary file not shown.

Before

(image error) Size: 675 B

After

(image error) Size: 841 B

Binary file not shown.

Before

(image error) Size: 296 B

After

(image error) Size: 416 B

Binary file not shown.

Before

(image error) Size: 296 B

After

(image error) Size: 360 B

Binary file not shown.

Before

(image error) Size: 317 B

After

(image error) Size: 664 B

Binary file not shown.

Before

(image error) Size: 394 B

After

(image error) Size: 381 B

Binary file not shown.

Before

(image error) Size: 307 B

After

(image error) Size: 656 B

Binary file not shown.

Before

(image error) Size: 390 B

After

(image error) Size: 452 B

Binary file not shown.

Before

(image error) Size: 636 B

After

(image error) Size: 837 B

Binary file not shown.

Before

(image error) Size: 315 B

After

(image error) Size: 684 B

Binary file not shown.

Before

(image error) Size: 444 B

After

(image error) Size: 460 B

Binary file not shown.

Before

(image error) Size: 199 KiB

After

(image error) Size: 38 KiB

View file

@ -1,6 +1,6 @@
{ {
"pack":{ "pack":{
"pack_format":3, "pack_format":3,
"description":"TechReborn Resources" "description":"Tech Reborn Resources"
} }
} }