Merge pull request #104 from Chainmail-Studios/shnup

Shnup
Mixinors · Jun 25, 2020 · e3174f6 · e3174f6
2 parents 966de9b + ce0f456
commit e3174f6
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 0 deletions.
diff --git a/src/main/java/com/github/chainmailstudios/astromine/registry/AstromineItems.java b/src/main/java/com/github/chainmailstudios/astromine/registry/AstromineItems.java
@@ -33,6 +33,7 @@
 public class AstromineItems {
 	// Spawn eggs
 	public static final Item SPACE_SLIME_SPAWN_EGG = register("space_slime_spawn_egg", new UncoloredSpawnEggItem(AstromineEntityTypes.SPACE_SLIME, getBasicSettings()));
+	public static final Item ROCKET = register("rocket", new UncoloredSpawnEggItem(AstromineEntityTypes.ROCKET, getBasicSettings()));
 
 	// Misc materials
 	public static final Item SPACE_SLIME_BALL = register("space_slime_ball", new Item(getBasicSettings()));

diff --git a/src/main/resources/assets/astromine/lang/en_us.json b/src/main/resources/assets/astromine/lang/en_us.json
@@ -182,6 +182,7 @@
   "item.astromine.space_slime_ball": "Space Slimeball",
   "item.astromine.manual": "Astromine Manual",
   "item.astromine.yeast": "Yeast",
+  "item.astromine.rocket": "Rocket",
   "item.minecraft.potion.effect.rocket_fuel": "Rocket Fuel Bottle",
   "item.minecraft.splash_potion.effect.rocket_fuel": "Splash Rocket Fuel Bottle",
   "item.minecraft.lingering_potion.effect.rocket_fuel": "Lingering Rocket Fuel Bottle",

diff --git a/src/main/resources/assets/astromine/models/item/meteor_spawner.json b/src/main/resources/assets/astromine/models/item/meteor_spawner.json
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "astromine:item/thing"
+  }
+}
diff --git a/src/main/resources/assets/astromine/models/item/rocket.json b/src/main/resources/assets/astromine/models/item/rocket.json
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "astromine:item/rocket"
+  }
+}
diff --git a/src/main/resources/assets/astromine/textures/item/thing.png b/src/main/resources/assets/astromine/textures/item/thing.png