Merge pull request #5 from GreenJamesDev/0.4.0.0

0.4.0.0
GreenJamesDev · Jul 9, 2021 · 1e4098c · 1e4098c
2 parents ebe0ddc + 3a8b2ac
commit 1e4098c
Show file tree

Hide file tree

Showing 18 changed files with 2,172 additions and 990 deletions.
diff --git a/RsMapper/Components.json b/RsMapper/Components.json
@@ -236,6 +236,66 @@
             "info": "Emits a redstone signal when struck by lightning.",
             "acceptswire": "no"
 
+        },
+
+        {
+
+            "name": "Straight Rail",
+            "type": "Misc",
+            "image": "\\Imgs\\nrail_straight.png",
+            "info": "A normal rail.",
+            "acceptswire": "no"
+
+        },
+
+        {
+
+            "name": "Curved Rail",
+            "type": "Misc",
+            "image": "\\Imgs\\nrail_bend.png",
+            "info": "A normal rail.",
+            "acceptswire": "no"
+
+        },
+
+        {
+
+            "name": "Powered Rail",
+            "type": "Output",
+            "image": "\\Imgs\\prail.png",
+            "info": "A rail that increases or decreases the speed of minecarts.",
+            "acceptswire": "no"
+
+        },
+
+        {
+
+            "name": "Activator Rail",
+            "type": "Output",
+            "image": "\\Imgs\\arail.png",
+            "info": "Ejects entities from minecarts, primes TNT minecarts, disables hopper minecarts, and activates command block minecarts.",
+            "acceptswire": "no"
+
+        },
+
+        {
+
+            "name": "Detector Rail",
+            "type": "Input",
+            "image": "\\Imgs\\drail.png",
+            "info": "Emits a signal when a minecart is on it.",
+            "acceptswire": "no"
+
+        },
+
+        {
+
+            "name": "Slime Block",
+            "type": "Misc",
+            "image": "\\Imgs\\slime_block.png",
+            "info": "Moves adjacent blocks when pushed or pulled by a piston.",
+            "acceptswire": "no"
+
         }
     ]
 }
diff --git a/RsMapper/Form1.Designer.cs b/RsMapper/Form1.Designer.cs
diff --git a/RsMapper/Form1.cs b/RsMapper/Form1.cs
@@ -353,8 +353,6 @@ public void UnsavedChangesExit()
             CancelFormExit = false;
             UnsavedDialog unsavedDialog = new UnsavedDialog();
 
-            unsavedDialog.Disposed += unsavedDialog_Disposed;
-
             // If there are unsaved changes, show a confirmation dialog and
             // handle the result accordingly.
             if (unsavedChanges == true)
@@ -417,19 +415,6 @@ private void Form1_FormClosing(object sender, FormClosingEventArgs e)
 
         }
 
-        private void unsavedDialog_Disposed(object sender, EventArgs e)
-        {
-
-        }
-
-        protected void panel1_Paint(object sender, PaintEventArgs e)
-        {
-
-
-
-        }
-
-
 
         private void documentationToolStripMenuItem_Click(object sender, EventArgs e)
         {
@@ -466,17 +451,46 @@ private void panel1_MouseDown(object sender, MouseEventArgs e)
 
                     // If the component is a command block, show the set command
                     // dialog and give the command block the command.
-                    if (listvi.Text == "Command Block")
+                    CommandEnter ce;
+                    switch (listvi.Text)
                     {
 
-                        CommandEnter ce = new CommandEnter();
 
-                        if (ce.ShowDialog() == DialogResult.OK)
-                        {
+                        case "Command Block":
+                            ce = new CommandEnter("Enter Command");
 
-                            picb.ComponentTag = ce.Command;
-                        }
-                    } 
+                            if (ce.ShowDialog() == DialogResult.OK)
+                            {
+
+                                picb.ComponentTag = ce.Command;
+                            }
+                            ce.Dispose();
+                            break;
+                        case "Dropper":
+                            ce = new CommandEnter("Enter Dropper Contents");
+
+                            if (ce.ShowDialog() == DialogResult.OK)
+                            {
+
+                                picb.ComponentTag = ce.Command;
+                            }
+                            ce.Dispose();
+                            break;
+                        case "Dispenser":
+                            ce = new CommandEnter("Enter Dispenser Contents");
+
+                            if (ce.ShowDialog() == DialogResult.OK)
+                            {
+
+                                picb.ComponentTag = ce.Command;
+                            }
+                            ce.Dispose();
+                            break;
+                        default:
+
+                            break;
+
+                    }
 
                     // Set rect location to a grid location.
                     rect.Location = p;
@@ -526,7 +540,7 @@ private void panel1_MouseDown(object sender, MouseEventArgs e)
 
                     Rectangle rect = new Rectangle();
 
-                    Image src = Rotate(compImg);
+                    Image src = compImg;
 
                     Graphics graphics = Graphics.FromImage(src);
                     graphics.InterpolationMode = InterpolationMode.NearestNeighbor;