AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-17 03:05:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master-MC1.10' into master-MC1.11

Browse Source 
# Conflicts:
#	build.gradle
#	src/main/scala/li/cil/oc/server/agent/Player.scala
This commit is contained in:
payonel 2018-09-16 20:17:43 -07:00
commit 2c468bdfc3
13 changed files with 29 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/scala/li/cil/oc/client/renderer/markdown/segment/BoldSegment.scala
View File

@ -1,10 +1,10 @@
package li.cil.oc.client.renderer.markdown.segment
import com.mojang.realmsclient.gui.ChatFormatting
import li.cil.oc.client.renderer.markdown.MarkupFormat
import net.minecraft.util.text.TextFormatting
private[markdown] class BoldSegment(parent: Segment, text: String) extends TextSegment(parent, text) {
override protected def format = ChatFormatting.BOLD.toString
override protected def format = TextFormatting.BOLD.toString
override def toString(format: MarkupFormat.Value): String = format match {
case MarkupFormat.Markdown => s"**$text**"

4
src/main/scala/li/cil/oc/client/renderer/markdown/segment/HeaderSegment.scala
View File

@ -1,14 +1,14 @@
package li.cil.oc.client.renderer.markdown.segment
import com.mojang.realmsclient.gui.ChatFormatting
import li.cil.oc.client.renderer.markdown.MarkupFormat
import net.minecraft.util.text.TextFormatting
private[markdown] class HeaderSegment(parent: Segment, text: String, val level: Int) extends TextSegment(parent, text) {
private val fontScale = math.max(2, 5 - level) / 2f
override protected def scale = Some(fontScale)
override protected def format = ChatFormatting.UNDERLINE.toString
override protected def format = TextFormatting.UNDERLINE.toString
override def toString(format: MarkupFormat.Value): String = format match {
case MarkupFormat.Markdown => s"${"#" * level} $text"

4
src/main/scala/li/cil/oc/client/renderer/markdown/segment/ItalicSegment.scala
View File

@ -1,10 +1,10 @@
package li.cil.oc.client.renderer.markdown.segment
import com.mojang.realmsclient.gui.ChatFormatting
import li.cil.oc.client.renderer.markdown.MarkupFormat
import net.minecraft.util.text.TextFormatting
private[markdown] class ItalicSegment(parent: Segment, text: String) extends TextSegment(parent, text) {
override protected def format = ChatFormatting.ITALIC.toString
override protected def format = TextFormatting.ITALIC.toString
override def toString(format: MarkupFormat.Value): String = format match {
case MarkupFormat.Markdown => s"*$text*"

4
src/main/scala/li/cil/oc/client/renderer/markdown/segment/StrikethroughSegment.scala
View File

@ -1,10 +1,10 @@
package li.cil.oc.client.renderer.markdown.segment
import com.mojang.realmsclient.gui.ChatFormatting
import li.cil.oc.client.renderer.markdown.MarkupFormat
import net.minecraft.util.text.TextFormatting
private[markdown] class StrikethroughSegment(parent: Segment, text: String) extends TextSegment(parent, text) {
override protected def format = ChatFormatting.STRIKETHROUGH.toString
override protected def format = TextFormatting.STRIKETHROUGH.toString
override def toString(format: MarkupFormat.Value): String = format match {
case MarkupFormat.Markdown => s"~~$text~~"

4
src/main/scala/li/cil/oc/client/renderer/tileentity/RobotRenderer.scala
View File

@ -1,7 +1,6 @@
package li.cil.oc.client.renderer.tileentity
import com.google.common.base.Strings
import com.mojang.realmsclient.gui.ChatFormatting
import li.cil.oc.OpenComputers
import li.cil.oc.Settings
import li.cil.oc.api.driver.item.UpgradeRenderer
@ -26,6 +25,7 @@ import net.minecraft.item.ItemBlock
import net.minecraft.item.ItemStack
import net.minecraft.util.EnumFacing
import net.minecraft.util.math.Vec3d
import net.minecraft.util.text.TextFormatting
import net.minecraftforge.client.MinecraftForgeClient
import net.minecraftforge.common.MinecraftForge
import org.lwjgl.opengl.GL11
@ -489,7 +489,7 @@ object RobotRenderer extends TileEntitySpecialRenderer[tileentity.RobotProxy] {
t.draw()
GlStateManager.enableTexture2D() // For the font.
f.drawString((if (EventHandler.isItTime) ChatFormatting.OBFUSCATED.toString else "") + name, -halfWidth, 0, 0xFFFFFFFF)
f.drawString((if (EventHandler.isItTime) TextFormatting.OBFUSCATED.toString else "") + name, -halfWidth, 0, 0xFFFFFFFF)
GlStateManager.depthMask(true)
GlStateManager.enableLighting()

5
src/main/scala/li/cil/oc/common/Proxy.scala
View File

@ -82,7 +82,10 @@ class Proxy {
if (api.Machine.architectures.size == 0) {
api.Machine.add(classOf[LuaJLuaArchitecture])
}
api.Machine.LuaArchitecture = api.Machine.architectures.head
api.Machine.LuaArchitecture =
if (Settings.get.forceLuaJ) classOf[LuaJLuaArchitecture]
else api.Machine.architectures.head
}
def init(e: FMLInitializationEvent) {

2
src/main/scala/li/cil/oc/common/block/RedstoneAware.scala
View File

@ -22,7 +22,7 @@ abstract class RedstoneAware extends SimpleBlock {
override def getWeakPower(state: IBlockState, world: IBlockAccess, pos: BlockPos, side: EnumFacing) =
world.getTileEntity(pos) match {
case redstone: tileentity.traits.RedstoneAware if side != null => math.min(math.max(redstone.output(side.getOpposite), 0), 15)
case redstone: tileentity.traits.RedstoneAware if side != null => redstone.output(side.getOpposite) max 0
case _ => super.getWeakPower(state, world, pos, side)
}

4
src/main/scala/li/cil/oc/common/item/Manual.scala
View File

@ -2,7 +2,6 @@ package li.cil.oc.common.item
import java.util
import com.mojang.realmsclient.gui.ChatFormatting
import li.cil.oc.OpenComputers
import li.cil.oc.api
import li.cil.oc.util.BlockPosition
@ -11,6 +10,7 @@ import net.minecraft.item.ItemStack
import net.minecraft.util.ActionResult
import net.minecraft.util.EnumActionResult
import net.minecraft.util.EnumFacing
import net.minecraft.util.text.TextFormatting
import net.minecraft.world.World
import net.minecraftforge.fml.relauncher.Side
import net.minecraftforge.fml.relauncher.SideOnly
@ -18,7 +18,7 @@ import net.minecraftforge.fml.relauncher.SideOnly
class Manual(val parent: Delegator) extends traits.Delegate {
@SideOnly(Side.CLIENT)
override def tooltipLines(stack: ItemStack, player: EntityPlayer, tooltip: util.List[String], advanced: Boolean): Unit = {
tooltip.add(ChatFormatting.DARK_GRAY.toString + "v" + OpenComputers.Version)
tooltip.add(TextFormatting.DARK_GRAY.toString + "v" + OpenComputers.Version)
super.tooltipLines(stack, player, tooltip, advanced)
}

8
src/main/scala/li/cil/oc/common/nanomachines/NeuralNetwork.scala
View File

@ -1,6 +1,5 @@
package li.cil.oc.common.nanomachines
import com.mojang.realmsclient.gui.ChatFormatting
import li.cil.oc.OpenComputers
import li.cil.oc.Settings
import li.cil.oc.api
@ -13,6 +12,7 @@ import net.minecraft.entity.player.EntityPlayer
import net.minecraft.entity.player.EntityPlayerMP
import net.minecraft.nbt.NBTTagCompound
import net.minecraft.util.text.TextComponentString
import net.minecraft.util.text.TextFormatting
import net.minecraftforge.common.util.Constants.NBT
import scala.collection.convert.WrapAsScala._
@ -126,10 +126,10 @@ class NeuralNetwork(controller: ControllerImpl) extends Persistable {
def print(player: EntityPlayer): Unit = {
val sb = StringBuilder.newBuilder
def colored(value: Any, enabled: Boolean) = {
if (enabled) sb.append(ChatFormatting.GREEN)
else sb.append(ChatFormatting.RED)
if (enabled) sb.append(TextFormatting.GREEN)
else sb.append(TextFormatting.RED)
sb.append(value)
sb.append(ChatFormatting.RESET)
sb.append(TextFormatting.RESET)
}
for (behavior <- behaviors) {
val name = Option(behavior.behavior.getNameHint).getOrElse(behavior.behavior.getClass.getSimpleName)

4
src/main/scala/li/cil/oc/common/tileentity/Keyboard.scala
View File

@ -22,8 +22,8 @@ class Keyboard extends traits.Environment with traits.Rotatable with traits.Immi
override def node = keyboard.node
def hasNodeOnSide(side: EnumFacing) =
side.getOpposite == facing || side == forward || (isOnWall && side.getOpposite == forward)
def hasNodeOnSide(side: EnumFacing) : Boolean =
side != facing && (isOnWall || side.getOpposite != forward)
// ----------------------------------------------------------------------- //

2
src/main/scala/li/cil/oc/common/tileentity/Robot.scala
View File

@ -275,7 +275,7 @@ class Robot extends traits.Computer with traits.PowerInformation with traits.Rot
else {
getWorld.setBlockToAir(newPosition)
}
created
created && BlockPosition(this) == newPosition
}
finally {
blockRobotProxy.moving.set(None)

6
src/main/scala/li/cil/oc/integration/jei/CallbackDocHandler.scala
View File

@ -4,7 +4,6 @@ import java.util
import javax.annotation.Nonnull
import com.google.common.base.Strings
import com.mojang.realmsclient.gui.ChatFormatting
import li.cil.oc.Settings
import li.cil.oc.api
import li.cil.oc.server.machine.Callbacks
@ -19,6 +18,7 @@ import mezz.jei.api.recipe.IRecipeHandler
import net.minecraft.client.Minecraft
import net.minecraft.item.ItemStack
import net.minecraft.util.ResourceLocation
import net.minecraft.util.text.TextFormatting
import scala.collection.convert.WrapAsJava._
import scala.collection.convert.WrapAsScala._
@ -66,8 +66,8 @@ object CallbackDocHandler {
case VexPattern(head, tail) => (name + head, tail)
case _ => (name, doc)
}
wrap(signature, 160).map(ChatFormatting.BLACK.toString + _).mkString("\n") +
ChatFormatting.RESET + "\n" +
wrap(signature, 160).map(TextFormatting.BLACK.toString + _).mkString("\n") +
TextFormatting.RESET + "\n" +
wrap(documentation, 152).map(" " + _).mkString("\n")
}
}

2
src/main/scala/li/cil/oc/server/agent/Player.scala
View File

@ -145,6 +145,7 @@ class Player(val agent: internal.Agent) extends FakePlayer(agent.world.asInstanc
{
this.inventory = new Inventory(this, agent)
this.inventory.player = this
// because the inventory was just overwritten, the container is now detached
this.inventoryContainer = new ContainerPlayer(this.inventory, !world.isRemote, this)
this.openContainer = this.inventoryContainer
@ -185,6 +186,7 @@ class Player(val agent: internal.Agent) extends FakePlayer(agent.world.asInstanc
for (drop <- itemsDropped) {
drop.setNoPickupDelay()
drop.onCollideWithPlayer(this)
drop.setDead()
}
}