From 1833e4e754d4226fae47e25fe76eabd0487bb619 Mon Sep 17 00:00:00 2001 From: TechnoVisionDev Date: Fri, 7 Aug 2020 19:17:58 -0700 Subject: [PATCH] Class name changes --- .../java/com/technovision/tutorial/Tutorial.java | 4 ++-- .../com/technovision/tutorial/init/ModItems.java | 10 +++++----- .../{ModSpawnEgg.java => ModSpawnEggItem.java} | 13 +++---------- .../{PoisonApple.java => PoisonAppleItem.java} | 4 ++-- 4 files changed, 12 insertions(+), 19 deletions(-) rename src/main/java/com/technovision/tutorial/items/{ModSpawnEgg.java => ModSpawnEggItem.java} (74%) rename src/main/java/com/technovision/tutorial/items/{PoisonApple.java => PoisonAppleItem.java} (91%) diff --git a/src/main/java/com/technovision/tutorial/Tutorial.java b/src/main/java/com/technovision/tutorial/Tutorial.java index 74c5200..914d493 100644 --- a/src/main/java/com/technovision/tutorial/Tutorial.java +++ b/src/main/java/com/technovision/tutorial/Tutorial.java @@ -4,7 +4,7 @@ import com.technovision.tutorial.entities.HogEntity; import com.technovision.tutorial.init.ModBlocks; import com.technovision.tutorial.init.ModEntityType; import com.technovision.tutorial.init.ModItems; -import com.technovision.tutorial.items.ModSpawnEgg; +import com.technovision.tutorial.items.ModSpawnEggItem; import net.minecraft.entity.EntityType; import net.minecraft.entity.ai.attributes.GlobalEntityTypeAttributes; import net.minecraft.item.ItemGroup; @@ -57,7 +57,7 @@ public class Tutorial { @SubscribeEvent public static void onRegisterEntities(final RegistryEvent.Register> event) { - ModSpawnEgg.initSpawnEggs(); + ModSpawnEggItem.initSpawnEggs(); } } diff --git a/src/main/java/com/technovision/tutorial/init/ModItems.java b/src/main/java/com/technovision/tutorial/init/ModItems.java index 75bb47b..565c2b2 100644 --- a/src/main/java/com/technovision/tutorial/init/ModItems.java +++ b/src/main/java/com/technovision/tutorial/init/ModItems.java @@ -1,8 +1,8 @@ package com.technovision.tutorial.init; import com.technovision.tutorial.Tutorial; -import com.technovision.tutorial.items.ModSpawnEgg; -import com.technovision.tutorial.items.PoisonApple; +import com.technovision.tutorial.items.ModSpawnEggItem; +import com.technovision.tutorial.items.PoisonAppleItem; import com.technovision.tutorial.util.enums.ModArmorMaterial; import com.technovision.tutorial.util.enums.ModItemTier; import net.minecraft.inventory.EquipmentSlotType; @@ -18,10 +18,10 @@ public class ModItems { // Items public static final RegistryObject RUBY = ITEMS.register("ruby", () -> new Item(new Item.Properties().group(Tutorial.TAB))); - public static final RegistryObject POISON_APPLE = ITEMS.register("poison_apple", PoisonApple::new); + public static final RegistryObject POISON_APPLE = ITEMS.register("poison_apple", PoisonAppleItem::new); - public static final RegistryObject HOG_SPAWN_EGG = ITEMS.register("hog_spawn_egg", - () -> new ModSpawnEgg(ModEntityType.HOG, 0xE1A68B, 0x99593B, new Item.Properties().group(Tutorial.TAB))); + public static final RegistryObject HOG_SPAWN_EGG = ITEMS.register("hog_spawn_egg", + () -> new ModSpawnEggItem(ModEntityType.HOG, 0xE1A68B, 0x99593B, new Item.Properties().group(Tutorial.TAB))); // Block Items public static final RegistryObject RUBY_BLOCK_ITEM = ITEMS.register("ruby_block", diff --git a/src/main/java/com/technovision/tutorial/items/ModSpawnEgg.java b/src/main/java/com/technovision/tutorial/items/ModSpawnEggItem.java similarity index 74% rename from src/main/java/com/technovision/tutorial/items/ModSpawnEgg.java rename to src/main/java/com/technovision/tutorial/items/ModSpawnEggItem.java index 8a0f407..0f52f7d 100644 --- a/src/main/java/com/technovision/tutorial/items/ModSpawnEgg.java +++ b/src/main/java/com/technovision/tutorial/items/ModSpawnEggItem.java @@ -11,7 +11,6 @@ import net.minecraft.item.SpawnEggItem; import net.minecraft.nbt.CompoundNBT; import net.minecraft.util.Direction; import net.minecraftforge.common.util.Lazy; -import net.minecraftforge.common.util.NonNullSupplier; import net.minecraftforge.fml.RegistryObject; import net.minecraftforge.fml.common.ObfuscationReflectionHelper; @@ -19,18 +18,12 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; -public class ModSpawnEgg extends SpawnEggItem { +public class ModSpawnEggItem extends SpawnEggItem { - protected static final List UNADDED_EGGS = new ArrayList(); + protected static final List UNADDED_EGGS = new ArrayList<>(); private final Lazy> entityTypeSupplier; - public ModSpawnEgg(final NonNullSupplier> entityTypeSupplier, final int primaryColour, final int secondaryColour, final Item.Properties properties) { - super(null, primaryColour, secondaryColour, properties); - this.entityTypeSupplier = Lazy.of(entityTypeSupplier::get); - UNADDED_EGGS.add(this); - } - - public ModSpawnEgg(final RegistryObject> entityTypeSupplier, final int primaryColour, final int secondaryColour, final Item.Properties properties) { + public ModSpawnEggItem(final RegistryObject> entityTypeSupplier, final int primaryColour, final int secondaryColour, final Item.Properties properties) { super(null, primaryColour, secondaryColour, properties); this.entityTypeSupplier = Lazy.of(entityTypeSupplier::get); UNADDED_EGGS.add(this); diff --git a/src/main/java/com/technovision/tutorial/items/PoisonApple.java b/src/main/java/com/technovision/tutorial/items/PoisonAppleItem.java similarity index 91% rename from src/main/java/com/technovision/tutorial/items/PoisonApple.java rename to src/main/java/com/technovision/tutorial/items/PoisonAppleItem.java index 73fedbe..082f083 100644 --- a/src/main/java/com/technovision/tutorial/items/PoisonApple.java +++ b/src/main/java/com/technovision/tutorial/items/PoisonAppleItem.java @@ -6,9 +6,9 @@ import net.minecraft.item.Item; import net.minecraft.potion.EffectInstance; import net.minecraft.potion.Effects; -public class PoisonApple extends Item { +public class PoisonAppleItem extends Item { - public PoisonApple() { + public PoisonAppleItem() { super(new Item.Properties() .group(Tutorial.TAB) .food(new Food.Builder()