diff --git a/src/main/resources/assets/opencomputers/models/item/tabletCase.json b/src/main/resources/assets/opencomputers/models/item/tabletCase1.json similarity index 57% rename from src/main/resources/assets/opencomputers/models/item/tabletCase.json rename to src/main/resources/assets/opencomputers/models/item/tabletCase1.json index a613ea177..d5f126c3a 100644 --- a/src/main/resources/assets/opencomputers/models/item/tabletCase.json +++ b/src/main/resources/assets/opencomputers/models/item/tabletCase1.json @@ -1,6 +1,6 @@ { "parent": "opencomputers:item/flat", "textures": { - "layer0": "opencomputers:items/tabletCase" + "layer0": "opencomputers:items/tabletCase1" } } diff --git a/src/main/resources/assets/opencomputers/models/item/tabletCase2.json b/src/main/resources/assets/opencomputers/models/item/tabletCase2.json new file mode 100644 index 000000000..ac3e216e7 --- /dev/null +++ b/src/main/resources/assets/opencomputers/models/item/tabletCase2.json @@ -0,0 +1,6 @@ +{ + "parent": "opencomputers:item/flat", + "textures": { + "layer0": "opencomputers:items/tabletCase2" + } +} diff --git a/src/main/resources/assets/opencomputers/models/item/tabletCaseCreative.json b/src/main/resources/assets/opencomputers/models/item/tabletCaseCreative.json new file mode 100644 index 000000000..def65faa9 --- /dev/null +++ b/src/main/resources/assets/opencomputers/models/item/tabletCaseCreative.json @@ -0,0 +1,6 @@ +{ + "parent": "opencomputers:item/flat", + "textures": { + "layer0": "opencomputers:items/tabletCaseCreative" + } +} diff --git a/src/main/resources/assets/opencomputers/textures/items/TabletCase0.png b/src/main/resources/assets/opencomputers/textures/items/tabletCase1.png similarity index 100% rename from src/main/resources/assets/opencomputers/textures/items/TabletCase0.png rename to src/main/resources/assets/opencomputers/textures/items/tabletCase1.png diff --git a/src/main/resources/assets/opencomputers/textures/items/TabletCase1.png b/src/main/resources/assets/opencomputers/textures/items/tabletCase2.png similarity index 100% rename from src/main/resources/assets/opencomputers/textures/items/TabletCase1.png rename to src/main/resources/assets/opencomputers/textures/items/tabletCase2.png diff --git a/src/main/resources/assets/opencomputers/textures/items/TabletCase3.png b/src/main/resources/assets/opencomputers/textures/items/tabletCaseCreative.png similarity index 100% rename from src/main/resources/assets/opencomputers/textures/items/TabletCase3.png rename to src/main/resources/assets/opencomputers/textures/items/tabletCaseCreative.png diff --git a/src/main/scala/li/cil/oc/Settings.scala b/src/main/scala/li/cil/oc/Settings.scala index f32d194dc..5ed200ca8 100644 --- a/src/main/scala/li/cil/oc/Settings.scala +++ b/src/main/scala/li/cil/oc/Settings.scala @@ -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 diff --git a/src/main/scala/li/cil/oc/client/renderer/tileentity/DiskDriveRenderer.scala b/src/main/scala/li/cil/oc/client/renderer/tileentity/DiskDriveRenderer.scala index 7d3b7cd6d..0b97ec87c 100644 --- a/src/main/scala/li/cil/oc/client/renderer/tileentity/DiskDriveRenderer.scala +++ b/src/main/scala/li/cil/oc/client/renderer/tileentity/DiskDriveRenderer.scala @@ -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 _ => }