Archives/TechnoVisionDev_Forge-Modding-Tutorial-1.16
1
0
Fork 0
mirror of https://github.com/TechnoVisionDev/Forge-Modding-Tutorial-1.16 synced 2024-10-27 20:34:04 +00:00
Code Issues Releases Wiki Activity

Class name changes

Browse Source
This commit is contained in:
TechnoVisionDev 2020-08-07 19:17:58 -07:00
parent 5d48560e72
commit 1833e4e754
4 changed files with 12 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/technovision/tutorial/Tutorial.java
View File

@ -4,7 +4,7 @@ import com.technovision.tutorial.entities.HogEntity;
import com.technovision.tutorial.init.ModBlocks; import com.technovision.tutorial.init.ModBlocks;
import com.technovision.tutorial.init.ModEntityType; import com.technovision.tutorial.init.ModEntityType;
import com.technovision.tutorial.init.ModItems; 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.EntityType;
import net.minecraft.entity.ai.attributes.GlobalEntityTypeAttributes; import net.minecraft.entity.ai.attributes.GlobalEntityTypeAttributes;
import net.minecraft.item.ItemGroup; import net.minecraft.item.ItemGroup;
@ -57,7 +57,7 @@ public class Tutorial {
@SubscribeEvent @SubscribeEvent
public static void onRegisterEntities(final RegistryEvent.Register<EntityType<?>> event) { public static void onRegisterEntities(final RegistryEvent.Register<EntityType<?>> event) {
ModSpawnEgg.initSpawnEggs(); ModSpawnEggItem.initSpawnEggs();
} }
} }

10
src/main/java/com/technovision/tutorial/init/ModItems.java
View File

@ -1,8 +1,8 @@
package com.technovision.tutorial.init; package com.technovision.tutorial.init;
import com.technovision.tutorial.Tutorial; import com.technovision.tutorial.Tutorial;
import com.technovision.tutorial.items.ModSpawnEgg; import com.technovision.tutorial.items.ModSpawnEggItem;
import com.technovision.tutorial.items.PoisonApple; import com.technovision.tutorial.items.PoisonAppleItem;
import com.technovision.tutorial.util.enums.ModArmorMaterial; import com.technovision.tutorial.util.enums.ModArmorMaterial;
import com.technovision.tutorial.util.enums.ModItemTier; import com.technovision.tutorial.util.enums.ModItemTier;
import net.minecraft.inventory.EquipmentSlotType; import net.minecraft.inventory.EquipmentSlotType;
@ -18,10 +18,10 @@ public class ModItems {
// Items // Items
public static final RegistryObject<Item> RUBY = ITEMS.register("ruby", () -> new Item(new Item.Properties().group(Tutorial.TAB))); public static final RegistryObject<Item> RUBY = ITEMS.register("ruby", () -> new Item(new Item.Properties().group(Tutorial.TAB)));
public static final RegistryObject<PoisonApple> POISON_APPLE = ITEMS.register("poison_apple", PoisonApple::new); public static final RegistryObject<PoisonAppleItem> POISON_APPLE = ITEMS.register("poison_apple", PoisonAppleItem::new);
public static final RegistryObject<ModSpawnEgg> HOG_SPAWN_EGG = ITEMS.register("hog_spawn_egg", public static final RegistryObject<ModSpawnEggItem> HOG_SPAWN_EGG = ITEMS.register("hog_spawn_egg",
() -> new ModSpawnEgg(ModEntityType.HOG, 0xE1A68B, 0x99593B, new Item.Properties().group(Tutorial.TAB))); () -> new ModSpawnEggItem(ModEntityType.HOG, 0xE1A68B, 0x99593B, new Item.Properties().group(Tutorial.TAB)));
// Block Items // Block Items
public static final RegistryObject<Item> RUBY_BLOCK_ITEM = ITEMS.register("ruby_block", public static final RegistryObject<Item> RUBY_BLOCK_ITEM = ITEMS.register("ruby_block",

13
src/main/java/com/technovision/tutorial/items/ModSpawnEgg.java → src/main/java/com/technovision/tutorial/items/ModSpawnEggItem.java
View File

@ -11,7 +11,6 @@ import net.minecraft.item.SpawnEggItem;
import net.minecraft.nbt.CompoundNBT; import net.minecraft.nbt.CompoundNBT;
import net.minecraft.util.Direction; import net.minecraft.util.Direction;
import net.minecraftforge.common.util.Lazy; import net.minecraftforge.common.util.Lazy;
import net.minecraftforge.common.util.NonNullSupplier;
import net.minecraftforge.fml.RegistryObject; import net.minecraftforge.fml.RegistryObject;
import net.minecraftforge.fml.common.ObfuscationReflectionHelper; import net.minecraftforge.fml.common.ObfuscationReflectionHelper;
@ -19,18 +18,12 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
public class ModSpawnEgg extends SpawnEggItem { public class ModSpawnEggItem extends SpawnEggItem {
protected static final List<ModSpawnEgg> UNADDED_EGGS = new ArrayList<ModSpawnEgg>(); protected static final List<ModSpawnEggItem> UNADDED_EGGS = new ArrayList<>();
private final Lazy<? extends EntityType<?>> entityTypeSupplier; private final Lazy<? extends EntityType<?>> entityTypeSupplier;
public ModSpawnEgg(final NonNullSupplier<? extends EntityType<?>> entityTypeSupplier, final int primaryColour, final int secondaryColour, final Item.Properties properties) { public ModSpawnEggItem(final RegistryObject<? extends EntityType<?>> 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<? extends EntityType<?>> entityTypeSupplier, final int primaryColour, final int secondaryColour, final Item.Properties properties) {
super(null, primaryColour, secondaryColour, properties); super(null, primaryColour, secondaryColour, properties);
this.entityTypeSupplier = Lazy.of(entityTypeSupplier::get); this.entityTypeSupplier = Lazy.of(entityTypeSupplier::get);
UNADDED_EGGS.add(this); UNADDED_EGGS.add(this);

4
src/main/java/com/technovision/tutorial/items/PoisonApple.java → src/main/java/com/technovision/tutorial/items/PoisonAppleItem.java
View File

@ -6,9 +6,9 @@ import net.minecraft.item.Item;
import net.minecraft.potion.EffectInstance; import net.minecraft.potion.EffectInstance;
import net.minecraft.potion.Effects; import net.minecraft.potion.Effects;
public class PoisonApple extends Item { public class PoisonAppleItem extends Item {
public PoisonApple() { public PoisonAppleItem() {
super(new Item.Properties() super(new Item.Properties()
.group(Tutorial.TAB) .group(Tutorial.TAB)
.food(new Food.Builder() .food(new Food.Builder()