diff --git a/build.gradle b/build.gradle index b9096f520..fb70ee7a2 100644 --- a/build.gradle +++ b/build.gradle @@ -43,7 +43,7 @@ configurations { compile.extendsFrom shade } -version = "1.0.1" +version = "1.0.2" def ENV = System.getenv() if (ENV.BUILD_NUMBER) { diff --git a/src/main/java/techreborn/blocks/BlockMachineCasing.java b/src/main/java/techreborn/blocks/BlockMachineCasing.java index 9a9585269..eaef7daae 100644 --- a/src/main/java/techreborn/blocks/BlockMachineCasing.java +++ b/src/main/java/techreborn/blocks/BlockMachineCasing.java @@ -90,7 +90,8 @@ public class BlockMachineCasing extends BlockMultiblockBase implements ITextured @Override public int damageDropped(IBlockState state) { - return super.damageDropped(state); + int meta = getMetaFromState(state); + return meta; } @Override @@ -122,5 +123,4 @@ public class BlockMachineCasing extends BlockMultiblockBase implements ITextured { return types.length; } - } diff --git a/src/main/java/techreborn/blocks/BlockMachineFrame.java b/src/main/java/techreborn/blocks/BlockMachineFrame.java index 6431d261e..632affcab 100644 --- a/src/main/java/techreborn/blocks/BlockMachineFrame.java +++ b/src/main/java/techreborn/blocks/BlockMachineFrame.java @@ -58,7 +58,8 @@ public class BlockMachineFrame extends BaseBlock implements ITexturedBlock @Override public int damageDropped(IBlockState state) { - return super.damageDropped(state); + int meta = getMetaFromState(state); + return meta; } @Override diff --git a/src/main/java/techreborn/blocks/storage/BlockLESU.java b/src/main/java/techreborn/blocks/storage/BlockLESU.java index c90ebd940..5d9032bbc 100644 --- a/src/main/java/techreborn/blocks/storage/BlockLESU.java +++ b/src/main/java/techreborn/blocks/storage/BlockLESU.java @@ -5,7 +5,7 @@ import net.minecraft.world.World; import techreborn.client.GuiHandler; import techreborn.tiles.lesu.TileLesu; -public class BlockLESU extends BlockEnergyStorage +public class BlockLESU extends BlockEnergyStorage { public BlockLESU() { @@ -17,5 +17,4 @@ public class BlockLESU extends BlockEnergyStorage { return new TileLesu(); } - } diff --git a/src/main/java/techreborn/blocks/storage/BlockLESUStorage.java b/src/main/java/techreborn/blocks/storage/BlockLESUStorage.java index c30b64b7e..2a4bed318 100644 --- a/src/main/java/techreborn/blocks/storage/BlockLESUStorage.java +++ b/src/main/java/techreborn/blocks/storage/BlockLESUStorage.java @@ -1,7 +1,11 @@ package techreborn.blocks.storage; +import java.util.ArrayList; +import java.util.List; + import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import net.minecraft.block.state.IBlockState; import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; @@ -44,6 +48,14 @@ public class BlockLESUStorage extends BlockMachineBase implements IAdvancedRotat } super.breakBlock(world, x, y, z, block, meta); } + + @Override + public List getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune) + { + List items = new ArrayList(); + items.add(new ItemStack(this)); + return items; + } @Override public TileEntity createNewTileEntity(World p_149915_1_, int p_149915_2_) diff --git a/src/main/java/techreborn/client/gui/GuiDieselGenerator.java b/src/main/java/techreborn/client/gui/GuiDieselGenerator.java index 963355513..32c8cf469 100644 --- a/src/main/java/techreborn/client/gui/GuiDieselGenerator.java +++ b/src/main/java/techreborn/client/gui/GuiDieselGenerator.java @@ -13,7 +13,7 @@ public class GuiDieselGenerator extends GuiContainer { private static final ResourceLocation texture = new ResourceLocation("techreborn", - "textures/gui/ThermalGenerator.png"); + "textures/gui/diesel_generator.png"); TileDieselGenerator tile; diff --git a/src/main/java/techreborn/client/gui/GuiSemifluidGenerator.java b/src/main/java/techreborn/client/gui/GuiSemifluidGenerator.java index a5b3ae896..9c5d0c17d 100644 --- a/src/main/java/techreborn/client/gui/GuiSemifluidGenerator.java +++ b/src/main/java/techreborn/client/gui/GuiSemifluidGenerator.java @@ -13,7 +13,7 @@ public class GuiSemifluidGenerator extends GuiContainer // TODO: use semifluid generator texture private static final ResourceLocation texture = new ResourceLocation("techreborn", - "textures/gui/ThermalGenerator.png"); + "textures/gui/semifluid_generator.png"); TileSemifluidGenerator tile; diff --git a/src/main/java/techreborn/compat/jei/TechRebornJeiPlugin.java b/src/main/java/techreborn/compat/jei/TechRebornJeiPlugin.java index 51173a728..e85c474b9 100644 --- a/src/main/java/techreborn/compat/jei/TechRebornJeiPlugin.java +++ b/src/main/java/techreborn/compat/jei/TechRebornJeiPlugin.java @@ -19,6 +19,7 @@ import techreborn.api.reactor.FusionReactorRecipeHelper; import techreborn.api.recipe.RecipeHandler; import techreborn.api.recipe.machines.AssemblingMachineRecipe; import techreborn.api.recipe.machines.ImplosionCompressorRecipe; +import techreborn.blocks.fluid.BlockFluidTechReborn; import techreborn.client.container.ContainerAlloyFurnace; import techreborn.client.container.ContainerAlloySmelter; import techreborn.client.container.ContainerAssemblingMachine; @@ -90,6 +91,7 @@ import techreborn.compat.jei.scrapbox.ScrapboxRecipeHandler; import techreborn.compat.jei.vacuumFreezer.VacuumFreezerRecipeCategory; import techreborn.compat.jei.vacuumFreezer.VacuumFreezerRecipeHandler; import techreborn.config.ConfigTechReborn; +import techreborn.init.ModFluids; import techreborn.init.ModItems; import techreborn.items.ItemParts; @@ -124,6 +126,30 @@ public class TechRebornJeiPlugin extends BlankModPlugin IJeiHelpers jeiHelpers = registry.getJeiHelpers(); IGuiHelper guiHelper = jeiHelpers.getGuiHelper(); + jeiHelpers.getItemBlacklist().addItemToBlacklist(new ItemStack(ModFluids.BlockFluidBerylium)); + jeiHelpers.getItemBlacklist().addItemToBlacklist(new ItemStack(ModFluids.BlockFluidCalcium)); + jeiHelpers.getItemBlacklist().addItemToBlacklist(new ItemStack(ModFluids.BlockFluidCalciumCarbonate)); + jeiHelpers.getItemBlacklist().addItemToBlacklist(new ItemStack(ModFluids.BlockFluidChlorite)); + jeiHelpers.getItemBlacklist().addItemToBlacklist(new ItemStack(ModFluids.BlockFluidDeuterium)); + jeiHelpers.getItemBlacklist().addItemToBlacklist(new ItemStack(ModFluids.BlockFluidGlyceryl)); + jeiHelpers.getItemBlacklist().addItemToBlacklist(new ItemStack(ModFluids.BlockFluidHelium)); + jeiHelpers.getItemBlacklist().addItemToBlacklist(new ItemStack(ModFluids.BlockFluidHelium3)); + jeiHelpers.getItemBlacklist().addItemToBlacklist(new ItemStack(ModFluids.BlockFluidHeliumplasma)); + jeiHelpers.getItemBlacklist().addItemToBlacklist(new ItemStack(ModFluids.BlockFluidHydrogen)); + jeiHelpers.getItemBlacklist().addItemToBlacklist(new ItemStack(ModFluids.BlockFluidLithium)); + jeiHelpers.getItemBlacklist().addItemToBlacklist(new ItemStack(ModFluids.BlockFluidMercury)); + jeiHelpers.getItemBlacklist().addItemToBlacklist(new ItemStack(ModFluids.BlockFluidMethane)); + jeiHelpers.getItemBlacklist().addItemToBlacklist(new ItemStack(ModFluids.BlockFluidNitrocoalfuel)); + jeiHelpers.getItemBlacklist().addItemToBlacklist(new ItemStack(ModFluids.BlockFluidNitrofuel)); + jeiHelpers.getItemBlacklist().addItemToBlacklist(new ItemStack(ModFluids.BlockFluidNitrogen)); + jeiHelpers.getItemBlacklist().addItemToBlacklist(new ItemStack(ModFluids.BlockFluidNitrogendioxide)); + jeiHelpers.getItemBlacklist().addItemToBlacklist(new ItemStack(ModFluids.BlockFluidPotassium)); + jeiHelpers.getItemBlacklist().addItemToBlacklist(new ItemStack(ModFluids.BlockFluidSilicon)); + jeiHelpers.getItemBlacklist().addItemToBlacklist(new ItemStack(ModFluids.BlockFluidSodium)); + jeiHelpers.getItemBlacklist().addItemToBlacklist(new ItemStack(ModFluids.BlockFluidSodiumpersulfate)); + jeiHelpers.getItemBlacklist().addItemToBlacklist(new ItemStack(ModFluids.BlockFluidTritium)); + jeiHelpers.getItemBlacklist().addItemToBlacklist(new ItemStack(ModFluids.BlockFluidWolframium)); + registry.addRecipeCategories(new AlloySmelterRecipeCategory(guiHelper), new AssemblingMachineRecipeCategory(guiHelper), new BlastFurnaceRecipeCategory(guiHelper), new CentrifugeRecipeCategory(guiHelper), new ChemicalReactorRecipeCategory(guiHelper), diff --git a/src/main/java/techreborn/items/tools/ItemTechManual.java b/src/main/java/techreborn/items/tools/ItemTechManual.java index cfdc743ba..c744a72e0 100644 --- a/src/main/java/techreborn/items/tools/ItemTechManual.java +++ b/src/main/java/techreborn/items/tools/ItemTechManual.java @@ -1,11 +1,14 @@ package techreborn.items.tools; +import java.util.List; + import me.modmuss50.jsonDestroyer.api.ITexturedItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.ActionResult; import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumHand; +import net.minecraft.util.text.TextFormatting; import net.minecraft.world.World; import techreborn.Core; import techreborn.client.GuiHandler; @@ -42,5 +45,10 @@ public class ItemTechManual extends ItemTextureBase implements ITexturedItem { return "techreborn:items/tool/manual"; } - + + @Override + public void addInformation(ItemStack stack, EntityPlayer playerIn, List tooltip, boolean advanced) + { + tooltip.add(TextFormatting.RED + "WIP Coming Soon"); + } } diff --git a/src/main/java/techreborn/items/tools/ItemWrench.java b/src/main/java/techreborn/items/tools/ItemWrench.java index 2ff163e6d..b63ea8ae6 100644 --- a/src/main/java/techreborn/items/tools/ItemWrench.java +++ b/src/main/java/techreborn/items/tools/ItemWrench.java @@ -21,13 +21,15 @@ import net.minecraft.world.World; import net.minecraftforge.fluids.BlockFluidBase; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import reborncore.common.tile.TileMachineBase; +import techreborn.blocks.storage.BlockBatBox; import techreborn.client.TechRebornCreativeTabMisc; import techreborn.items.ItemTR; import techreborn.lib.ModInfo; - import java.util.ArrayList; import java.util.List; import java.util.Random; +import techreborn.tiles.storage.TileBatBox; /** * Created by modmuss50 on 26/02/2016. @@ -43,10 +45,8 @@ public class ItemWrench extends ItemTR implements ITexturedItem } @Override - public EnumActionResult onItemUse(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumHand hand, - EnumFacing facing, float hitX, float hitY, float hitZ) - { - if (world.isAirBlock(pos) || !player.isSneaking()) + public EnumActionResult onItemUseFirst(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ, EnumHand hand) { + if (world.isAirBlock(pos)) { return EnumActionResult.FAIL; } @@ -55,80 +55,117 @@ public class ItemWrench extends ItemTR implements ITexturedItem { return EnumActionResult.FAIL; } - if (!(tile instanceof IInventory)) + + if(!player.isSneaking()){ + if(tile instanceof TileBatBox){ + tile.getWorld().setBlockState(tile.getPos(), tile.getWorld().getBlockState(pos).withProperty(BlockBatBox.FACING, side.getOpposite())); + return EnumActionResult.SUCCESS; + } else + if(tile instanceof TileMachineBase){ + if(side != EnumFacing.DOWN && side != EnumFacing.UP){ + ((TileMachineBase) tile).setFacing(side); + return EnumActionResult.SUCCESS; + } + } + } + return super.onItemUseFirst(stack, player, world, pos, side, hitX, hitY, hitZ, hand); + } + + @Override + public EnumActionResult onItemUse(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumHand hand, + EnumFacing facing, float hitX, float hitY, float hitZ) + { + if (world.isAirBlock(pos)) + { + return EnumActionResult.FAIL; + } + TileEntity tile = world.getTileEntity(pos); + if (tile == null) { return EnumActionResult.FAIL; } - List items = new ArrayList(); - IInventory inventory = (IInventory) tile; - for (int i = 0; i < inventory.getSizeInventory(); i++) + if (player.isSneaking()) { - ItemStack itemStack = inventory.getStackInSlot(i); - - if (itemStack == null) + List items = new ArrayList(); + if (tile instanceof IInventory) { - continue; - } - if (itemStack != null && itemStack.stackSize > 0) - { - if (itemStack.getItem() instanceof ItemBlock) + IInventory inventory = (IInventory) tile; + for (int i = 0; i < inventory.getSizeInventory(); i++) { - if (((ItemBlock) itemStack.getItem()).block instanceof BlockFluidBase - || ((ItemBlock) itemStack.getItem()).block instanceof BlockStaticLiquid - || ((ItemBlock) itemStack.getItem()).block instanceof BlockDynamicLiquid) + ItemStack itemStack = inventory.getStackInSlot(i); + + if (itemStack == null) { continue; } + if (itemStack != null && itemStack.stackSize > 0) + { + if (itemStack.getItem() instanceof ItemBlock) + { + if (((ItemBlock) itemStack.getItem()).block instanceof BlockFluidBase + || ((ItemBlock) itemStack.getItem()).block instanceof BlockStaticLiquid + || ((ItemBlock) itemStack.getItem()).block instanceof BlockDynamicLiquid) + { + continue; + } + } + } + items.add(itemStack.copy()); } } - items.add(itemStack.copy()); - } - if (tile instanceof IWrenchable) - { - if (((IWrenchable) tile).wrenchCanRemove(player)) + if (tile instanceof IWrenchable) { - ItemStack itemStack = ((IWrenchable) tile).getWrenchDrop(player); - if (itemStack == null) + if (((IWrenchable) tile).wrenchCanRemove(player)) { - return EnumActionResult.FAIL; + ItemStack itemStack = ((IWrenchable) tile).getWrenchDrop(player); + if (itemStack == null) + { + return EnumActionResult.FAIL; + } + items.add(itemStack); } - items.add(itemStack); - } - for (ItemStack itemStack : items) - { - Random rand = new Random(); - - float dX = rand.nextFloat() * 0.8F + 0.1F; - float dY = rand.nextFloat() * 0.8F + 0.1F; - float dZ = rand.nextFloat() * 0.8F + 0.1F; - - EntityItem entityItem = new EntityItem(world, pos.getX() + dX, pos.getY() + dY, pos.getZ() + dZ, - itemStack.copy()); - - if (itemStack.hasTagCompound()) + if (!items.isEmpty()) { - entityItem.getEntityItem().setTagCompound((NBTTagCompound) itemStack.getTagCompound().copy()); + for (ItemStack itemStack : items) + { + Random rand = new Random(); + + float dX = rand.nextFloat() * 0.8F + 0.1F; + float dY = rand.nextFloat() * 0.8F + 0.1F; + float dZ = rand.nextFloat() * 0.8F + 0.1F; + + EntityItem entityItem = new EntityItem(world, pos.getX() + dX, pos.getY() + dY, pos.getZ() + dZ, + itemStack.copy()); + + if (itemStack.hasTagCompound()) + { + entityItem.getEntityItem() + .setTagCompound((NBTTagCompound) itemStack.getTagCompound().copy()); + } + + float factor = 0.05F; + entityItem.motionX = rand.nextGaussian() * factor; + entityItem.motionY = rand.nextGaussian() * factor + 0.2F; + entityItem.motionZ = rand.nextGaussian() * factor; + if (!world.isRemote) + { + world.spawnEntityInWorld(entityItem); + } + } } - float factor = 0.05F; - entityItem.motionX = rand.nextGaussian() * factor; - entityItem.motionY = rand.nextGaussian() * factor + 0.2F; - entityItem.motionZ = rand.nextGaussian() * factor; + // TODO 1.9 sounds + // world.playSoundAtEntity(player, "techreborn:block_dismantle", + // 0.8F, 1F); if (!world.isRemote) { - world.spawnEntityInWorld(entityItem); + world.setBlockState(pos, Blocks.air.getDefaultState(), 2); } + return EnumActionResult.SUCCESS; } - // TODO 1.9 sounds - // world.playSoundAtEntity(player, "techreborn:block_dismantle", - // 0.8F, 1F); - if (!world.isRemote) - { - world.setBlockState(pos, Blocks.air.getDefaultState(), 2); - } - return EnumActionResult.SUCCESS; + } return EnumActionResult.FAIL; } diff --git a/src/main/java/techreborn/multiblocks/MultiBlockCasing.java b/src/main/java/techreborn/multiblocks/MultiBlockCasing.java index 0259f935b..93fc43488 100644 --- a/src/main/java/techreborn/multiblocks/MultiBlockCasing.java +++ b/src/main/java/techreborn/multiblocks/MultiBlockCasing.java @@ -383,7 +383,6 @@ public class MultiBlockCasing extends RectangularMultiblockControllerBase protected void isBlockGoodForFrame(World world, int x, int y, int z) throws MultiblockValidationException { Block block = world.getBlockState(new BlockPos(x, y, z)).getBlock(); - world.setBlockState(new BlockPos(x, y, z), Blocks.bedrock.getDefaultState(), 3); if (block == ModBlocks.MachineCasing) { diff --git a/src/main/java/techreborn/parts/CableMultipart.java b/src/main/java/techreborn/parts/CableMultipart.java index 7ae3df77c..35d5b65c8 100644 --- a/src/main/java/techreborn/parts/CableMultipart.java +++ b/src/main/java/techreborn/parts/CableMultipart.java @@ -399,8 +399,8 @@ public abstract class CableMultipart extends Multipart } if (ConfigTechReborn.UninsulatedElectocutionSound) { - getWorld().playSound(entity.posX, entity.posY, entity.posZ, ModSounds.shock, - SoundCategory.BLOCKS, 0.6F, 1F, false); +// getWorld().playSound(entity.posX, entity.posY, entity.posZ, ModSounds.shock, +// SoundCategory.BLOCKS, 0.6F, 1F, false); } if (ConfigTechReborn.UninsulatedElectocutionParticle) { diff --git a/src/main/java/techreborn/parts/EnumCableType.java b/src/main/java/techreborn/parts/EnumCableType.java index 67705ddf6..4266220a3 100644 --- a/src/main/java/techreborn/parts/EnumCableType.java +++ b/src/main/java/techreborn/parts/EnumCableType.java @@ -13,22 +13,14 @@ import techreborn.parts.types.TinCable; public enum EnumCableType implements IStringSerializable { - COPPER("copper", "techreborn:blocks/cables/copper_cable", 128, 12.0, true, EnumPowerTier.LOW, - CopperCable.class), TIN("tin", "techreborn:blocks/cables/tin_cable", 32, 12.0, true, EnumPowerTier.MEDIUM, - TinCable.class), GOLD("gold", "techreborn:blocks/cables/gold_cable", 512, 12.0, true, - EnumPowerTier.MEDIUM, GoldCable.class), HV("hv", "techreborn:blocks/cables/hv_cable", 2048, - 12.0, true, EnumPowerTier.HIGH, HVCable.class), GLASSFIBER("glassfiber", - "techreborn:blocks/cables/glass_fiber_cable", 8192, 12.0, false, - EnumPowerTier.HIGH, GlassFiberCable.class), ICOPPER("insulatedcopper", - "techreborn:blocks/cables/copper_insulated_cable", 128, 10.0, false, - EnumPowerTier.LOW, - InsulatedCopperCable.class), IGOLD("insulatedgold", - "techreborn:blocks/cables/gold_insulated_cable", 512, 10.0, - false, EnumPowerTier.MEDIUM, - InsulatedGoldCable.class), IHV("insulatedhv", - "techreborn:blocks/cables/hv_insulated_cable", 2048, - 10.0, false, EnumPowerTier.HIGH, - InsulatedHVCable.class); + COPPER("copper", "techreborn:blocks/cables/copper_cable", 128, 12.0, true, EnumPowerTier.LOW, CopperCable.class), + TIN("tin", "techreborn:blocks/cables/tin_cable", 32, 12.0, true, EnumPowerTier.MEDIUM, TinCable.class), + GOLD("gold", "techreborn:blocks/cables/gold_cable", 512, 12.0, true, EnumPowerTier.MEDIUM, GoldCable.class), + HV("hv", "techreborn:blocks/cables/hv_cable", 2048, 12.0, true, EnumPowerTier.HIGH, HVCable.class), + GLASSFIBER("glassfiber", "techreborn:blocks/cables/glass_fiber_cable", 8192, 12.0, false, EnumPowerTier.HIGH, GlassFiberCable.class), + ICOPPER("insulatedcopper", "techreborn:blocks/cables/copper_insulated_cable", 128, 10.0, false, EnumPowerTier.LOW, InsulatedCopperCable.class), + IGOLD("insulatedgold", "techreborn:blocks/cables/gold_insulated_cable", 512, 10.0, false, EnumPowerTier.MEDIUM, InsulatedGoldCable.class), + IHV("insulatedhv", "techreborn:blocks/cables/hv_insulated_cable", 2048, 10.0, false, EnumPowerTier.HIGH, InsulatedHVCable.class); public String textureName = "minecraft:blocks/iron_block"; public int transferRate = 128; diff --git a/src/main/java/techreborn/parts/ItemCables.java b/src/main/java/techreborn/parts/ItemCables.java index c0a2b4005..1d3f99424 100644 --- a/src/main/java/techreborn/parts/ItemCables.java +++ b/src/main/java/techreborn/parts/ItemCables.java @@ -14,6 +14,7 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Vec3d; import net.minecraft.util.text.TextFormatting; +import net.minecraft.util.text.translation.I18n; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -96,11 +97,11 @@ public class ItemCables extends ItemMultiPart implements ITexturedItem public void addInformation(ItemStack stack, EntityPlayer playerIn, List tooltip, boolean advanced) { EnumCableType type = EnumCableType.values()[stack.getItemDamage()]; - tooltip.add(TextFormatting.GREEN + "EU Transfer: " + TextFormatting.LIGHT_PURPLE + type.transferRate); + tooltip.add(TextFormatting.GREEN + I18n.translateToLocal("desc.euTransfer") + TextFormatting.LIGHT_PURPLE + type.transferRate); if (type.canKill) { - tooltip.add(TextFormatting.RED + "Damages entity's!"); + tooltip.add(TextFormatting.RED + I18n.translateToLocal("desc.uninsulatedCable")); } - tooltip.add(TextFormatting.GREEN + "Tier: " + TextFormatting.LIGHT_PURPLE + type.tier); + tooltip.add(TextFormatting.GREEN + I18n.translateToLocal("desc.tier") + TextFormatting.LIGHT_PURPLE + type.tier); } } \ No newline at end of file diff --git a/src/main/java/techreborn/parts/types/TinCable.java b/src/main/java/techreborn/parts/types/TinCable.java index 2893072b0..ea0133c49 100644 --- a/src/main/java/techreborn/parts/types/TinCable.java +++ b/src/main/java/techreborn/parts/types/TinCable.java @@ -11,6 +11,6 @@ public class TinCable extends CableMultipart @Override public EnumCableType getCableType() { - return EnumCableType.COPPER; + return EnumCableType.TIN; } } diff --git a/src/main/java/techreborn/tiles/TileMatterFabricator.java b/src/main/java/techreborn/tiles/TileMatterFabricator.java index 849c6cfc4..5d65fe58c 100644 --- a/src/main/java/techreborn/tiles/TileMatterFabricator.java +++ b/src/main/java/techreborn/tiles/TileMatterFabricator.java @@ -13,6 +13,8 @@ import reborncore.common.util.Inventory; import reborncore.common.util.ItemUtils; import techreborn.init.ModBlocks; import techreborn.init.ModItems; +import ic2.api.tile.IWrenchable; +import techreborn.items.ItemParts; public class TileMatterFabricator extends TilePowerAcceptor implements IWrenchable, IInventory { @@ -302,6 +304,11 @@ public class TileMatterFabricator extends TilePowerAcceptor implements IWrenchab { // int value = getValue(Recipes.matterAmplifier.getOutputFor(itemStack, // false)); + if(itemStack.getItem() == ModItems.parts && itemStack.getItemDamage() == ItemParts.getPartByName("scrap").getItemDamage()){ + return 5000; + } else if (itemStack.getItem() == ModItems.scrapBox){ + return 45000; + } return 0; } diff --git a/src/main/java/techreborn/tiles/TileQuantumTank.java b/src/main/java/techreborn/tiles/TileQuantumTank.java index f936297e5..9429ab2ef 100644 --- a/src/main/java/techreborn/tiles/TileQuantumTank.java +++ b/src/main/java/techreborn/tiles/TileQuantumTank.java @@ -81,7 +81,7 @@ public class TileQuantumTank extends TileMachineBase FluidUtils.fillContainers(this, inventory, 0, 1, tank.getFluidType()); if (tank.getFluidType() != null && getStackInSlot(2) == null) { - inventory.setInventorySlotContents(2, new ItemStack(tank.getFluidType().getBlock())); +// inventory.setInventorySlotContents(2, new ItemStack(tank.getFluidType().getBlock())); } else if (tank.getFluidType() == null && getStackInSlot(2) != null) { setInventorySlotContents(2, null); diff --git a/src/main/java/techreborn/tiles/generator/TileThermalGenerator.java b/src/main/java/techreborn/tiles/generator/TileThermalGenerator.java index eca3a9a01..6489f273c 100644 --- a/src/main/java/techreborn/tiles/generator/TileThermalGenerator.java +++ b/src/main/java/techreborn/tiles/generator/TileThermalGenerator.java @@ -158,9 +158,9 @@ public class TileThermalGenerator extends TilePowerAcceptor implements IWrenchab public void updateEntity() { super.updateEntity(); - FluidUtils.drainContainers(this, inventory, 0, 1); if (!worldObj.isRemote) { + FluidUtils.drainContainers(this, inventory, 0, 1); for (EnumFacing direction : EnumFacing.values()) { if (worldObj.getBlockState(new BlockPos(getPos().getX() + direction.getFrontOffsetX(), diff --git a/src/main/resources/assets/techreborn/lang/en_US.lang b/src/main/resources/assets/techreborn/lang/en_US.lang index 09866d2d6..977651f26 100644 --- a/src/main/resources/assets/techreborn/lang/en_US.lang +++ b/src/main/resources/assets/techreborn/lang/en_US.lang @@ -958,6 +958,10 @@ Cable.trippleInsulatedIronCable.name=Triple Insulated Copper Cable Cable.glassFiberCable.name=Glass Fiber Cable Cable.tinCable.name=Tin Cable +desc.uninsulatedCable=Damages Entities! +desc.euTransfer=EU Transfer: +desc.tier=Tier: + #Manual techreborn.manual.contents=Contents Page techreborn.manual.gettingstarted=Getting Started diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/iron_machines/iron_machine_side.png b/src/main/resources/assets/techreborn/textures/blocks/machine/iron_machines/iron_machine_side.png index 24a1625aa..23c60304d 100644 Binary files a/src/main/resources/assets/techreborn/textures/blocks/machine/iron_machines/iron_machine_side.png and b/src/main/resources/assets/techreborn/textures/blocks/machine/iron_machines/iron_machine_side.png differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/iron_machines/iron_machine_top.png b/src/main/resources/assets/techreborn/textures/blocks/machine/iron_machines/iron_machine_top.png index 66085310c..934be7979 100644 Binary files a/src/main/resources/assets/techreborn/textures/blocks/machine/iron_machines/iron_machine_top.png and b/src/main/resources/assets/techreborn/textures/blocks/machine/iron_machines/iron_machine_top.png differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/tier1_machines/electric_furnace_front_off.png b/src/main/resources/assets/techreborn/textures/blocks/machine/tier1_machines/electric_furnace_front_off.png index 4e2e61bc0..7b61a852d 100644 Binary files a/src/main/resources/assets/techreborn/textures/blocks/machine/tier1_machines/electric_furnace_front_off.png and b/src/main/resources/assets/techreborn/textures/blocks/machine/tier1_machines/electric_furnace_front_off.png differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/tier1_machines/tier1_machine_side.png b/src/main/resources/assets/techreborn/textures/blocks/machine/tier1_machines/tier1_machine_side.png index 537ab32cd..37d74ac2c 100644 Binary files a/src/main/resources/assets/techreborn/textures/blocks/machine/tier1_machines/tier1_machine_side.png and b/src/main/resources/assets/techreborn/textures/blocks/machine/tier1_machines/tier1_machine_side.png differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/tier1_machines/tier1_machine_top.png b/src/main/resources/assets/techreborn/textures/blocks/machine/tier1_machines/tier1_machine_top.png index d5fadf931..fdf350ef5 100644 Binary files a/src/main/resources/assets/techreborn/textures/blocks/machine/tier1_machines/tier1_machine_top.png and b/src/main/resources/assets/techreborn/textures/blocks/machine/tier1_machines/tier1_machine_top.png differ diff --git a/src/main/resources/assets/techreborn/textures/gui/diesel_generator.png b/src/main/resources/assets/techreborn/textures/gui/diesel_generator.png new file mode 100644 index 000000000..b30960025 Binary files /dev/null and b/src/main/resources/assets/techreborn/textures/gui/diesel_generator.png differ diff --git a/src/main/resources/assets/techreborn/textures/gui/semifluid_generator.png b/src/main/resources/assets/techreborn/textures/gui/semifluid_generator.png index bd4c6dce5..b30960025 100644 Binary files a/src/main/resources/assets/techreborn/textures/gui/semifluid_generator.png and b/src/main/resources/assets/techreborn/textures/gui/semifluid_generator.png differ