mirror of
https://git.huckle.dev/Huckles-Minecraft-Archive/PCK-Studio.git
synced 2026-05-23 13:27:44 +00:00
Added Custom Color support for specific tiles
-Custom Color Tiles are Leather Armor, Potion (Overlay) / Potion Contents, Leather Horse Armor, and Cauldron Water
This commit is contained in:
MattN-L
129
PCK-Studio/Forms/Editor/TextureAtlasEditor.Designer.cs
generated
129
PCK-Studio/Forms/Editor/TextureAtlasEditor.Designer.cs
generated
@@ -37,13 +37,16 @@
|
||||
this.viewToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.applyColorMaskToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.playAnimationsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.sToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
|
||||
this.originalPictureBox = new PckStudio.ToolboxItems.InterpolationPictureBox();
|
||||
this.selectTilePictureBox = new PckStudio.ToolboxItems.AnimationPictureBox();
|
||||
this.replaceButton = new MetroFramework.Controls.MetroButton();
|
||||
this.animationButton = new MetroFramework.Controls.MetroButton();
|
||||
this.tileNameLabel = new MetroFramework.Controls.MetroLabel();
|
||||
this.variantComboBox = new MetroFramework.Controls.MetroComboBox();
|
||||
this.setColorButton = new MetroFramework.Controls.MetroButton();
|
||||
this.animationButton = new MetroFramework.Controls.MetroButton();
|
||||
this.clearColorButton = new MetroFramework.Controls.MetroButton();
|
||||
this.menuStrip1.SuspendLayout();
|
||||
this.tableLayoutPanel1.SuspendLayout();
|
||||
((System.ComponentModel.ISupportInitialize)(this.originalPictureBox)).BeginInit();
|
||||
@@ -56,9 +59,9 @@
|
||||
| System.Windows.Forms.AnchorStyles.Left)
|
||||
| System.Windows.Forms.AnchorStyles.Right)));
|
||||
this.variantLabel.AutoSize = true;
|
||||
this.variantLabel.Location = new System.Drawing.Point(3, 254);
|
||||
this.variantLabel.Location = new System.Drawing.Point(3, 232);
|
||||
this.variantLabel.Name = "variantLabel";
|
||||
this.variantLabel.Size = new System.Drawing.Size(56, 28);
|
||||
this.variantLabel.Size = new System.Drawing.Size(55, 25);
|
||||
this.variantLabel.TabIndex = 18;
|
||||
this.variantLabel.Text = "Variant:";
|
||||
this.variantLabel.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
|
||||
@@ -69,7 +72,8 @@
|
||||
this.menuStrip1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(20)))), ((int)(((byte)(20)))), ((int)(((byte)(20)))));
|
||||
this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
|
||||
this.fileToolStripMenuItem,
|
||||
this.viewToolStripMenuItem});
|
||||
this.viewToolStripMenuItem,
|
||||
this.sToolStripMenuItem});
|
||||
this.menuStrip1.Location = new System.Drawing.Point(20, 60);
|
||||
this.menuStrip1.Name = "menuStrip1";
|
||||
this.menuStrip1.Size = new System.Drawing.Size(590, 24);
|
||||
@@ -131,31 +135,45 @@
|
||||
this.playAnimationsToolStripMenuItem.Text = "Play Animations";
|
||||
this.playAnimationsToolStripMenuItem.CheckedChanged += new System.EventHandler(this.playAnimationsToolStripMenuItem_CheckedChanged);
|
||||
//
|
||||
// sToolStripMenuItem
|
||||
//
|
||||
this.sToolStripMenuItem.Name = "sToolStripMenuItem";
|
||||
this.sToolStripMenuItem.Size = new System.Drawing.Size(24, 20);
|
||||
this.sToolStripMenuItem.Text = "s";
|
||||
//
|
||||
// tableLayoutPanel1
|
||||
//
|
||||
this.tableLayoutPanel1.AutoSize = true;
|
||||
this.tableLayoutPanel1.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
|
||||
this.tableLayoutPanel1.ColumnCount = 3;
|
||||
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 10.52632F));
|
||||
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 26.31579F));
|
||||
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 63.15789F));
|
||||
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 10.43842F));
|
||||
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 26.09603F));
|
||||
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 63.46555F));
|
||||
this.tableLayoutPanel1.Controls.Add(this.originalPictureBox, 2, 0);
|
||||
this.tableLayoutPanel1.Controls.Add(this.selectTilePictureBox, 0, 0);
|
||||
this.tableLayoutPanel1.Controls.Add(this.replaceButton, 0, 5);
|
||||
this.tableLayoutPanel1.Controls.Add(this.animationButton, 0, 4);
|
||||
this.tableLayoutPanel1.Controls.Add(this.replaceButton, 0, 6);
|
||||
this.tableLayoutPanel1.Controls.Add(this.tileNameLabel, 0, 1);
|
||||
this.tableLayoutPanel1.Controls.Add(this.variantComboBox, 1, 2);
|
||||
this.tableLayoutPanel1.Controls.Add(this.variantLabel, 0, 2);
|
||||
this.tableLayoutPanel1.Controls.Add(this.setColorButton, 0, 4);
|
||||
this.tableLayoutPanel1.Controls.Add(this.animationButton, 1, 6);
|
||||
this.tableLayoutPanel1.Controls.Add(this.clearColorButton, 1, 4);
|
||||
this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill;
|
||||
this.tableLayoutPanel1.Location = new System.Drawing.Point(20, 84);
|
||||
this.tableLayoutPanel1.Name = "tableLayoutPanel1";
|
||||
this.tableLayoutPanel1.RowCount = 6;
|
||||
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 40F));
|
||||
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 5F));
|
||||
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 5F));
|
||||
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 40F));
|
||||
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 5F));
|
||||
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 5F));
|
||||
this.tableLayoutPanel1.RowCount = 7;
|
||||
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 38.09524F));
|
||||
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 4.761905F));
|
||||
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 4.761905F));
|
||||
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 38.09524F));
|
||||
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 4.761905F));
|
||||
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 4.761905F));
|
||||
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 4.761905F));
|
||||
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F));
|
||||
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F));
|
||||
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F));
|
||||
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F));
|
||||
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F));
|
||||
this.tableLayoutPanel1.Size = new System.Drawing.Size(590, 565);
|
||||
this.tableLayoutPanel1.TabIndex = 17;
|
||||
//
|
||||
@@ -164,10 +182,10 @@
|
||||
this.originalPictureBox.BackColor = System.Drawing.Color.Transparent;
|
||||
this.originalPictureBox.Dock = System.Windows.Forms.DockStyle.Fill;
|
||||
this.originalPictureBox.InterpolationMode = System.Drawing.Drawing2D.InterpolationMode.NearestNeighbor;
|
||||
this.originalPictureBox.Location = new System.Drawing.Point(220, 3);
|
||||
this.originalPictureBox.Location = new System.Drawing.Point(217, 3);
|
||||
this.originalPictureBox.Name = "originalPictureBox";
|
||||
this.tableLayoutPanel1.SetRowSpan(this.originalPictureBox, 6);
|
||||
this.originalPictureBox.Size = new System.Drawing.Size(367, 559);
|
||||
this.tableLayoutPanel1.SetRowSpan(this.originalPictureBox, 7);
|
||||
this.originalPictureBox.Size = new System.Drawing.Size(370, 533);
|
||||
this.originalPictureBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
|
||||
this.originalPictureBox.TabIndex = 4;
|
||||
this.originalPictureBox.TabStop = false;
|
||||
@@ -186,7 +204,7 @@
|
||||
this.selectTilePictureBox.InterpolationMode = System.Drawing.Drawing2D.InterpolationMode.NearestNeighbor;
|
||||
this.selectTilePictureBox.Location = new System.Drawing.Point(3, 3);
|
||||
this.selectTilePictureBox.Name = "selectTilePictureBox";
|
||||
this.selectTilePictureBox.Size = new System.Drawing.Size(211, 220);
|
||||
this.selectTilePictureBox.Size = new System.Drawing.Size(208, 201);
|
||||
this.selectTilePictureBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
|
||||
this.selectTilePictureBox.TabIndex = 0;
|
||||
this.selectTilePictureBox.TabStop = false;
|
||||
@@ -198,39 +216,24 @@
|
||||
| System.Windows.Forms.AnchorStyles.Right)));
|
||||
this.replaceButton.AutoSize = true;
|
||||
this.tableLayoutPanel1.SetColumnSpan(this.replaceButton, 2);
|
||||
this.replaceButton.Location = new System.Drawing.Point(3, 539);
|
||||
this.replaceButton.Location = new System.Drawing.Point(3, 517);
|
||||
this.replaceButton.Name = "replaceButton";
|
||||
this.replaceButton.Size = new System.Drawing.Size(211, 23);
|
||||
this.replaceButton.Size = new System.Drawing.Size(208, 19);
|
||||
this.replaceButton.TabIndex = 14;
|
||||
this.replaceButton.Text = "Replace";
|
||||
this.replaceButton.Theme = MetroFramework.MetroThemeStyle.Dark;
|
||||
this.replaceButton.UseSelectable = true;
|
||||
this.replaceButton.Click += new System.EventHandler(this.replaceButton_Click);
|
||||
//
|
||||
// animationButton
|
||||
//
|
||||
this.animationButton.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)
|
||||
| System.Windows.Forms.AnchorStyles.Right)));
|
||||
this.animationButton.AutoSize = true;
|
||||
this.tableLayoutPanel1.SetColumnSpan(this.animationButton, 2);
|
||||
this.animationButton.Location = new System.Drawing.Point(3, 511);
|
||||
this.animationButton.Name = "animationButton";
|
||||
this.animationButton.Size = new System.Drawing.Size(211, 22);
|
||||
this.animationButton.TabIndex = 16;
|
||||
this.animationButton.Text = "Animation";
|
||||
this.animationButton.Theme = MetroFramework.MetroThemeStyle.Dark;
|
||||
this.animationButton.UseSelectable = true;
|
||||
this.animationButton.Click += new System.EventHandler(this.animationButton_Click);
|
||||
//
|
||||
// tileNameLabel
|
||||
//
|
||||
this.tileNameLabel.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)
|
||||
| System.Windows.Forms.AnchorStyles.Right)));
|
||||
this.tileNameLabel.AutoSize = true;
|
||||
this.tableLayoutPanel1.SetColumnSpan(this.tileNameLabel, 2);
|
||||
this.tileNameLabel.Location = new System.Drawing.Point(3, 235);
|
||||
this.tileNameLabel.Location = new System.Drawing.Point(3, 213);
|
||||
this.tileNameLabel.Name = "tileNameLabel";
|
||||
this.tileNameLabel.Size = new System.Drawing.Size(211, 19);
|
||||
this.tileNameLabel.Size = new System.Drawing.Size(208, 19);
|
||||
this.tileNameLabel.TabIndex = 19;
|
||||
this.tileNameLabel.Text = "TileName";
|
||||
this.tileNameLabel.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
|
||||
@@ -242,14 +245,55 @@
|
||||
this.variantComboBox.Enabled = false;
|
||||
this.variantComboBox.FormattingEnabled = true;
|
||||
this.variantComboBox.ItemHeight = 23;
|
||||
this.variantComboBox.Location = new System.Drawing.Point(65, 257);
|
||||
this.variantComboBox.Location = new System.Drawing.Point(64, 235);
|
||||
this.variantComboBox.Name = "variantComboBox";
|
||||
this.variantComboBox.Size = new System.Drawing.Size(149, 29);
|
||||
this.variantComboBox.Size = new System.Drawing.Size(147, 29);
|
||||
this.variantComboBox.TabIndex = 17;
|
||||
this.variantComboBox.Theme = MetroFramework.MetroThemeStyle.Dark;
|
||||
this.variantComboBox.UseSelectable = true;
|
||||
this.variantComboBox.SelectedIndexChanged += new System.EventHandler(this.variantComboBox_SelectedIndexChanged);
|
||||
//
|
||||
// setColorButton
|
||||
//
|
||||
this.setColorButton.Anchor = System.Windows.Forms.AnchorStyles.Left;
|
||||
this.tableLayoutPanel1.SetColumnSpan(this.setColorButton, 2);
|
||||
this.setColorButton.Location = new System.Drawing.Point(3, 467);
|
||||
this.setColorButton.Name = "setColorButton";
|
||||
this.setColorButton.Size = new System.Drawing.Size(208, 19);
|
||||
this.setColorButton.TabIndex = 25;
|
||||
this.setColorButton.Text = "Set Custom Colour";
|
||||
this.setColorButton.Theme = MetroFramework.MetroThemeStyle.Dark;
|
||||
this.setColorButton.UseSelectable = true;
|
||||
this.setColorButton.Click += new System.EventHandler(this.setColorButton_Click);
|
||||
//
|
||||
// animationButton
|
||||
//
|
||||
this.animationButton.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)
|
||||
| System.Windows.Forms.AnchorStyles.Right)));
|
||||
this.animationButton.AutoSize = true;
|
||||
this.tableLayoutPanel1.SetColumnSpan(this.animationButton, 2);
|
||||
this.animationButton.Location = new System.Drawing.Point(3, 542);
|
||||
this.animationButton.Name = "animationButton";
|
||||
this.animationButton.Size = new System.Drawing.Size(208, 20);
|
||||
this.animationButton.TabIndex = 16;
|
||||
this.animationButton.Text = "Animation";
|
||||
this.animationButton.Theme = MetroFramework.MetroThemeStyle.Dark;
|
||||
this.animationButton.UseSelectable = true;
|
||||
this.animationButton.Click += new System.EventHandler(this.animationButton_Click);
|
||||
//
|
||||
// clearColorButton
|
||||
//
|
||||
this.clearColorButton.Anchor = System.Windows.Forms.AnchorStyles.Left;
|
||||
this.tableLayoutPanel1.SetColumnSpan(this.clearColorButton, 2);
|
||||
this.clearColorButton.Location = new System.Drawing.Point(3, 492);
|
||||
this.clearColorButton.Name = "clearColorButton";
|
||||
this.clearColorButton.Size = new System.Drawing.Size(208, 19);
|
||||
this.clearColorButton.TabIndex = 24;
|
||||
this.clearColorButton.Text = "Clear Custom Colour";
|
||||
this.clearColorButton.Theme = MetroFramework.MetroThemeStyle.Dark;
|
||||
this.clearColorButton.UseSelectable = true;
|
||||
this.clearColorButton.Click += new System.EventHandler(this.clearColorButton_Click);
|
||||
//
|
||||
// TextureAtlasEditor
|
||||
//
|
||||
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
|
||||
@@ -294,5 +338,8 @@
|
||||
private System.Windows.Forms.ToolStripMenuItem playAnimationsToolStripMenuItem;
|
||||
private MetroFramework.Controls.MetroLabel tileNameLabel;
|
||||
private MetroFramework.Controls.MetroLabel variantLabel;
|
||||
private MetroFramework.Controls.MetroButton clearColorButton;
|
||||
private MetroFramework.Controls.MetroButton setColorButton;
|
||||
private System.Windows.Forms.ToolStripMenuItem sToolStripMenuItem;
|
||||
}
|
||||
}
|
||||
@@ -164,8 +164,11 @@ namespace PckStudio.Forms.Editor
|
||||
selectTilePictureBox.Start(animation);
|
||||
}
|
||||
|
||||
if (dataTile.Tile.HasColourEntry)
|
||||
if (setColorButton.Enabled = clearColorButton.Enabled = dataTile.Tile.HasColourEntry)
|
||||
{
|
||||
setColorButton.Enabled = clearColorButton.Enabled = dataTile.Tile.ColourEntry.HasCustomColour;
|
||||
clearColorButton.Enabled = false;
|
||||
|
||||
variantComboBox.Enabled = variantLabel.Visible = variantComboBox.Visible = dataTile.Tile.ColourEntry.Variants.Length > 1;
|
||||
|
||||
if (dataTile.Tile.ColourEntry.IsWaterColour && _colourTable.WaterColors.Count > 0)
|
||||
@@ -472,5 +475,51 @@ namespace PckStudio.Forms.Editor
|
||||
if (selectTilePictureBox.IsPlaying)
|
||||
selectTilePictureBox.Stop();
|
||||
}
|
||||
|
||||
private void setColorButton_Click(object sender, EventArgs e)
|
||||
{
|
||||
ColorDialog colorPick = new ColorDialog();
|
||||
colorPick.AllowFullOpen = true;
|
||||
colorPick.AnyColor = true;
|
||||
colorPick.SolidColorOnly = true;
|
||||
|
||||
// custom colors are read as BGR for some reason, so hex values are "backwards"
|
||||
// values below are the default Minecraft dyed leather armor values for convenience
|
||||
|
||||
colorPick.CustomColors = new int[] {
|
||||
0x262EB0, // Red
|
||||
0x1D80F9, // Orange
|
||||
0x3DD8FE, // Yellow
|
||||
0x1FC780, // Lime
|
||||
0x167C5E, // Green
|
||||
0xDAB33A, // Light Blue
|
||||
0x9C9C16, // Cyan
|
||||
0xAA443C, // Blue
|
||||
0xB83289, // Purple
|
||||
0xBD4EC7, // Magenta
|
||||
0xAA8BF3, // Pink
|
||||
0xFEFFF9, // White
|
||||
0x979D9D, // Light Gray
|
||||
0x524F47, // Gray
|
||||
0x211D1D, // Black
|
||||
0x325483 // Brown
|
||||
};
|
||||
|
||||
if (colorPick.ShowDialog() != DialogResult.OK) return;
|
||||
|
||||
selectTilePictureBox.BlendColor = colorPick.Color;
|
||||
selectTilePictureBox.Image = dataTile.Texture;
|
||||
variantComboBox.Enabled = false;
|
||||
clearColorButton.Enabled = true;
|
||||
}
|
||||
|
||||
private void clearColorButton_Click(object sender, EventArgs e)
|
||||
{
|
||||
variantComboBox.Enabled = true;
|
||||
|
||||
variantComboBox_SelectedIndexChanged(sender, e);
|
||||
|
||||
clearColorButton.Enabled = false;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -15,6 +15,9 @@ namespace PckStudio.Internal.Json
|
||||
[JsonProperty("isWaterColour", DefaultValueHandling = DefaultValueHandling.Populate)]
|
||||
public bool IsWaterColour { get; set; }
|
||||
|
||||
[JsonProperty("hasCustomColour", DefaultValueHandling = DefaultValueHandling.Populate)]
|
||||
public bool HasCustomColour { get; set; }
|
||||
|
||||
[JsonProperty("variants", DefaultValueHandling = DefaultValueHandling.Populate)]
|
||||
public string[] Variants { get; set; }
|
||||
}
|
||||
|
||||
@@ -7,7 +7,6 @@
|
||||
"displayName": "Grass Block (Top)",
|
||||
"hasColourEntry": true,
|
||||
"colourEntry": {
|
||||
"isWaterColour": false,
|
||||
"defaultName": "Grass_Common",
|
||||
"variants": [
|
||||
"Grass_Common",
|
||||
@@ -170,7 +169,6 @@
|
||||
"displayName": "Grass Side (Overlay)",
|
||||
"hasColourEntry": true,
|
||||
"colourEntry": {
|
||||
"isWaterColour": false,
|
||||
"defaultName": "Grass_Common",
|
||||
"variants": [
|
||||
"Grass_Common",
|
||||
@@ -185,7 +183,6 @@
|
||||
"displayName": "Tall Grass",
|
||||
"hasColourEntry": true,
|
||||
"colourEntry": {
|
||||
"isWaterColour": false,
|
||||
"defaultName": "Grass_Common",
|
||||
"variants": [
|
||||
"Grass_Common",
|
||||
@@ -248,7 +245,6 @@
|
||||
"displayName": "Oak Leaves",
|
||||
"hasColourEntry": true,
|
||||
"colourEntry": {
|
||||
"isWaterColour": false,
|
||||
"defaultName": "Foliage_Default",
|
||||
"variants": [
|
||||
"Foliage_Default",
|
||||
@@ -264,7 +260,6 @@
|
||||
"displayName": "Oak Leaves (Opaque)",
|
||||
"hasColourEntry": true,
|
||||
"colourEntry": {
|
||||
"isWaterColour": false,
|
||||
"defaultName": "Foliage_Default",
|
||||
"variants": [
|
||||
"Foliage_Default",
|
||||
@@ -288,7 +283,6 @@
|
||||
"displayName": "Fern",
|
||||
"hasColourEntry": true,
|
||||
"colourEntry": {
|
||||
"isWaterColour": false,
|
||||
"defaultName": "Grass_Common",
|
||||
"variants": [
|
||||
"Grass_Common",
|
||||
@@ -524,7 +518,6 @@
|
||||
"displayName": "Stem",
|
||||
"hasColourEntry": true,
|
||||
"colourEntry": {
|
||||
"isWaterColour": false,
|
||||
"defaultName": "Tile_StemMin",
|
||||
"variants": [
|
||||
"Tile_StemMin",
|
||||
@@ -597,7 +590,6 @@
|
||||
"displayName": "Stem (Attached)",
|
||||
"hasColourEntry": true,
|
||||
"colourEntry": {
|
||||
"isWaterColour": false,
|
||||
"defaultName": "Tile_StemMin",
|
||||
"variants": [
|
||||
"Tile_StemMin",
|
||||
@@ -626,7 +618,6 @@
|
||||
"displayName": "Spruce Leaves",
|
||||
"hasColourEntry": true,
|
||||
"colourEntry": {
|
||||
"isWaterColour": false,
|
||||
"defaultName": "Foliage_Evergreen",
|
||||
"variants": [
|
||||
"Foliage_Default",
|
||||
@@ -642,7 +633,6 @@
|
||||
"displayName": "Spruce Leaves (Opaque)",
|
||||
"hasColourEntry": true,
|
||||
"colourEntry": {
|
||||
"isWaterColour": false,
|
||||
"defaultName": "Foliage_Evergreen",
|
||||
"variants": [
|
||||
"Foliage_Default",
|
||||
@@ -694,7 +684,6 @@
|
||||
"displayName": "Vines",
|
||||
"hasColourEntry": true,
|
||||
"colourEntry": {
|
||||
"isWaterColour": false,
|
||||
"defaultName": "Foliage_Default",
|
||||
"variants": [
|
||||
"Foliage_Default",
|
||||
@@ -790,7 +779,6 @@
|
||||
"displayName": "Redstone Dust (Cross)",
|
||||
"hasColourEntry": true,
|
||||
"colourEntry": {
|
||||
"isWaterColour": false,
|
||||
"defaultName": "Tile_RedstoneDust",
|
||||
"variants": [
|
||||
"Tile_RedstoneDust",
|
||||
@@ -805,7 +793,6 @@
|
||||
"displayName": "Redstone Dust (Line)",
|
||||
"hasColourEntry": true,
|
||||
"colourEntry": {
|
||||
"isWaterColour": false,
|
||||
"defaultName": "Tile_RedstoneDust",
|
||||
"variants": [
|
||||
"Tile_RedstoneDust",
|
||||
@@ -940,7 +927,6 @@
|
||||
"displayName": "Jungle Leaves",
|
||||
"hasColourEntry": true,
|
||||
"colourEntry": {
|
||||
"isWaterColour": false,
|
||||
"defaultName": "Foliage_Default",
|
||||
"variants": [
|
||||
"Foliage_Default",
|
||||
@@ -956,7 +942,6 @@
|
||||
"displayName": "Jungle Leaves (Opaque)",
|
||||
"hasColourEntry": true,
|
||||
"colourEntry": {
|
||||
"isWaterColour": false,
|
||||
"defaultName": "Foliage_Default",
|
||||
"variants": [
|
||||
"Foliage_Default",
|
||||
@@ -1554,7 +1539,6 @@
|
||||
"displayName": "Large Fern (Top)",
|
||||
"hasColourEntry": true,
|
||||
"colourEntry": {
|
||||
"isWaterColour": false,
|
||||
"defaultName": "Grass_Common",
|
||||
"variants": [
|
||||
"Grass_Common",
|
||||
@@ -1569,7 +1553,6 @@
|
||||
"displayName": "Double Tall Grass (Top)",
|
||||
"hasColourEntry": true,
|
||||
"colourEntry": {
|
||||
"isWaterColour": false,
|
||||
"defaultName": "Grass_Common",
|
||||
"variants": [
|
||||
"Grass_Common",
|
||||
@@ -1620,7 +1603,6 @@
|
||||
"displayName": "Acacia Leaves",
|
||||
"hasColourEntry": true,
|
||||
"colourEntry": {
|
||||
"isWaterColour": false,
|
||||
"defaultName": "Foliage_Default",
|
||||
"variants": [
|
||||
"Foliage_Default",
|
||||
@@ -1636,7 +1618,6 @@
|
||||
"displayName": "Acacia Leaves (Opaque)",
|
||||
"hasColourEntry": true,
|
||||
"colourEntry": {
|
||||
"isWaterColour": false,
|
||||
"defaultName": "Foliage_Default",
|
||||
"variants": [
|
||||
"Foliage_Default",
|
||||
@@ -1664,7 +1645,6 @@
|
||||
"displayName": "Large Fern (Bottom)",
|
||||
"hasColourEntry": true,
|
||||
"colourEntry": {
|
||||
"isWaterColour": false,
|
||||
"defaultName": "Grass_Common",
|
||||
"variants": [
|
||||
"Grass_Common",
|
||||
@@ -1679,7 +1659,6 @@
|
||||
"displayName": "Double Tall Grass (Bottom)",
|
||||
"hasColourEntry": true,
|
||||
"colourEntry": {
|
||||
"isWaterColour": false,
|
||||
"defaultName": "Grass_Common",
|
||||
"variants": [
|
||||
"Grass_Common",
|
||||
@@ -1730,7 +1709,6 @@
|
||||
"displayName": "Dark Oak Leaves",
|
||||
"hasColourEntry": true,
|
||||
"colourEntry": {
|
||||
"isWaterColour": false,
|
||||
"defaultName": "Foliage_Default",
|
||||
"variants": [
|
||||
"Foliage_Default",
|
||||
@@ -1746,7 +1724,6 @@
|
||||
"displayName": "Dark Oak Leaves (Opaque)",
|
||||
"hasColourEntry": true,
|
||||
"colourEntry": {
|
||||
"isWaterColour": false,
|
||||
"defaultName": "Foliage_Default",
|
||||
"variants": [
|
||||
"Foliage_Default",
|
||||
@@ -1818,7 +1795,6 @@
|
||||
"displayName": "Birch Leaves",
|
||||
"hasColourEntry": true,
|
||||
"colourEntry": {
|
||||
"isWaterColour": false,
|
||||
"defaultName": "Foliage_Birch",
|
||||
"variants": [
|
||||
"Foliage_Default",
|
||||
@@ -1834,7 +1810,6 @@
|
||||
"displayName": "Birch Leaves (Opaque)",
|
||||
"hasColourEntry": true,
|
||||
"colourEntry": {
|
||||
"isWaterColour": false,
|
||||
"defaultName": "Foliage_Birch",
|
||||
"variants": [
|
||||
"Foliage_Default",
|
||||
@@ -2318,7 +2293,7 @@
|
||||
"displayName": "Cauldron Water",
|
||||
"hasColourEntry": true,
|
||||
"colourEntry": {
|
||||
"isWaterColour": false,
|
||||
"hasCustomColour": true,
|
||||
"defaultName": "Cauldron_Water",
|
||||
"variants": [
|
||||
"Cauldron_Water",
|
||||
@@ -2924,7 +2899,7 @@
|
||||
"displayName": "Leather Cap",
|
||||
"hasColourEntry": true,
|
||||
"colourEntry": {
|
||||
"isWaterColour": false,
|
||||
"hasCustomColour": true,
|
||||
"defaultName": "Armour_Default_Leather_Colour",
|
||||
"variants": [ "Armour_Default_Leather_Colour" ]
|
||||
}
|
||||
@@ -2994,7 +2969,7 @@
|
||||
"displayName": "Leather Tunic",
|
||||
"hasColourEntry": true,
|
||||
"colourEntry": {
|
||||
"isWaterColour": false,
|
||||
"hasCustomColour": true,
|
||||
"defaultName": "Armour_Default_Leather_Colour",
|
||||
"variants": [ "Armour_Default_Leather_Colour" ]
|
||||
}
|
||||
@@ -3064,7 +3039,7 @@
|
||||
"displayName": "Leather Pants",
|
||||
"hasColourEntry": true,
|
||||
"colourEntry": {
|
||||
"isWaterColour": false,
|
||||
"hasCustomColour": true,
|
||||
"defaultName": "Armour_Default_Leather_Colour",
|
||||
"variants": [ "Armour_Default_Leather_Colour" ]
|
||||
}
|
||||
@@ -3134,7 +3109,7 @@
|
||||
"displayName": "Leather Boots",
|
||||
"hasColourEntry": true,
|
||||
"colourEntry": {
|
||||
"isWaterColour": false,
|
||||
"hasCustomColour": true,
|
||||
"defaultName": "Armour_Default_Leather_Colour",
|
||||
"variants": [ "Armour_Default_Leather_Colour" ]
|
||||
}
|
||||
@@ -3512,8 +3487,8 @@
|
||||
"displayName": "Potion (Overlay)",
|
||||
"hasColourEntry": true,
|
||||
"colourEntry": {
|
||||
"isWaterColour": false,
|
||||
"defaultName": "Potion_BaseColour",
|
||||
"hasCustomColour": true,
|
||||
"variants": [
|
||||
"Potion_BaseColour",
|
||||
"Effect_MovementSpeed",
|
||||
@@ -3664,7 +3639,6 @@
|
||||
"displayName": "Bed (Overlay)",
|
||||
"hasColourEntry": true,
|
||||
"colourEntry": {
|
||||
"isWaterColour": false,
|
||||
"defaultName": "Bed_White",
|
||||
"variants": [
|
||||
"Bed_Black",
|
||||
@@ -3899,7 +3873,7 @@
|
||||
"displayName": "Leather Horse Armor",
|
||||
"hasColourEntry": true,
|
||||
"colourEntry": {
|
||||
"isWaterColour": false,
|
||||
"hasCustomColour": true,
|
||||
"defaultName": "Armour_Default_Leather_Colour",
|
||||
"variants": [ "Armour_Default_Leather_Colour" ]
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user