Fix localizations and improve chat messages

This commit is contained in:
Prospector 2016-05-11 18:44:28 -07:00
parent 19adfe5d58
commit 2f370d5637
5 changed files with 517 additions and 479 deletions

View file

@ -10,9 +10,11 @@ import net.minecraft.util.EnumFacing;
import net.minecraft.util.EnumHand; import net.minecraft.util.EnumHand;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import net.minecraft.util.text.TextComponentString; import net.minecraft.util.text.TextComponentString;
import net.minecraft.util.text.translation.I18n;
import net.minecraft.world.World; import net.minecraft.world.World;
import net.minecraftforge.common.DimensionManager; import net.minecraftforge.common.DimensionManager;
import reborncore.RebornCore; import reborncore.RebornCore;
import reborncore.common.util.ChatUtils;
import techreborn.client.TechRebornCreativeTabMisc; import techreborn.client.TechRebornCreativeTabMisc;
import techreborn.config.ConfigTechReborn; import techreborn.config.ConfigTechReborn;
@ -39,14 +41,14 @@ public class ItemFrequencyTransmitter extends ItemTextureBase implements ITextur
if (!world.isRemote && ConfigTechReborn.FreqTransmitterChat) if (!world.isRemote && ConfigTechReborn.FreqTransmitterChat)
{ {
player.addChatMessage(new TextComponentString( ChatUtils.sendNoSpamClient(new TextComponentString(
ChatFormatting.GRAY + "Set to X: " + ChatFormatting.GRAY + I18n.translateToLocal("techreborn.message.setTo") + " X: " +
ChatFormatting.GOLD + pos.getX() + ChatFormatting.GOLD + pos.getX() +
ChatFormatting.GRAY + " Y: " + ChatFormatting.GRAY + " Y: " +
ChatFormatting.GOLD + pos.getY() + ChatFormatting.GOLD + pos.getY() +
ChatFormatting.GRAY + " Z: " + ChatFormatting.GRAY + " Z: " +
ChatFormatting.GOLD + pos.getZ() + ChatFormatting.GOLD + pos.getZ() +
ChatFormatting.GRAY + " in " + ChatFormatting.GRAY + " " + I18n.translateToLocal("techreborn.message.in") + " " +
ChatFormatting.GOLD + DimensionManager.getProviderType(world.provider.getDimension()).getName() + " ("+world.provider.getDimension()+")")); ChatFormatting.GOLD + DimensionManager.getProviderType(world.provider.getDimension()).getName() + " ("+world.provider.getDimension()+")"));
} }
return EnumActionResult.SUCCESS; return EnumActionResult.SUCCESS;

View file

