Merge remote-tracking branch 'remotes/origin/1.8.9' into 1.9
This commit is contained in:
commit
e0547cecff
311 changed files with 1025 additions and 361 deletions
|
@ -11,11 +11,9 @@ import techreborn.client.GuiHandler;
|
|||
import techreborn.client.TechRebornCreativeTab;
|
||||
import techreborn.tiles.TileAesu;
|
||||
|
||||
public class BlockAesu extends BlockMachineBase implements IRotationTexture {
|
||||
public class BlockAESU extends BlockMachineBase implements IRotationTexture {
|
||||
|
||||
|
||||
|
||||
public BlockAesu(Material material) {
|
||||
public BlockAESU(Material material) {
|
||||
super();
|
||||
setUnlocalizedName("techreborn.aesu");
|
||||
setCreativeTab(TechRebornCreativeTab.instance);
|
||||
|
@ -35,7 +33,7 @@ public class BlockAesu extends BlockMachineBase implements IRotationTexture {
|
|||
return true;
|
||||
}
|
||||
|
||||
private final String prefix = "techreborn:blocks/machine/";
|
||||
private final String prefix = "techreborn:blocks/machine/storage/";
|
||||
|
||||
@Override
|
||||
public String getFrontOff() {
|
||||
|
@ -54,12 +52,12 @@ public class BlockAesu extends BlockMachineBase implements IRotationTexture {
|
|||
|
||||
@Override
|
||||
public String getTop() {
|
||||
return prefix + "aesu_side";
|
||||
return prefix + "aesu_top";
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getBottom() {
|
||||
return prefix + "aesu_side";
|
||||
return prefix + "aesu_bottom";
|
||||
}
|
||||
|
||||
}
|
55
src/main/java/techreborn/blocks/storage/BlockBatBox.java
Normal file
55
src/main/java/techreborn/blocks/storage/BlockBatBox.java
Normal file
|
@ -0,0 +1,55 @@
|
|||
package techreborn.blocks.storage;
|
||||
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.world.World;
|
||||
import reborncore.common.blocks.BlockMachineBase;
|
||||
import reborncore.common.blocks.IRotationTexture;
|
||||
import techreborn.client.TechRebornCreativeTab;
|
||||
import techreborn.tiles.storage.TileBatBox;
|
||||
|
||||
/**
|
||||
* Created by modmuss50 on 14/03/2016.
|
||||
*/
|
||||
public class BlockBatBox extends BlockMachineBase implements IRotationTexture {
|
||||
|
||||
public BlockBatBox() {
|
||||
super();
|
||||
setUnlocalizedName("techreborn.batBox");
|
||||
setCreativeTab(TechRebornCreativeTab.instance);
|
||||
}
|
||||
|
||||
@Override
|
||||
public TileEntity createNewTileEntity(World world, int p_149915_2_) {
|
||||
return new TileBatBox();
|
||||
}
|
||||
|
||||
protected final String prefix = "techreborn:blocks/machine/storage/";
|
||||
|
||||
@Override
|
||||
public String getFrontOff() {
|
||||
return prefix + "batbox_front";
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getFrontOn() {
|
||||
return prefix + "batbox_front";
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getSide() {
|
||||
return prefix + "batbox_side";
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getTop() {
|
||||
return prefix + "batbox_top";
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getBottom() {
|
||||
return prefix + "batbox_bottom";
|
||||
}
|
||||
|
||||
}
|
|
@ -48,7 +48,7 @@ public class BlockIDSU extends BlockMachineBase implements IAdvancedRotationText
|
|||
}
|
||||
|
||||
|
||||
private final String prefix = "techreborn:blocks/machine/";
|
||||
private final String prefix = "techreborn:blocks/machine/storage/";
|
||||
|
||||
|
||||
@Override
|
||||
|
@ -63,12 +63,12 @@ public class BlockIDSU extends BlockMachineBase implements IAdvancedRotationText
|
|||
|
||||
@Override
|
||||
public String getTop(boolean isActive) {
|
||||
return prefix + "idsu_side";
|
||||
return prefix + "idsu_top";
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getBottom(boolean isActive) {
|
||||
return prefix + "idsu_side";
|
||||
return prefix + "idsu_bottom";
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -11,10 +11,10 @@ import techreborn.client.GuiHandler;
|
|||
import techreborn.client.TechRebornCreativeTab;
|
||||
import techreborn.tiles.lesu.TileLesu;
|
||||
|
||||
public class BlockLesu extends BlockMachineBase implements IAdvancedRotationTexture {
|
||||
public class BlockLESU extends BlockMachineBase implements IAdvancedRotationTexture {
|
||||
|
||||
|
||||
public BlockLesu(Material material) {
|
||||
public BlockLESU(Material material) {
|
||||
super();
|
||||
setUnlocalizedName("techreborn.lesu");
|
||||
setCreativeTab(TechRebornCreativeTab.instance);
|
||||
|
@ -35,7 +35,7 @@ public class BlockLesu extends BlockMachineBase implements IAdvancedRotationText
|
|||
return true;
|
||||
}
|
||||
|
||||
private final String prefix = "techreborn:blocks/machine/";
|
||||
private final String prefix = "techreborn:blocks/machine/storage/";
|
||||
|
||||
|
||||
@Override
|
||||
|
@ -50,12 +50,12 @@ public class BlockLesu extends BlockMachineBase implements IAdvancedRotationText
|
|||
|
||||
@Override
|
||||
public String getTop(boolean isActive) {
|
||||
return prefix + "lesu_side";
|
||||
return prefix + "lesu_top";
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getBottom(boolean isActive) {
|
||||
return prefix + "lesu_side";
|
||||
return prefix + "lesu_bottom";
|
||||
}
|
||||
|
||||
}
|
|
@ -13,9 +13,9 @@ import reborncore.common.blocks.IAdvancedRotationTexture;
|
|||
import techreborn.client.TechRebornCreativeTab;
|
||||
import techreborn.tiles.lesu.TileLesuStorage;
|
||||
|
||||
public class BlockLesuStorage extends BlockMachineBase implements IAdvancedRotationTexture {
|
||||
public class BlockLESUStorage extends BlockMachineBase implements IAdvancedRotationTexture {
|
||||
|
||||
public BlockLesuStorage(Material material) {
|
||||
public BlockLESUStorage(Material material) {
|
||||
super();
|
||||
setUnlocalizedName("techreborn.lesustorage");
|
||||
setCreativeTab(TechRebornCreativeTab.instance);
|
||||
|
@ -48,7 +48,7 @@ public class BlockLesuStorage extends BlockMachineBase implements IAdvancedRotat
|
|||
return block == (Block) this;
|
||||
}
|
||||
|
||||
private final String prefix = "techreborn:blocks/machine/";
|
||||
private final String prefix = "techreborn:blocks/machine/storage/";
|
||||
|
||||
@Override
|
||||
public String getFront(boolean isActive) {
|
48
src/main/java/techreborn/blocks/storage/BlockMFE.java
Normal file
48
src/main/java/techreborn/blocks/storage/BlockMFE.java
Normal file
|
@ -0,0 +1,48 @@
|
|||
package techreborn.blocks.storage;
|
||||
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.world.World;
|
||||
import techreborn.client.TechRebornCreativeTab;
|
||||
import techreborn.tiles.storage.TileMFE;
|
||||
|
||||
/**
|
||||
* Created by modmuss50 on 14/03/2016.
|
||||
*/
|
||||
public class BlockMFE extends BlockBatBox {
|
||||
|
||||
public BlockMFE() {
|
||||
super();
|
||||
setUnlocalizedName("techreborn.mfe");
|
||||
setCreativeTab(TechRebornCreativeTab.instance);
|
||||
}
|
||||
|
||||
@Override
|
||||
public TileEntity createNewTileEntity(World world, int p_149915_2_) {
|
||||
return new TileMFE();
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getFrontOff() {
|
||||
return prefix + "mfe_front";
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getFrontOn() {
|
||||
return prefix + "mfe_front";
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getSide() {
|
||||
return prefix + "mfe_side";
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getTop() {
|
||||
return prefix + "mfe_top";
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getBottom() {
|
||||
return prefix + "mfe_bottom";
|
||||
}
|
||||
}
|
48
src/main/java/techreborn/blocks/storage/BlockMFSU.java
Normal file
48
src/main/java/techreborn/blocks/storage/BlockMFSU.java
Normal file
|
@ -0,0 +1,48 @@
|
|||
package techreborn.blocks.storage;
|
||||
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.world.World;
|
||||
import techreborn.client.TechRebornCreativeTab;
|
||||
import techreborn.tiles.storage.TileMFSU;
|
||||
|
||||
/**
|
||||
* Created by modmuss50 on 14/03/2016.
|
||||
*/
|
||||
public class BlockMFSU extends BlockBatBox {
|
||||
|
||||
public BlockMFSU() {
|
||||
super();
|
||||
setUnlocalizedName("techreborn.mfsu");
|
||||
setCreativeTab(TechRebornCreativeTab.instance);
|
||||
}
|
||||
|
||||
@Override
|
||||
public TileEntity createNewTileEntity(World world, int p_149915_2_) {
|
||||
return new TileMFSU();
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getFrontOff() {
|
||||
return prefix + "mfsu_front";
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getFrontOn() {
|
||||
return prefix + "mfsu_front";
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getSide() {
|
||||
return prefix + "mfsu_side";
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getTop() {
|
||||
return prefix + "mfsu_top";
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getBottom() {
|
||||
return prefix + "mfsu_bottom";
|
||||
}
|
||||
}
|
Loading…
Add table
Add a link
Reference in a new issue