mirror of
https://github.com/MightyPirates/OpenComputers.git
synced 2025-09-14 09:46:53 -04:00
Adjusted tablet case rendering for 1.8 and cleared out setting migrations.
This commit is contained in:
parent
98f76e6507
commit
286c98e438
@ -1,6 +1,6 @@
|
||||
{
|
||||
"parent": "opencomputers:item/flat",
|
||||
"textures": {
|
||||
"layer0": "opencomputers:items/tabletCase"
|
||||
"layer0": "opencomputers:items/tabletCase1"
|
||||
}
|
||||
}
|
@ -0,0 +1,6 @@
|
||||
{
|
||||
"parent": "opencomputers:item/flat",
|
||||
"textures": {
|
||||
"layer0": "opencomputers:items/tabletCase2"
|
||||
}
|
||||
}
|
@ -0,0 +1,6 @@
|
||||
{
|
||||
"parent": "opencomputers:item/flat",
|
||||
"textures": {
|
||||
"layer0": "opencomputers:items/tabletCaseCreative"
|
||||
}
|
||||
}
|
Before Width: | Height: | Size: 400 B After Width: | Height: | Size: 400 B |
Before Width: | Height: | Size: 389 B After Width: | Height: | Size: 389 B |
Before Width: | Height: | Size: 389 B After Width: | Height: | Size: 389 B |
@ -394,36 +394,9 @@ object Settings {
|
||||
}
|
||||
}
|
||||
|
||||
private val configPatches = Array(
|
||||
// Upgrading to version 1.3, increased lower bounds for default RAM sizes
|
||||
// and reworked the way black- and whitelisting works (IP based).
|
||||
VersionRange.createFromVersionSpec("[0.0,1.3-alpha)") -> Array(
|
||||
"computer.ramSizes",
|
||||
"internet.blacklist",
|
||||
"internet.whitelist"
|
||||
),
|
||||
// Upgrading to version 1.3.3, default power consumption of chunk loader
|
||||
// reduced as discussed in #447.
|
||||
VersionRange.createFromVersionSpec("[1.3.0,1.3.3)") -> Array(
|
||||
"power.cost.chunkloaderCost"
|
||||
),
|
||||
// Upgrading to version 1.3.4+, computer.debug category was moved to top
|
||||
// level debug category for more flexibility and some other settings merged
|
||||
// into that new category.
|
||||
VersionRange.createFromVersionSpec("1.3.3") -> Array(
|
||||
"computer.debug",
|
||||
"misc.alwaysTryNative",
|
||||
"misc.verbosePersistenceErrors"
|
||||
),
|
||||
// Upgrading to version 1.3.5, added forgotten check for item stack,
|
||||
// inspection, patch to true to avoid stuff suddenly breaking.
|
||||
VersionRange.createFromVersionSpec("1.3.4") -> Array(
|
||||
"misc.allowItemStackInspection"
|
||||
),
|
||||
// Upgrading to version 1.4.7, reduce default geolyzer noise.
|
||||
VersionRange.createFromVersionSpec("[0.0, 1.4.7)") -> Array(
|
||||
"misc.geolyzerNoise"
|
||||
)
|
||||
// Usage: VersionRange.createFromVersionSpec("[0.0,1.5)") -> Array("computer.ramSizes") will
|
||||
// re-set the value of `computer.ramSizes` if a config saved with a version < 1.5 is loaded.
|
||||
private val configPatches = Array[(VersionRange, Array[String])](
|
||||
)
|
||||
|
||||
// Checks the config version (i.e. the version of the mod the config was
|
||||
|
@ -43,8 +43,8 @@ object DiskDriveRenderer extends TileEntitySpecialRenderer {
|
||||
// This is very 'meh', but item frames do it like this, too!
|
||||
val entity = new EntityItem(drive.world, 0, 0, 0, stack)
|
||||
entity.hoverStart = 0
|
||||
val rm = Minecraft.getMinecraft.getRenderManager
|
||||
rm.renderEntityWithPosYaw(entity, 0, 0, 0, 0, 0)
|
||||
Textures.Block.bind()
|
||||
Minecraft.getMinecraft.getRenderItem.renderItemModel(entity.getEntityItem)
|
||||
GL11.glPopMatrix()
|
||||
case _ =>
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user