@ -15,8 +15,8 @@ public class ItemNuggets extends ItemTextureBase
public static final String[] types = new String[] { "aluminum", "brass", "bronze", "chrome", "copper", "electrum", public static final String[] types = new String[] { "aluminum", "brass", "bronze", "chrome", "copper", "electrum",
"invar", "iridium", "lead", "nickel", "platinum", "silver", "steel", "tin", "titanium", "tungsten", "invar", "iridium", "lead", "nickel", "platinum", "silver", "steel", "tin", "titanium", "tungsten",
"hotTungstensteel", "tungstensteel", "zinc", "refinedIron", "advancedAlloy", "mixedmetalingot", "hotTungstensteel", "tungstensteel", "zinc", "refinedIron", "advancedAlloy", "mixedMetal",
"iridiumAlloyIngot", "iron", "diamond" }; "iridiumAlloy", "iron", "diamond" };
public ItemNuggets() public ItemNuggets()
{ {

View file

@ -1,30 +1,35 @@
package techreborn.parts.fluidPipes; package techreborn.parts.fluidPipes;
import com.mojang.realmsclient.gui.ChatFormatting;
import net.minecraft.util.IStringSerializable; import net.minecraft.util.IStringSerializable;
/** /**
* Created by modmuss50 on 09/05/2016. * Created by modmuss50 on 09/05/2016.
*/ */
public enum EnumFluidPipeTypes implements IStringSerializable { public enum EnumFluidPipeTypes implements IStringSerializable
{
EMPTY("empty","techreborn:blocks/fluidPipes/fluidpipe", false, false), EMPTY("empty", "techreborn:blocks/fluidPipes/fluidpipe", false, false, ChatFormatting.DARK_GRAY),
INSERT("insert","techreborn:blocks/fluidPipes/fluidpipe_insert", false, true), INSERT("insert", "techreborn:blocks/fluidPipes/fluidpipe_insert", false, true, ChatFormatting.BLUE),
EXTRACT("extract","techreborn:blocks/fluidPipes/fluidpipe_extract", true, false); EXTRACT("extract", "techreborn:blocks/fluidPipes/fluidpipe_extract", true, false, ChatFormatting.GOLD);
private String name;
public String textureName = "minecraft:blocks/iron_block"; public String textureName = "minecraft:blocks/iron_block";
public boolean extract = false; public boolean extract = false;
public boolean insert = false; public boolean insert = false;
public ChatFormatting colour = ChatFormatting.WHITE;
private String name;
EnumFluidPipeTypes(String name, String textureName, boolean extract, boolean insert) { EnumFluidPipeTypes(String name, String textureName, boolean extract, boolean insert, ChatFormatting colour)
{
this.name = name; this.name = name;
this.textureName = textureName; this.textureName = textureName;
this.extract = extract; this.extract = extract;
this.insert = insert; this.insert = insert;
this.colour = colour;
} }
@Override @Override public String getName()
public String getName() { {
return name; return name;
} }
} }

View file

@ -12,9 +12,6 @@ import net.minecraft.block.properties.PropertyBool;
import net.minecraft.block.properties.PropertyEnum; import net.minecraft.block.properties.PropertyEnum;
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.client.Minecraft;
import net.minecraft.client.gui.ChatLine;
import net.minecraft.client.gui.GuiNewChat;
import net.minecraft.entity.Entity; import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
@ -24,6 +21,7 @@ import net.minecraft.util.*;
import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.AxisAlignedBB;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import net.minecraft.util.text.TextComponentString; import net.minecraft.util.text.TextComponentString;
import net.minecraft.util.text.translation.I18n;
import net.minecraft.world.World; import net.minecraft.world.World;
import net.minecraftforge.common.property.ExtendedBlockState; import net.minecraftforge.common.property.ExtendedBlockState;
import net.minecraftforge.common.property.IExtendedBlockState; import net.minecraftforge.common.property.IExtendedBlockState;
@ -32,19 +30,21 @@ import net.minecraftforge.common.property.Properties;
import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.FluidTankInfo;
import net.minecraftforge.fluids.IFluidHandler; import net.minecraftforge.fluids.IFluidHandler;
import reborncore.common.util.ChatUtils;
import reborncore.common.misc.Functions; import reborncore.common.misc.Functions;
import reborncore.common.misc.vecmath.Vecs3dCube; import reborncore.common.misc.vecmath.Vecs3dCube;
import reborncore.common.util.Tank; import reborncore.common.util.Tank;
import reborncore.common.util.WorldUtils; import reborncore.common.util.WorldUtils;
import techreborn.parts.TechRebornParts; import techreborn.parts.TechRebornParts;
import reborncore.common.util.StringUtils;
import java.lang.reflect.Field;
import java.util.*; import java.util.*;
/** /**
* Created by modmuss50 on 09/05/2016. * Created by modmuss50 on 09/05/2016.
*/ */
public class MultipartFluidPipe extends Multipart implements INormallyOccludingPart, ISlottedPart, ITickable { public class MultipartFluidPipe extends Multipart implements INormallyOccludingPart, ISlottedPart, ITickable
{
public static final IUnlistedProperty<Boolean> UP = Properties.toUnlisted(PropertyBool.create("up")); public static final IUnlistedProperty<Boolean> UP = Properties.toUnlisted(PropertyBool.create("up"));
public static final IUnlistedProperty<Boolean> DOWN = Properties.toUnlisted(PropertyBool.create("down")); public static final IUnlistedProperty<Boolean> DOWN = Properties.toUnlisted(PropertyBool.create("down"));
@ -54,50 +54,59 @@ public class MultipartFluidPipe extends Multipart implements INormallyOccludingP
public static final IUnlistedProperty<Boolean> WEST = Properties.toUnlisted(PropertyBool.create("west")); public static final IUnlistedProperty<Boolean> WEST = Properties.toUnlisted(PropertyBool.create("west"));
public static final IProperty<EnumFluidPipeTypes> TYPE = PropertyEnum.create("type", EnumFluidPipeTypes.class); public static final IProperty<EnumFluidPipeTypes> TYPE = PropertyEnum.create("type", EnumFluidPipeTypes.class);
public static final double thickness = 11; public static final double thickness = 11;
public static int mbt = 20;
public Vecs3dCube[] boundingBoxes = new Vecs3dCube[14]; public Vecs3dCube[] boundingBoxes = new Vecs3dCube[14];
public float center = 0.6F; public float center = 0.6F;
public float offset = 0.10F; public float offset = 0.10F;
public Map<EnumFacing, BlockPos> connectedSides; public Map<EnumFacing, BlockPos> connectedSides;
EnumFluidPipeTypes currentType = EnumFluidPipeTypes.EMPTY; EnumFluidPipeTypes currentType = EnumFluidPipeTypes.EMPTY;
Tank tank = new Tank("MultipartFluidPipe", 1000, null); Tank tank = new Tank("MultipartFluidPipe", 1000, null);
public static int mbt = 20;
public MultipartFluidPipe() { public MultipartFluidPipe()
{
connectedSides = new HashMap<>(); connectedSides = new HashMap<>();
refreshBounding(); refreshBounding();
} }
public static MultipartFluidPipe getPartFromWorld(World world, BlockPos pos, EnumFacing side) { public static MultipartFluidPipe getPartFromWorld(World world, BlockPos pos, EnumFacing side)
if (world == null || pos == null) { {
if (world == null || pos == null)
{
return null; return null;
} }
IMultipartContainer container = MultipartHelper.getPartContainer(world, pos); IMultipartContainer container = MultipartHelper.getPartContainer(world, pos);
if (side != null && container != null) { if (side != null && container != null)
{
ISlottedPart slottedPart = container.getPartInSlot(PartSlot.getFaceSlot(side)); ISlottedPart slottedPart = container.getPartInSlot(PartSlot.getFaceSlot(side));
if (slottedPart instanceof IMicroblock.IFaceMicroblock && !((IMicroblock.IFaceMicroblock) slottedPart) if (slottedPart instanceof IMicroblock.IFaceMicroblock && !((IMicroblock.IFaceMicroblock) slottedPart)
.isFaceHollow()) { .isFaceHollow())
{
return null; return null;
} }
} }
if (container == null) { if (container == null)
{
return null; return null;
} }
ISlottedPart part = container.getPartInSlot(PartSlot.CENTER); ISlottedPart part = container.getPartInSlot(PartSlot.CENTER);
if (part instanceof MultipartFluidPipe) { if (part instanceof MultipartFluidPipe)
{
return (MultipartFluidPipe) part; return (MultipartFluidPipe) part;
} }
return null; return null;
} }
public void refreshBounding() { public void refreshBounding()
{
float centerFirst = center - offset; float centerFirst = center - offset;
double w = (thickness / 16) - 0.5; double w = (thickness / 16) - 0.5;
boundingBoxes[6] = new Vecs3dCube(centerFirst - w, centerFirst - w, centerFirst - w, centerFirst + w, boundingBoxes[6] = new Vecs3dCube(centerFirst - w, centerFirst - w, centerFirst - w, centerFirst + w,
centerFirst + w, centerFirst + w); centerFirst + w, centerFirst + w);
int i = 0; int i = 0;
for (EnumFacing dir : EnumFacing.VALUES) { for (EnumFacing dir : EnumFacing.VALUES)
{
double xMin1 = (dir.getFrontOffsetX() < 0 ? double xMin1 = (dir.getFrontOffsetX() < 0 ?
0.0 : 0.0 :
(dir.getFrontOffsetX() == 0 ? centerFirst - w : centerFirst + w)); (dir.getFrontOffsetX() == 0 ? centerFirst - w : centerFirst + w));
@ -124,24 +133,27 @@ public class MultipartFluidPipe extends Multipart implements INormallyOccludingP
} }
} }
@Override @Override public void addCollisionBoxes(AxisAlignedBB mask, List<AxisAlignedBB> list, Entity collidingEntity)
public void addCollisionBoxes(AxisAlignedBB mask, List<AxisAlignedBB> list, Entity collidingEntity) { {
for (EnumFacing dir : EnumFacing.VALUES) { for (EnumFacing dir : EnumFacing.VALUES)
{
if (connectedSides.containsKey(dir) && mask if (connectedSides.containsKey(dir) && mask
.intersectsWith(boundingBoxes[Functions.getIntDirFromDirection(dir)].toAABB())) .intersectsWith(boundingBoxes[Functions.getIntDirFromDirection(dir)].toAABB()))
list.add(boundingBoxes[Functions.getIntDirFromDirection(dir)].toAABB()); list.add(boundingBoxes[Functions.getIntDirFromDirection(dir)].toAABB());
} }
if (mask.intersectsWith(boundingBoxes[6].toAABB())) { if (mask.intersectsWith(boundingBoxes[6].toAABB()))
{
list.add(boundingBoxes[6].toAABB()); list.add(boundingBoxes[6].toAABB());
} }
super.addCollisionBoxes(mask, list, collidingEntity); super.addCollisionBoxes(mask, list, collidingEntity);
} }
@Override @Override public void addSelectionBoxes(List<AxisAlignedBB> list)
public void addSelectionBoxes(List<AxisAlignedBB> list) { {
for (EnumFacing dir : EnumFacing.VALUES) { for (EnumFacing dir : EnumFacing.VALUES)
{
if (connectedSides.containsKey(dir)) if (connectedSides.containsKey(dir))
list.add(boundingBoxes[Functions.getIntDirFromDirection(dir)].toAABB()); list.add(boundingBoxes[Functions.getIntDirFromDirection(dir)].toAABB());
} }
@ -149,62 +161,74 @@ public class MultipartFluidPipe extends Multipart implements INormallyOccludingP
super.addSelectionBoxes(list); super.addSelectionBoxes(list);
} }
@Override @Override public void onRemoved()
public void onRemoved() { {
super.onRemoved(); super.onRemoved();
for (EnumFacing dir : EnumFacing.VALUES) { for (EnumFacing dir : EnumFacing.VALUES)
{
MultipartFluidPipe multipart = getPartFromWorld(getWorld(), getPos().offset(dir), dir); MultipartFluidPipe multipart = getPartFromWorld(getWorld(), getPos().offset(dir), dir);
if (multipart != null) { if (multipart != null)
{
multipart.nearByChange(); multipart.nearByChange();
} }
} }
} }
@Override @Override public void addOcclusionBoxes(List<AxisAlignedBB> list)
public void addOcclusionBoxes(List<AxisAlignedBB> list) { {
for (EnumFacing dir : EnumFacing.VALUES) { for (EnumFacing dir : EnumFacing.VALUES)
{
if (connectedSides.containsKey(dir)) if (connectedSides.containsKey(dir))
list.add(boundingBoxes[Functions.getIntDirFromDirection(dir)].toAABB()); list.add(boundingBoxes[Functions.getIntDirFromDirection(dir)].toAABB());
} }
list.add(boundingBoxes[6].toAABB()); list.add(boundingBoxes[6].toAABB());
} }
@Override @Override public void onNeighborBlockChange(Block block)
public void onNeighborBlockChange(Block block) { {
super.onNeighborBlockChange(block); super.onNeighborBlockChange(block);
nearByChange(); nearByChange();
} }
public void nearByChange() { public void nearByChange()
{
checkConnectedSides(); checkConnectedSides();
for (EnumFacing direction : EnumFacing.VALUES) { for (EnumFacing direction : EnumFacing.VALUES)
{
BlockPos blockPos = getPos().offset(direction); BlockPos blockPos = getPos().offset(direction);
WorldUtils.updateBlock(getWorld(), blockPos); WorldUtils.updateBlock(getWorld(), blockPos);
MultipartFluidPipe part = getPartFromWorld(getWorld(), blockPos, direction); MultipartFluidPipe part = getPartFromWorld(getWorld(), blockPos, direction);
if (part != null) { if (part != null)
{
part.checkConnectedSides(); part.checkConnectedSides();
} }
} }
} }
@Override @Override public void onAdded()
public void onAdded() { {
nearByChange(); nearByChange();
} }
public boolean shouldConnectTo(EnumFacing dir) { public boolean shouldConnectTo(EnumFacing dir)
if (dir != null) { {
if (internalShouldConnectTo(dir)) { if (dir != null)
{
if (internalShouldConnectTo(dir))
{
MultipartFluidPipe multipartFluidPipe = getPartFromWorld(getWorld(), getPos().offset(dir), dir); MultipartFluidPipe multipartFluidPipe = getPartFromWorld(getWorld(), getPos().offset(dir), dir);
if (multipartFluidPipe != null && multipartFluidPipe.internalShouldConnectTo(dir.getOpposite())) { if (multipartFluidPipe != null && multipartFluidPipe.internalShouldConnectTo(dir.getOpposite()))
{
return true; return true;
} }
} else { } else
{
TileEntity tile = getNeighbourTile(dir); TileEntity tile = getNeighbourTile(dir);
if (tile instanceof IFluidHandler && (currentType == EnumFluidPipeTypes.EXTRACT if (tile instanceof IFluidHandler && (currentType == EnumFluidPipeTypes.EXTRACT
|| currentType == EnumFluidPipeTypes.INSERT)) { || currentType == EnumFluidPipeTypes.INSERT))
{
return true; return true;
} }
} }
@ -212,16 +236,20 @@ public class MultipartFluidPipe extends Multipart implements INormallyOccludingP
return false; return false;
} }
public boolean internalShouldConnectTo(EnumFacing dir) { public boolean internalShouldConnectTo(EnumFacing dir)
{
ISlottedPart part = getContainer().getPartInSlot(PartSlot.getFaceSlot(dir)); ISlottedPart part = getContainer().getPartInSlot(PartSlot.getFaceSlot(dir));
if (part instanceof IMicroblock.IFaceMicroblock) { if (part instanceof IMicroblock.IFaceMicroblock)
if (!((IMicroblock.IFaceMicroblock) part).isFaceHollow()) { {
if (!((IMicroblock.IFaceMicroblock) part).isFaceHollow())
{
return false; return false;
} }
} }
if (!OcclusionHelper.occlusionTest(getContainer().getParts(), p -> p == this, if (!OcclusionHelper.occlusionTest(getContainer().getParts(), p -> p == this,
boundingBoxes[Functions.getIntDirFromDirection(dir)].toAABB())) { boundingBoxes[Functions.getIntDirFromDirection(dir)].toAABB()))
{
return false; return false;
} }
@ -230,32 +258,37 @@ public class MultipartFluidPipe extends Multipart implements INormallyOccludingP
return multipartFluidPipe != null; return multipartFluidPipe != null;
} }
public TileEntity getNeighbourTile(EnumFacing side) { public TileEntity getNeighbourTile(EnumFacing side)
{
return side != null ? getWorld().getTileEntity(getPos().offset(side)) : null; return side != null ? getWorld().getTileEntity(getPos().offset(side)) : null;
} }
public void checkConnectedSides() { public void checkConnectedSides()
{
refreshBounding(); refreshBounding();
connectedSides = new HashMap<>(); connectedSides = new HashMap<>();
for (EnumFacing dir : EnumFacing.values()) { for (EnumFacing dir : EnumFacing.values())
{
int d = Functions.getIntDirFromDirection(dir); int d = Functions.getIntDirFromDirection(dir);
if (getWorld() == null) { if (getWorld() == null)
{
return; return;
} }
TileEntity te = getNeighbourTile(dir); TileEntity te = getNeighbourTile(dir);
if (shouldConnectTo(dir)) { if (shouldConnectTo(dir))
{
connectedSides.put(dir, te.getPos()); connectedSides.put(dir, te.getPos());
} }
} }
} }
@Override @Override public EnumSet<PartSlot> getSlotMask()
public EnumSet<PartSlot> getSlotMask() { {
return EnumSet.of(PartSlot.CENTER); return EnumSet.of(PartSlot.CENTER);
} }
@Override @Override public IBlockState getExtendedState(IBlockState state)
public IBlockState getExtendedState(IBlockState state) { {
IExtendedBlockState extendedBlockState = (IExtendedBlockState) state; IExtendedBlockState extendedBlockState = (IExtendedBlockState) state;
return extendedBlockState.withProperty(DOWN, shouldConnectTo(EnumFacing.DOWN)) return extendedBlockState.withProperty(DOWN, shouldConnectTo(EnumFacing.DOWN))
.withProperty(UP, shouldConnectTo(EnumFacing.UP)).withProperty(NORTH, shouldConnectTo(EnumFacing.NORTH)) .withProperty(UP, shouldConnectTo(EnumFacing.UP)).withProperty(NORTH, shouldConnectTo(EnumFacing.NORTH))
@ -264,49 +297,57 @@ public class MultipartFluidPipe extends Multipart implements INormallyOccludingP
.withProperty(EAST, shouldConnectTo(EnumFacing.EAST)).withProperty(TYPE, currentType); .withProperty(EAST, shouldConnectTo(EnumFacing.EAST)).withProperty(TYPE, currentType);
} }
@Override @Override public BlockStateContainer createBlockState()
public BlockStateContainer createBlockState() { {
return new ExtendedBlockState(MCMultiPartMod.multipart, new IProperty[]{TYPE}, return new ExtendedBlockState(MCMultiPartMod.multipart, new IProperty[] { TYPE },
new IUnlistedProperty[]{DOWN, UP, NORTH, SOUTH, WEST, EAST}); new IUnlistedProperty[] { DOWN, UP, NORTH, SOUTH, WEST, EAST });
} }
@Override @Override public float getHardness(PartMOP hit)
public float getHardness(PartMOP hit) { {
return 0.5F; return 0.5F;
} }
public Material getMaterial() { public Material getMaterial()
{
return Material.CLOTH; return Material.CLOTH;
} }
@Override @Override public List<ItemStack> getDrops()
public List<ItemStack> getDrops() { {
List<ItemStack> list = new ArrayList<>(); List<ItemStack> list = new ArrayList<>();
list.add(new ItemStack(TechRebornParts.fluidPipe, 1, 0)); list.add(new ItemStack(TechRebornParts.fluidPipe, 1, 0));
return list; return list;
} }
@Override @Override public ResourceLocation getModelPath()
public ResourceLocation getModelPath() { {
return new ResourceLocation("techreborn:fluidpipe"); return new ResourceLocation("techreborn:fluidpipe");
} }
@Override @Override public boolean canRenderInLayer(BlockRenderLayer layer)
public boolean canRenderInLayer(BlockRenderLayer layer) { {
return layer == BlockRenderLayer.CUTOUT; return layer == BlockRenderLayer.CUTOUT;
} }
@Override @Override public void update()
public void update() { {
if (!getWorld().isRemote) { if (!getWorld().isRemote)
for (EnumFacing dir : EnumFacing.VALUES) { {
for (EnumFacing dir : EnumFacing.VALUES)
{
//if (connectedSides.containsKey(dir)) { //if (connectedSides.containsKey(dir)) {
MultipartFluidPipe fluidPipe = getPartFromWorld(getWorld(), getPos().offset(dir), dir); MultipartFluidPipe fluidPipe = getPartFromWorld(getWorld(), getPos().offset(dir), dir);
if (fluidPipe != null) { if (fluidPipe != null)
if (!tank.isEmpty()){ {
if(fluidPipe.tank.isEmpty() || fluidPipe.tank.getFluid().getFluid() == tank.getFluid().getFluid()){ if (!tank.isEmpty())
{
if (fluidPipe.tank.isEmpty() || fluidPipe.tank.getFluid().getFluid() == tank.getFluid()
.getFluid())
{
int wantedAmount = fluidPipe.tank.getCapacity(); int wantedAmount = fluidPipe.tank.getCapacity();
if(!fluidPipe.tank.isEmpty()){ if (!fluidPipe.tank.isEmpty())
{
wantedAmount = fluidPipe.tank.getCapacity() - fluidPipe.tank.getFluidAmount(); wantedAmount = fluidPipe.tank.getCapacity() - fluidPipe.tank.getFluidAmount();
} }
int amountToDischarge = Math.min(Math.min(mbt, tank.getFluidAmount()), wantedAmount); int amountToDischarge = Math.min(Math.min(mbt, tank.getFluidAmount()), wantedAmount);
@ -318,20 +359,30 @@ public class MultipartFluidPipe extends Multipart implements INormallyOccludingP
} }
// } // }
TileEntity tileEntity = getNeighbourTile(dir); TileEntity tileEntity = getNeighbourTile(dir);
if (tileEntity != null) { if (tileEntity != null)
if (tileEntity instanceof IFluidHandler) { {
if (tileEntity instanceof IFluidHandler)
{
IFluidHandler handler = (IFluidHandler) tileEntity; IFluidHandler handler = (IFluidHandler) tileEntity;
if (currentType == EnumFluidPipeTypes.EXTRACT) { if (currentType == EnumFluidPipeTypes.EXTRACT)
if (!tank.isFull()) { {
if (!tank.isFull())
{
FluidTankInfo[] fluidTankInfos = handler.getTankInfo(dir.getOpposite()); FluidTankInfo[] fluidTankInfos = handler.getTankInfo(dir.getOpposite());
if (fluidTankInfos.length != 0) { if (fluidTankInfos.length != 0)
{
FluidTankInfo info = fluidTankInfos[0]; FluidTankInfo info = fluidTankInfos[0];
if (info != null & info.fluid != null) { if (info != null & info.fluid != null)
if(tank.isEmpty() || info.fluid.getFluid() == tank.getFluid().getFluid()){ {
if(handler.canDrain(dir.getOpposite(), info.fluid.getFluid())){ if (tank.isEmpty() || info.fluid.getFluid() == tank.getFluid().getFluid())
int amountToMove = Math.min(mbt, tank.getCapacity() - tank.getFluidAmount()); {
if (handler.canDrain(dir.getOpposite(), info.fluid.getFluid()))
{
int amountToMove = Math
.min(mbt, tank.getCapacity() - tank.getFluidAmount());
int fluidAmount = tank.getFluidAmount(); int fluidAmount = tank.getFluidAmount();
FluidStack fluidStack = handler.drain(dir.getOpposite(), amountToMove, true); FluidStack fluidStack = handler
.drain(dir.getOpposite(), amountToMove, true);
tank.fill(fluidStack, true); tank.fill(fluidStack, true);
tank.setFluid(fluidStack); tank.setFluid(fluidStack);
tank.setFluidAmount(fluidAmount + amountToMove); tank.setFluidAmount(fluidAmount + amountToMove);
@ -340,16 +391,21 @@ public class MultipartFluidPipe extends Multipart implements INormallyOccludingP
} }
} }
} }
} else if (currentType == EnumFluidPipeTypes.INSERT) { } else if (currentType == EnumFluidPipeTypes.INSERT)
if (!tank.isEmpty()) { {
if (!tank.isEmpty())
{
FluidTankInfo[] fluidTankInfos = handler.getTankInfo(dir.getOpposite()); FluidTankInfo[] fluidTankInfos = handler.getTankInfo(dir.getOpposite());
if (fluidTankInfos.length != 0) { if (fluidTankInfos.length != 0)
{
FluidTankInfo info = fluidTankInfos[0]; FluidTankInfo info = fluidTankInfos[0];
if (info.fluid == null || info.fluid.getFluid() == null if (info.fluid == null || info.fluid.getFluid() == null
|| info.fluid.getFluid() == tank.getFluid().getFluid() && handler || info.fluid.getFluid() == tank.getFluid().getFluid() && handler
.canFill(dir.getOpposite(), tank.getFluid().getFluid())) { .canFill(dir.getOpposite(), tank.getFluid().getFluid()))
{
int infoSpace = info.capacity; int infoSpace = info.capacity;
if(info.fluid != null){ if (info.fluid != null)
{
infoSpace = info.capacity - info.fluid.amount; infoSpace = info.capacity - info.fluid.amount;
} }
int amountToMove = Math.min(mbt, infoSpace); int amountToMove = Math.min(mbt, infoSpace);
@ -365,76 +421,64 @@ public class MultipartFluidPipe extends Multipart implements INormallyOccludingP
} }
} }
@Override @Override public boolean onActivated(EntityPlayer player, EnumHand hand, ItemStack heldItem, PartMOP hit)
public boolean onActivated(EntityPlayer player, EnumHand hand, ItemStack heldItem, PartMOP hit) { {
//TODO make only wrench able to change mode, shift-click with wrench picks up pipe, and click with empty hand displays current mode in chat (doesn't change it) //TODO make only wrench able to change mode, shift-click with wrench picks up pipe, and click with empty hand displays current mode in chat (doesn't change it)
//TODO move to client side only class
if (getWorld().isRemote) {
try {
GuiNewChat chat = Minecraft.getMinecraft().ingameGUI.getChatGUI();
Field field = chat.getClass().getDeclaredField("chatLines");
field.setAccessible(true);
List<ChatLine> lines = (List<ChatLine>) field.get(chat);
List<Integer> linesToRemove = new ArrayList<>();
for (ChatLine line : lines) {
if (line.getChatComponent() instanceof TextComponetValue) {
linesToRemove.add(line.getChatLineID());
}
}
for (Integer integer : linesToRemove) {
chat.deleteChatLine(integer);
}
} catch (NoSuchFieldException e) {
e.printStackTrace();
} catch (IllegalAccessException e) {
e.printStackTrace();
}
}
//TODO sync this to the client, and also when part is loaded //TODO sync this to the client, and also when part is loaded
//if (!getWorld().isRemote) { //if (!getWorld().isRemote) {
if (currentType == EnumFluidPipeTypes.EMPTY) { if (currentType == EnumFluidPipeTypes.EMPTY)
{
currentType = EnumFluidPipeTypes.EXTRACT; currentType = EnumFluidPipeTypes.EXTRACT;
} else if (currentType == EnumFluidPipeTypes.EXTRACT) { } else if (currentType == EnumFluidPipeTypes.EXTRACT)
{
currentType = EnumFluidPipeTypes.INSERT; currentType = EnumFluidPipeTypes.INSERT;
} else if (currentType == EnumFluidPipeTypes.INSERT) { } else if (currentType == EnumFluidPipeTypes.INSERT)
{
currentType = EnumFluidPipeTypes.EMPTY; currentType = EnumFluidPipeTypes.EMPTY;
} }
// } // }
if (getWorld().isRemote) { if (getWorld().isRemote)
player.addChatMessage(new TextComponetValue("Mode set to: " + ChatFormatting.GOLD + currentType.getName())); {
ChatUtils.sendNoSpamClient(new TextComponetValue(
ChatFormatting.GRAY + I18n.translateToLocal("techreborn.message.setTo") + " " +
currentType.colour + StringUtils.toFirstCapital(currentType.getName())));
} }
markRenderUpdate(); markRenderUpdate();
return true; return true;
} }
@Override @Override public void writeToNBT(NBTTagCompound tag)
public void writeToNBT(NBTTagCompound tag) { {
super.writeToNBT(tag); super.writeToNBT(tag);
tank.writeToNBT(tag); tank.writeToNBT(tag);
tag.setString("mode", currentType.getName()); tag.setString("mode", currentType.getName());
} }
@Override @Override public void readFromNBT(NBTTagCompound tag)
public void readFromNBT(NBTTagCompound tag) { {
super.readFromNBT(tag); super.readFromNBT(tag);
tank.readFromNBT(tag); tank.readFromNBT(tag);
String mode = tag.getString("mode"); String mode = tag.getString("mode");
if (mode.equals(EnumFluidPipeTypes.EMPTY)) { if (mode.equals(EnumFluidPipeTypes.EMPTY))
{
currentType = EnumFluidPipeTypes.EMPTY; currentType = EnumFluidPipeTypes.EMPTY;
} else if (mode.equals(EnumFluidPipeTypes.INSERT)) { } else if (mode.equals(EnumFluidPipeTypes.INSERT))
{
currentType = EnumFluidPipeTypes.INSERT; currentType = EnumFluidPipeTypes.INSERT;
} else if (mode.equals(EnumFluidPipeTypes.EXTRACT)) { } else if (mode.equals(EnumFluidPipeTypes.EXTRACT))
{
currentType = EnumFluidPipeTypes.EXTRACT; currentType = EnumFluidPipeTypes.EXTRACT;
} }
} }
public class TextComponetValue extends TextComponentString { public class TextComponetValue extends TextComponentString
{
public TextComponetValue(String msg) { public TextComponetValue(String msg)
{
super(msg); super(msg);
} }
} }

View file

@ -303,99 +303,71 @@ item.techreborn.cable.IHV.name=Insulated HV Cable
item.techreborn.scrapbox.name=Scrap Box item.techreborn.scrapbox.name=Scrap Box
item.techreborn.part.carbonmesh.name=Carbon Mesh item.techreborn.part.carbonmesh.name=Carbon Mesh
item.techreborn.part.carbonfiber.name=Carbon Fiber item.techreborn.part.carbonfiber.name=Carbon Fiber
item.techreborn.part.mixedmetalingot.name=Mixed Metal Ingot
#Small Dusts #Small Dusts
item.techreborn.dustsmall.Almandine.name=Small Pile of Almandine Dust item.techreborn.dustsmall.almandine.name=Small Pile of Almandine Dust
item.techreborn.dustsmall.AluminumBrass.name=Small Pile of Aluminium Brass Dust item.techreborn.dustsmall.aluminum.name=Small Pile of Aluminium Dust
item.techreborn.dustsmall.Aluminum.name=Small Pile of Aluminium Dust item.techreborn.dustsmall.andradite.name=Small Pile of Andradite Dust
item.techreborn.dustsmall.Alumite.name=Small Pile of Alumite Dust item.techreborn.dustsmall.ashes.name=Small Pile of Ashes
item.techreborn.dustsmall.Andradite.name=Small Pile of Andradite Dust item.techreborn.dustsmall.basalt.name=Small Pile of Basalt Dust
item.techreborn.dustsmall.Antimony.name=Small Pile of Antimony Dust item.techreborn.dustsmall.bauxite.name=Small Pile of Bauxite Dust
item.techreborn.dustsmall.Ardite.name=Small Pile of Ardite Dust item.techreborn.dustsmall.brass.name=Small Pile of Brass Dust
item.techreborn.dustsmall.Ashes.name=Small Pile of Ashes item.techreborn.dustsmall.bronze.name=Small Pile of Bronze Dust
item.techreborn.dustsmall.Basalt.name=Small Pile of Basalt Dust item.techreborn.dustsmall.calcite.name=Small Pile of Calcite Dust
item.techreborn.dustsmall.Bauxite.name=Small Pile of Bauxite Dust item.techreborn.dustsmall.charcoal.name=Small Pile of Charcoal Dust
item.techreborn.dustsmall.Biotite.name=Small Pile of Biotite Dust item.techreborn.dustsmall.chrome.name=Small Pile of Chrome Dust
item.techreborn.dustsmall.Brass.name=Small Pile of Brass Dust item.techreborn.dustsmall.cinnabar.name=Small Pile of Cinnabar Dust
item.techreborn.dustsmall.Bronze.name=Small Pile of Bronze Dust item.techreborn.dustsmall.clay.name=Small Pile of Clay Dust
item.techreborn.dustsmall.Cadmium.name=Small Pile of Cadmium Dust item.techreborn.dustsmall.coal.name=Small Pile of Coal Dust
item.techreborn.dustsmall.Calcite.name=Small Pile of Calcite Dust item.techreborn.dustsmall.copper.name=Small Pile of Copper Dust
item.techreborn.dustsmall.Charcoal.name=Small Pile of Charcoal Dust item.techreborn.dustsmall.darkAshes.name=Small Pile of Dark Ashes
item.techreborn.dustsmall.Chrome.name=Small Pile of Chrome Dust item.techreborn.dustsmall.diamond.name=Small Pile of Diamond Dust
item.techreborn.dustsmall.Cinnabar.name=Small Pile of Cinnabar Dust item.techreborn.dustsmall.electrum.name=Small Pile of Electrum Dust
item.techreborn.dustsmall.Clay.name=Small Pile of Clay Dust item.techreborn.dustsmall.emerald.name=Small Pile of Emerald Dust
item.techreborn.dustsmall.Coal.name=Small Pile of Coal Dust item.techreborn.dustsmall.enderEye.name=Small Pile of Ender Eye Dust
item.techreborn.dustsmall.Cobalt.name=Small Pile of Cobalt Dust item.techreborn.dustsmall.enderPearl.name=Small Pile of Ender Pearl Dust
item.techreborn.dustsmall.Copper.name=Small Pile of Copper Dust item.techreborn.dustsmall.endstone.name=Small Pile of Endstone Dust
item.techreborn.dustsmall.Cupronickel.name=Small Pile of Cupronickel Dust item.techreborn.dustsmall.flint.name=Small Pile of Flint Dust
item.techreborn.dustsmall.DarkAshes.name=Small Pile of Dark Ashes item.techreborn.dustsmall.galena.name=Small Pile of Galena Dust
item.techreborn.dustsmall.DarkIron.name=Small Pile of Dark Iron Dust item.techreborn.dustsmall.glowstone.name=Small Pile of Glowstone Dust
item.techreborn.dustsmall.Diamond.name=Small Pile of Diamond Dust item.techreborn.dustsmall.gold.name=Small Pile of Gold Dust
item.techreborn.dustsmall.Electrum.name=Small Pile of Electrum Dust item.techreborn.dustsmall.grossular.name=Small Pile of Grossular Dust
item.techreborn.dustsmall.Emerald.name=Small Pile of Emerald Dust item.techreborn.dustsmall.invar.name=Small Pile of Invar Dust
item.techreborn.dustsmall.EnderEye.name=Small Pile of Ender Eye Dust item.techreborn.dustsmall.iron.name=Small Pile of Iron Dust
item.techreborn.dustsmall.EnderPearl.name=Small Pile of Ender Pearl Dust item.techreborn.dustsmall.lazurite.name=Small Pile of Lazurite Dust
item.techreborn.dustsmall.Endstone.name=Small Pile of Endstone Dust item.techreborn.dustsmall.lead.name=Small Pile of Lead Dust
item.techreborn.dustsmall.Flint.name=Small Pile of Flint Dust item.techreborn.dustsmall.magnesium.name=Small Pile of Magnesium Dust
item.techreborn.dustsmall.Glowstone.name=Small Pile of Glowstone Dust item.techreborn.dustsmall.manganese.name=Small Pile of Manganese Dust
item.techreborn.dustsmall.Gold.name=Small Pile of Gold Dust item.techreborn.dustsmall.marble.name=Small Pile of Marble Dust
item.techreborn.dustsmall.Graphite.name=Small Pile of Graphite Dust item.techreborn.dustsmall.netherrack.name=Small Pile of Netherrack Dust
item.techreborn.dustsmall.Grossular.name=Small Pile of Grossular Dust item.techreborn.dustsmall.nickel.name=Small Pile of Nickel Dust
item.techreborn.dustsmall.Gunpowder.name=Small Pile of Gunpowder item.techreborn.dustsmall.obsidian.name=Small Pile of Obsidian Dust
item.techreborn.dustsmall.Indium.name=Small Pile of Indium Dust item.techreborn.dustsmall.peridot.name=Small Pile of Peridot
item.techreborn.dustsmall.Invar.name=Small Pile of Invar Dust item.techreborn.dustsmall.phosphorous.name=Small Pile of Phosphorous Dust
item.techreborn.dustsmall.Iridium.name=Small Pile of Iridium Dust item.techreborn.dustsmall.platinum.name=Small Pile of Platinum Dust
item.techreborn.dustsmall.Iron.name=Small Pile of Iron Dust item.techreborn.dustsmall.pyrite.name=Small Pile of Pyrite Dust
item.techreborn.dustsmall.Kanthal.name=Small Pile of Kanthal Dust item.techreborn.dustsmall.pyrope.name=Small Pile of Pyrope Dust
item.techreborn.dustsmall.Lapis.name=Small Pile of Lapis Lazuli Dust item.techreborn.dustsmall.redGarnet.name=Small Pile of Red Garnet Dust
item.techreborn.dustsmall.Lazurite.name=Small Pile of Lazurite item.techreborn.dustsmall.redrock.name=Small Pile of Red Rock Dust
item.techreborn.dustsmall.Lead.name=Small Pile of Lead Dust item.techreborn.dustsmall.redstone.name=Small Pile of Redstone
item.techreborn.dustsmall.Limestone.name=Small Pile of Limestone Dust item.techreborn.dustsmall.ruby.name=Small Pile of Ruby Dust
item.techreborn.dustsmall.Lodestone.name=Small Pile of Lodestone item.techreborn.dustsmall.saltpeter.name=Small Pile of Saltpeter Dust
item.techreborn.dustsmall.Magnesium.name=Small Pile of Magnesium Dust item.techreborn.dustsmall.sapphire.name=Small Pile of Sapphire Dust
item.techreborn.dustsmall.Magnetite.name=Small Pile of Magnetite Dust item.techreborn.dustsmall.sawDust.name=Small Pile of Saw Dust
item.techreborn.dustsmall.Manganese.name=Small Pile of Manganese Dust item.techreborn.dustsmall.silver.name=Small Pile of Silver Dust
item.techreborn.dustsmall.Manyullyn.name=Small Pile of Manyullyn Dust item.techreborn.dustsmall.sodalite.name=Small Pile of Sodalite Dust
item.techreborn.dustsmall.Marble.name=Small Pile of Marble Dust item.techreborn.dustsmall.spessartine.name=Small Pile of Spessartine Dust
item.techreborn.dustsmall.Mithril.name=Small Pile of Mithril Dust item.techreborn.dustsmall.sphalerite.name=Small Pile of Sphalerite Dust
item.techreborn.dustsmall.Netherrack.name=Small Pile of Netherrack Dust item.techreborn.dustsmall.steel.name=Small Pile of Steel Dust
item.techreborn.dustsmall.Nichrome.name=Small Pile of Nichrome Dust item.techreborn.dustsmall.sulfur.name=Small Pile of Sulfur Dust
item.techreborn.dustsmall.Nickel.name=Small Pile of Nickel Dust item.techreborn.dustsmall.tin.name=Small Pile of Tin Dust
item.techreborn.dustsmall.Obsidian.name=Small Pile of Obsidian Dust item.techreborn.dustsmall.titanium.name=Small Pile of Titanium Dust
item.techreborn.dustsmall.Osmium.name=Small Pile of Osmium Dust item.techreborn.dustsmall.tungsten.name=Small Pile of Tungsten Dust
item.techreborn.dustsmall.Peridot.name=Small Pile of Peridot item.techreborn.dustsmall.uvarovite.name=Small Pile of Uvarovite Dust
item.techreborn.dustsmall.Phosphorous.name=Small Pile of Phosphorous Dust item.techreborn.dustsmall.voidstone.name=Small Pile of Voidstone Dust
item.techreborn.dustsmall.Platinum.name=Small Pile of Platinum Dust item.techreborn.dustsmall.yellowGarnet.name=Small Pile of Yellow Garnet Dust
item.techreborn.dustsmall.PotassiumFeldspar.name=Small Pile of Potassium Feldspar Dust item.techreborn.dustsmall.zinc.name=Small Pile of Zinc Dust
item.techreborn.dustsmall.Pyrite.name=Small Pile of Pyrite Dust item.techreborn.dustsmall.olivine.name=Small Pile of Olivine Dust
item.techreborn.dustsmall.Pyrope.name=Small Pile of Pyrope Dust
item.techreborn.dustsmall.RedGarnet.name=Small Pile of Red Garnet Dust
item.techreborn.dustsmall.Redrock.name=Small Pile of Red Rock Dust
item.techreborn.dustsmall.Redstone.name=Small Pile of Redstone
item.techreborn.dustsmall.Ruby.name=Small Pile of Ruby Dust
item.techreborn.dustsmall.Saltpeter.name=Small Pile of Saltpeter Dust
item.techreborn.dustsmall.Sapphire.name=Small Pile of Sapphire Dust
item.techreborn.dustsmall.Silicon.name=Small Pile of Silicon Dust
item.techreborn.dustsmall.Silver.name=Small Pile of Silver Dust
item.techreborn.dustsmall.Sodalite.name=Small Pile of Sodalite Dust
item.techreborn.dustsmall.Spessartine.name=Small Pile of Spessartine Dust
item.techreborn.dustsmall.Sphalerite.name=Small Pile of Sphalerite Dust
item.techreborn.dustsmall.Steel.name=Small Pile of Steel Dust
item.techreborn.dustsmall.Sulfur.name=Small Pile of Sulfur Dust
item.techreborn.dustsmall.Tellurium.name=Small Pile of Tellurium Dust
item.techreborn.dustsmall.Teslatite.name=Small Pile of Teslatite
item.techreborn.dustsmall.Tetrahedrite.name=Small Pile of Tetrahedrite Dust
item.techreborn.dustsmall.Tin.name=Small Pile of Tin Dust
item.techreborn.dustsmall.Titanium.name=Small Pile of Titanium Dust
item.techreborn.dustsmall.Tungsten.name=Small Pile of Tungsten Dust
item.techreborn.dustsmall.Uvarovite.name=Small Pile of Uvarovite Dust
item.techreborn.dustsmall.Vinteum.name=Small Pile of Vinteum Dust
item.techreborn.dustsmall.Voidstone.name=Small Pile of Voidstone Dust
item.techreborn.dustsmall.YellowGarnet.name=Small Pile of Yellow Garnet Dust
item.techreborn.dustsmall.Zinc.name=Small Pile of Zinc Dust
item.techreborn.dustsmall.Galena.name=Small Pile of Galena Dust
item.techreborn.dustsmall.Olivine.name=Small Pile of Olivine Dust
#Cells #Cells
item.techreborn.cell.Berylium.name=Beryllium Cell item.techreborn.cell.Berylium.name=Beryllium Cell
@ -485,6 +457,9 @@ item.techreborn.ingot.tungsten.name=Tungsten Ingot
item.techreborn.ingot.hotTungstensteel.name=Hot Tungstensteel Ingot item.techreborn.ingot.hotTungstensteel.name=Hot Tungstensteel Ingot
item.techreborn.ingot.tungstensteel.name=Tungstensteel Ingot item.techreborn.ingot.tungstensteel.name=Tungstensteel Ingot
item.techreborn.ingot.zinc.name=Zinc Ingot item.techreborn.ingot.zinc.name=Zinc Ingot
item.techreborn.ingot.advancedAlloy.name=Advanced Alloy Ingot
item.techreborn.ingot.mixedMetal.name=Mixed Metal Ingot
item.techreborn.ingot.iridiumAlloy.name=Iridium Alloy Ingot
#Nuggets #Nuggets
item.techreborn.nuggets.aluminum.name=Aluminium Nugget item.techreborn.nuggets.aluminum.name=Aluminium Nugget
@ -506,7 +481,14 @@ item.techreborn.nuggets.steel.name=Steel Nugget
item.techreborn.nuggets.tin.name=Tin Nugget item.techreborn.nuggets.tin.name=Tin Nugget
item.techreborn.nuggets.titanium.name=Titanium Nugget item.techreborn.nuggets.titanium.name=Titanium Nugget
item.techreborn.nuggets.tungsten.name=Tungsten Nugget item.techreborn.nuggets.tungsten.name=Tungsten Nugget
item.techreborn.nuggets.tungstensteel.name=Tungstensteel Nugget
item.techreborn.nuggets.hotTungstensteel.name=Hot Tungstensteeel Nugget
item.techreborn.nuggets.zinc.name=Zinc Nugget item.techreborn.nuggets.zinc.name=Zinc Nugget
item.techreborn.nuggets.refinedIron.name=Refined Iron Nugget
item.techreborn.nuggets.advancedAlloy.name=Advanced Alloy Nugget
item.techreborn.nuggets.iridiumAlloy.name=Iridium Alloy Nugget
item.techreborn.nuggets.mixedMetal.name=Mixed Metal Nugget
item.techreborn.nuggets.diamond.name=Diamond Nugget
#Crushed Ore #Crushed Ore
item.techreborn.crushedore.Aluminum.name=Crushed Aluminium Ore item.techreborn.crushedore.Aluminum.name=Crushed Aluminium Ore
@ -548,7 +530,6 @@ item.techreborn.purifiedcrushedore.Galena.name=Purified Crushed Galena Ore
#Plates #Plates
item.techreborn.plate.aluminum.name=Aluminium Plate item.techreborn.plate.aluminum.name=Aluminium Plate
item.techreborn.plate.batteryAlloy.name=Battery Alloy Plate
item.techreborn.plate.brass.name=Brass Plate item.techreborn.plate.brass.name=Brass Plate
item.techreborn.plate.bronze.name=Bronze Plate item.techreborn.plate.bronze.name=Bronze Plate
item.techreborn.plate.carbon.name=Carbon Plate item.techreborn.plate.carbon.name=Carbon Plate
@ -581,9 +562,12 @@ item.techreborn.plate.teslatite.name=Teslatite Plate
item.techreborn.plate.tin.name=Tin Plate item.techreborn.plate.tin.name=Tin Plate
item.techreborn.plate.titanium.name=Titanium Plate item.techreborn.plate.titanium.name=Titanium Plate
item.techreborn.plate.tungsten.name=Tungsten Plate item.techreborn.plate.tungsten.name=Tungsten Plate
item.techreborn.plate.hotTungstensteel.name=Hot Tungstensteel Plate
item.techreborn.plate.tungstensteel.name=Tungstensteel Plate item.techreborn.plate.tungstensteel.name=Tungstensteel Plate
item.techreborn.plate.yellowGarnet.name=Yellow Garnet Plate item.techreborn.plate.yellowGarnet.name=Yellow Garnet Plate
item.techreborn.plate.zinc.name=Zinc Plate item.techreborn.plate.zinc.name=Zinc Plate
item.techreborn.plate.refinedIron.name=Refined Iron Plate
item.techreborn.plate.wood.name=Wooden Plate
#Parts #Parts
item.techreborn.part.advancedCircuitParts.name=Advanced Circuit Parts item.techreborn.part.advancedCircuitParts.name=Advanced Circuit Parts
@ -598,8 +582,8 @@ item.techreborn.part.diamondGrindingHead.name=Diamond Grinding Head
item.techreborn.part.diamondSawBlade.name=Diamond Saw Blade item.techreborn.part.diamondSawBlade.name=Diamond Saw Blade
item.techreborn.part.tungstenGrindingHead.name=Tungsten Grinding Head item.techreborn.part.tungstenGrindingHead.name=Tungsten Grinding Head
item.techreborn.part.heliumCoolantSimple.name=60k Helium Coolant Cell item.techreborn.part.heliumCoolantSimple.name=60k Helium Coolant Cell
item.techreborn.part.HeliumCoolantTriple.name=180k Helium Coolant Cell item.techreborn.part.heliumCoolantTriple.name=180k Helium Coolant Cell
item.techreborn.part.HeliumCoolantSix.name=360k Helium Coolant Cell item.techreborn.part.heliumCoolantSix.name=360k Helium Coolant Cell
item.techreborn.part.NaKCoolantSimple.name=60k NaK Coolant Cell item.techreborn.part.NaKCoolantSimple.name=60k NaK Coolant Cell
item.techreborn.part.NaKCoolantTriple.name=180k NaK Coolant Cell item.techreborn.part.NaKCoolantTriple.name=180k NaK Coolant Cell
item.techreborn.part.NaKCoolantSix.name=360k NaK Coolant Cell item.techreborn.part.NaKCoolantSix.name=360k NaK Coolant Cell
@ -632,13 +616,14 @@ item.techreborn.part.rubber.name=Rubber
item.techreborn.part.scrap.name=Scrap item.techreborn.part.scrap.name=Scrap
item.techreborn.part.electronicCircuit.name=Electronic Circuit item.techreborn.part.electronicCircuit.name=Electronic Circuit
item.techreborn.part.advancedCircuit.name=Advanced Electronic Circuit item.techreborn.part.advancedCircuit.name=Advanced Electronic Circuit
item.techreborn.part.advancedAlloy.name=Advanced Alloy
item.techreborn.part.frequencyTransmitter.name=Frequency Transmitter item.techreborn.part.frequencyTransmitter.name=Frequency Transmitter
item.techreborn.part.tungstenGrindingHead.name=Tungsten Grinding Head item.techreborn.part.wolframiumGrindingHead.name=Wolframium Grinding Head
item.techreborn.part.dogecoin.name=Dogecoin item.techreborn.part.dogecoin.name=Dogecoin
item.techreborn.part.CoolantSimple.name=10k Coolant Cell item.techreborn.part.coolantSimple.name=10k Coolant Cell
item.techreborn.part.CoolantTriple.name=30k Coolant Cell item.techreborn.part.coolantTriple.name=30k Coolant Cell
item.techreborn.part.CoolantSix.name=60k Coolant Cell item.techreborn.part.coolantSix.name=60k Coolant Cell
item.techreborn.frequencyTransmitter.name=Frequency Transmitter
#Tools #Tools
item.techreborn.rockcutter.name=Rockcutter item.techreborn.rockcutter.name=Rockcutter
@ -995,7 +980,9 @@ techreborn.recipe.chemicalReactor=Chemical Reactor Recipe
techreborn.recipe.implosioncompressor=Implosion Compressor techreborn.recipe.implosioncompressor=Implosion Compressor
#Message #Message
techreborn.message.missingmultiblock=MISSING MULTIBLOCK techreborn.message.missingmultiblock=Incomplete Multiblock
techreborn.message.setTo=Set to
techreborn.message.in=in
#Cables #Cables
Cable.copperCable.name=Copper Cable Cable.copperCable.name=Copper Cable
@ -1015,6 +1002,7 @@ desc.uninsulatedCable=Damages Entities!
desc.euTransfer=EU Transfer: desc.euTransfer=EU Transfer:
desc.tier=Tier: desc.tier=Tier:
#Manual #Manual
techreborn.manual.contents=Contents Page techreborn.manual.contents=Contents Page
techreborn.manual.gettingstarted=Getting Started techreborn.manual.gettingstarted=Getting Started
@ -1027,7 +1015,6 @@ techreborn.manual.gettingrubber=Collecting Rubber
techreborn.manual.backbutton=Back techreborn.manual.backbutton=Back
techreborn.manual.gettingplates=Crafting Plates techreborn.manual.gettingplates=Crafting Plates
item.techreborn.advancedDrill.description=This Tool is a advanced version of the mining drill, when this item is activated it will dig out a 3x3. item.techreborn.advancedDrill.description=This Tool is a advanced version of the mining drill, when this item is activated it will dig out a 3x3.
tile.techreborn.alloyfurnace.description=This Machine is your first step into TechReborn with this you can fuse metals into other metals. These other metals can be used to craft the higher tier machines. tile.techreborn.alloyfurnace.description=This Machine is your first step into TechReborn with this you can fuse metals into other metals. These other metals can be used to craft the higher tier machines.
tile.techreborn.alloysmelter.description=This machine is a upgraded version of the Alloy Furnace, This block requires EU or RF. tile.techreborn.alloysmelter.description=This machine is a upgraded version of the Alloy Furnace, This block requires EU or RF.