mirror of
https://github.com/MightyPirates/OpenComputers.git
synced 2025-09-18 11:48:02 -04:00
Some more housekeeping and a bit of recipe tweakery.
This commit is contained in:
parent
ce1f33c141
commit
c130594124
@ -955,5 +955,15 @@ opencomputers {
|
|||||||
# be loaded. There is also less of a chance of conflicts when running
|
# be loaded. There is also less of a chance of conflicts when running
|
||||||
# multiple servers or server and client on the same machine.
|
# multiple servers or server and client on the same machine.
|
||||||
nativeInTmpDir: false
|
nativeInTmpDir: false
|
||||||
|
|
||||||
|
# Due to a bug in Minecraft's lighting code there's an issue where
|
||||||
|
# lighting does not properly update near light emitting blocks that are
|
||||||
|
# fully solid - like screens, for example. This can be annoying when
|
||||||
|
# using other blocks that dynamically change their brightness (e.g. for
|
||||||
|
# the addon mod OpenLights). Enable this to force light emitting blocks
|
||||||
|
# in oc to periodically (every two seconds) do an update. This should
|
||||||
|
# not have an overly noticeable impact on performance, but it's disabled
|
||||||
|
# by default because it is unnecessary in *most* cases.
|
||||||
|
periodicallyForceLightUpdate: false
|
||||||
}
|
}
|
||||||
}
|
}
|
@ -173,7 +173,7 @@ inventoryControllerUpgrade {
|
|||||||
}
|
}
|
||||||
navigationUpgrade {
|
navigationUpgrade {
|
||||||
input: [[ingotGold, compass, ingotGold]
|
input: [[ingotGold, compass, ingotGold]
|
||||||
["oc:circuitChip3", {item=map, subID=any}, "oc:circuitChip3"]
|
["oc:circuitChip2", {item=map, subID=any}, "oc:circuitChip2"]
|
||||||
[ingotGold, potion, ingotGold]]
|
[ingotGold, potion, ingotGold]]
|
||||||
}
|
}
|
||||||
signUpgrade {
|
signUpgrade {
|
||||||
@ -427,7 +427,7 @@ rack {
|
|||||||
["oc:switch", "oc:materialCircuitBoardPrinted", "oc:powerDistributor"]]
|
["oc:switch", "oc:materialCircuitBoardPrinted", "oc:powerDistributor"]]
|
||||||
}
|
}
|
||||||
redstone {
|
redstone {
|
||||||
input: [[ingotIron, "oc:circuitChip2", ingotIron]
|
input: [[ingotIron, "oc:circuitChip3", ingotIron]
|
||||||
[blockRedstone, "oc:redstoneCard1", blockRedstone]
|
[blockRedstone, "oc:redstoneCard1", blockRedstone]
|
||||||
[ingotIron, "oc:materialCircuitBoardPrinted", ingotIron]]
|
[ingotIron, "oc:materialCircuitBoardPrinted", ingotIron]]
|
||||||
}
|
}
|
||||||
|
@ -358,7 +358,7 @@ rack {
|
|||||||
["oc:switch", "oc:materialCircuitBoardPrinted","oc:powerDistributor"]]
|
["oc:switch", "oc:materialCircuitBoardPrinted","oc:powerDistributor"]]
|
||||||
}
|
}
|
||||||
redstone {
|
redstone {
|
||||||
input: [[ingotIron, "oc:circuitChip2", ingotIron]
|
input: [[ingotIron, "oc:circuitChip3", ingotIron]
|
||||||
[blockRedstone, "oc:redstoneCard1", blockRedstone]
|
[blockRedstone, "oc:redstoneCard1", blockRedstone]
|
||||||
[ingotIron, "oc:materialCircuitBoardPrinted", ingotIron]]
|
[ingotIron, "oc:materialCircuitBoardPrinted", ingotIron]]
|
||||||
}
|
}
|
||||||
|
@ -241,6 +241,7 @@ class Settings(config: Config) {
|
|||||||
val alwaysTryNative = config.getBoolean("debug.alwaysTryNative")
|
val alwaysTryNative = config.getBoolean("debug.alwaysTryNative")
|
||||||
val debugPersistence = config.getBoolean("debug.verbosePersistenceErrors")
|
val debugPersistence = config.getBoolean("debug.verbosePersistenceErrors")
|
||||||
val nativeInTmpDir = config.getBoolean("debug.nativeInTmpDir")
|
val nativeInTmpDir = config.getBoolean("debug.nativeInTmpDir")
|
||||||
|
val periodicallyForceLightUpdate = config.getBoolean("debug.periodicallyForceLightUpdate")
|
||||||
}
|
}
|
||||||
|
|
||||||
object Settings {
|
object Settings {
|
||||||
|
@ -3,7 +3,7 @@ package li.cil.oc.common.tileentity.traits
|
|||||||
import java.util.logging.Level
|
import java.util.logging.Level
|
||||||
|
|
||||||
import cpw.mods.fml.relauncher.{Side, SideOnly}
|
import cpw.mods.fml.relauncher.{Side, SideOnly}
|
||||||
import li.cil.oc.OpenComputers
|
import li.cil.oc.{Settings, OpenComputers}
|
||||||
import li.cil.oc.client.Sound
|
import li.cil.oc.client.Sound
|
||||||
import li.cil.oc.util.SideTracker
|
import li.cil.oc.util.SideTracker
|
||||||
import net.minecraft.nbt.NBTTagCompound
|
import net.minecraft.nbt.NBTTagCompound
|
||||||
@ -29,7 +29,7 @@ trait TileEntity extends net.minecraft.tileentity.TileEntity {
|
|||||||
|
|
||||||
override def updateEntity() {
|
override def updateEntity() {
|
||||||
super.updateEntity()
|
super.updateEntity()
|
||||||
if (world.getTotalWorldTime % 40 == 0 && block.getLightValue(world, x, y, z) > 0) {
|
if (Settings.get.periodicallyForceLightUpdate && world.getTotalWorldTime % 40 == 0 && block.getLightValue(world, x, y, z) > 0) {
|
||||||
world.markBlockForUpdate(x, y, z)
|
world.markBlockForUpdate(x, y, z)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -18,5 +18,5 @@ object UpgradeNavigation extends Item {
|
|||||||
|
|
||||||
override def slot(stack: ItemStack) = Slot.Upgrade
|
override def slot(stack: ItemStack) = Slot.Upgrade
|
||||||
|
|
||||||
override def tier(stack: ItemStack) = Tier.Three
|
override def tier(stack: ItemStack) = Tier.Two
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user