From 8bfe812fe8f12e00b2c73bfaa6b0fbc37dfa5463 Mon Sep 17 00:00:00 2001 From: TechnoVisionDev Date: Wed, 22 Jul 2020 15:09:54 -0700 Subject: [PATCH] Reorganize packages and classes --- .../com/technovision/tutorial/Tutorial.java | 8 ++- .../tutorial/events/ModClientEvents.java | 7 ++- .../technovision/tutorial/init/ModBlocks.java | 20 ++++++ .../technovision/tutorial/init/ModItems.java | 59 +++++++++++++++++ .../tutorial/{ => objects}/blocks/Oven.java | 2 +- .../{ => objects}/blocks/RubyBlock.java | 2 +- .../{ => objects}/blocks/RubyOre.java | 2 +- .../{ => objects}/items/PoisonApple.java | 2 +- .../tutorial/util/RegistryHandler.java | 63 ------------------- .../enums}/ModArmorMaterial.java | 6 +- .../{tools => util/enums}/ModItemTier.java | 6 +- .../tutorial/world/gen/ModOreGen.java | 9 ++- 12 files changed, 102 insertions(+), 84 deletions(-) create mode 100644 src/main/java/com/technovision/tutorial/init/ModBlocks.java create mode 100644 src/main/java/com/technovision/tutorial/init/ModItems.java rename src/main/java/com/technovision/tutorial/{ => objects}/blocks/Oven.java (99%) rename src/main/java/com/technovision/tutorial/{ => objects}/blocks/RubyBlock.java (90%) rename src/main/java/com/technovision/tutorial/{ => objects}/blocks/RubyOre.java (94%) rename src/main/java/com/technovision/tutorial/{ => objects}/items/PoisonApple.java (94%) delete mode 100644 src/main/java/com/technovision/tutorial/util/RegistryHandler.java rename src/main/java/com/technovision/tutorial/{armor => util/enums}/ModArmorMaterial.java (94%) rename src/main/java/com/technovision/tutorial/{tools => util/enums}/ModItemTier.java (89%) diff --git a/src/main/java/com/technovision/tutorial/Tutorial.java b/src/main/java/com/technovision/tutorial/Tutorial.java index b0228a5..c562513 100644 --- a/src/main/java/com/technovision/tutorial/Tutorial.java +++ b/src/main/java/com/technovision/tutorial/Tutorial.java @@ -1,6 +1,7 @@ package com.technovision.tutorial; -import com.technovision.tutorial.util.RegistryHandler; +import com.technovision.tutorial.init.ModBlocks; +import com.technovision.tutorial.init.ModItems; import net.minecraft.item.ItemGroup; import net.minecraft.item.ItemStack; import net.minecraftforge.common.MinecraftForge; @@ -21,7 +22,8 @@ public class Tutorial FMLJavaModLoadingContext.get().getModEventBus().addListener(this::setup); FMLJavaModLoadingContext.get().getModEventBus().addListener(this::doClientStuff); - RegistryHandler.init(); + ModBlocks.BLOCKS.register(FMLJavaModLoadingContext.get().getModEventBus()); + ModItems.ITEMS.register(FMLJavaModLoadingContext.get().getModEventBus()); MinecraftForge.EVENT_BUS.register(this); } @@ -34,7 +36,7 @@ public class Tutorial public static final ItemGroup TAB = new ItemGroup("tutorialTab") { @Override public ItemStack createIcon() { - return new ItemStack(RegistryHandler.RUBY.get()); + return new ItemStack(ModItems.RUBY.get()); } }; diff --git a/src/main/java/com/technovision/tutorial/events/ModClientEvents.java b/src/main/java/com/technovision/tutorial/events/ModClientEvents.java index 5df3239..3bf0fd4 100644 --- a/src/main/java/com/technovision/tutorial/events/ModClientEvents.java +++ b/src/main/java/com/technovision/tutorial/events/ModClientEvents.java @@ -1,7 +1,8 @@ package com.technovision.tutorial.events; import com.technovision.tutorial.Tutorial; -import com.technovision.tutorial.util.RegistryHandler; +import com.technovision.tutorial.init.ModBlocks; +import com.technovision.tutorial.init.ModItems; import net.minecraft.client.gui.screen.inventory.CraftingScreen; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.passive.SheepEntity; @@ -39,13 +40,13 @@ public class ModClientEvents { if (player.getHeldItemMainhand().getItem() == Items.STICK) { Tutorial.LOGGER.info("Player tried to jump with a stick!"); World world = player.getEntityWorld(); - world.setBlockState(player.func_233580_cy_().add(0, -1, 0), RegistryHandler.RUBY_BLOCK.get().getDefaultState()); + world.setBlockState(player.func_233580_cy_().add(0, -1, 0), ModBlocks.RUBY_BLOCK.get().getDefaultState()); } } @SubscribeEvent public static void onDamageSheep(AttackEntityEvent event) { - if (event.getEntityLiving().getHeldItemMainhand().getItem() == RegistryHandler.POISON_APPLE.get()) { + if (event.getEntityLiving().getHeldItemMainhand().getItem() == ModItems.POISON_APPLE.get()) { if (event.getTarget().isAlive()) { LivingEntity target = (LivingEntity) event.getTarget(); if (target instanceof SheepEntity) { diff --git a/src/main/java/com/technovision/tutorial/init/ModBlocks.java b/src/main/java/com/technovision/tutorial/init/ModBlocks.java new file mode 100644 index 0000000..b55692e --- /dev/null +++ b/src/main/java/com/technovision/tutorial/init/ModBlocks.java @@ -0,0 +1,20 @@ +package com.technovision.tutorial.init; + +import com.technovision.tutorial.Tutorial; +import com.technovision.tutorial.objects.blocks.Oven; +import com.technovision.tutorial.objects.blocks.RubyBlock; +import com.technovision.tutorial.objects.blocks.RubyOre; +import net.minecraft.block.Block; +import net.minecraftforge.fml.RegistryObject; +import net.minecraftforge.registries.DeferredRegister; +import net.minecraftforge.registries.ForgeRegistries; + +public class ModBlocks { + + public static final DeferredRegister BLOCKS = DeferredRegister.create(ForgeRegistries.BLOCKS, Tutorial.MOD_ID); + + // Blocks + public static final RegistryObject RUBY_BLOCK = BLOCKS.register("ruby_block", RubyBlock::new); + public static final RegistryObject RUBY_ORE = BLOCKS.register("ruby_ore", RubyOre::new); + public static final RegistryObject OVEN = BLOCKS.register("oven", Oven::new); +} diff --git a/src/main/java/com/technovision/tutorial/init/ModItems.java b/src/main/java/com/technovision/tutorial/init/ModItems.java new file mode 100644 index 0000000..268a933 --- /dev/null +++ b/src/main/java/com/technovision/tutorial/init/ModItems.java @@ -0,0 +1,59 @@ +package com.technovision.tutorial.init; + +import com.technovision.tutorial.Tutorial; +import com.technovision.tutorial.util.enums.ModArmorMaterial; +import com.technovision.tutorial.objects.items.PoisonApple; +import com.technovision.tutorial.util.enums.ModItemTier; +import net.minecraft.inventory.EquipmentSlotType; +import net.minecraft.item.*; +import net.minecraftforge.fml.RegistryObject; +import net.minecraftforge.registries.DeferredRegister; +import net.minecraftforge.registries.ForgeRegistries; + +public class ModItems { + + public static final DeferredRegister ITEMS = DeferredRegister.create(ForgeRegistries.ITEMS, Tutorial.MOD_ID); + + // 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); + + // Block Items + public static final RegistryObject RUBY_BLOCK_ITEM = ITEMS.register("ruby_block", + () -> new BlockItem(ModBlocks.RUBY_BLOCK.get(), new Item.Properties().group(Tutorial.TAB))); + + public static final RegistryObject RUBY_ORE_ITEM = ITEMS.register("ruby_ore", + () -> new BlockItem(ModBlocks.RUBY_ORE.get(), new Item.Properties().group(Tutorial.TAB))); + + public static final RegistryObject OVEN_ITEM = ITEMS.register("oven", + () -> new BlockItem(ModBlocks.OVEN.get(), new Item.Properties().group(Tutorial.TAB))); + + // Tools + public static final RegistryObject RUBY_SWORD = ITEMS.register("ruby_sword", + () -> new SwordItem(ModItemTier.RUBY, 2, -2.4F, new Item.Properties().group(Tutorial.TAB))); + + public static final RegistryObject RUBY_PICKAXE = ITEMS.register("ruby_pickaxe", + () -> new PickaxeItem(ModItemTier.RUBY, 0, -2.8F, new Item.Properties().group(Tutorial.TAB))); + + public static final RegistryObject RUBY_SHOVEL = ITEMS.register("ruby_shovel", + () -> new ShovelItem(ModItemTier.RUBY, 0.5F, -3.0F, new Item.Properties().group(Tutorial.TAB))); + + public static final RegistryObject RUBY_AXE = ITEMS.register("ruby_axe", + () -> new AxeItem(ModItemTier.RUBY, 5, -3.1F, new Item.Properties().group(Tutorial.TAB))); + + public static final RegistryObject RUBY_HOE = ITEMS.register("ruby_hoe", + () -> new HoeItem(ModItemTier.RUBY,-3, -1.0F, new Item.Properties().group(Tutorial.TAB))); + + // Armor + public static final RegistryObject RUBY_HELMET = ITEMS.register("ruby_helmet", + () -> new ArmorItem(ModArmorMaterial.RUBY, EquipmentSlotType.HEAD, new Item.Properties().group(Tutorial.TAB))); + + public static final RegistryObject RUBY_CHESTPLATE = ITEMS.register("ruby_chestplate", + () -> new ArmorItem(ModArmorMaterial.RUBY, EquipmentSlotType.CHEST, new Item.Properties().group(Tutorial.TAB))); + + public static final RegistryObject RUBY_LEGGINGS = ITEMS.register("ruby_leggings", + () -> new ArmorItem(ModArmorMaterial.RUBY, EquipmentSlotType.LEGS, new Item.Properties().group(Tutorial.TAB))); + + public static final RegistryObject RUBY_BOOTS = ITEMS.register("ruby_boots", + () -> new ArmorItem(ModArmorMaterial.RUBY, EquipmentSlotType.FEET, new Item.Properties().group(Tutorial.TAB))); +} diff --git a/src/main/java/com/technovision/tutorial/blocks/Oven.java b/src/main/java/com/technovision/tutorial/objects/blocks/Oven.java similarity index 99% rename from src/main/java/com/technovision/tutorial/blocks/Oven.java rename to src/main/java/com/technovision/tutorial/objects/blocks/Oven.java index 3b8ddb9..aecb4e8 100644 --- a/src/main/java/com/technovision/tutorial/blocks/Oven.java +++ b/src/main/java/com/technovision/tutorial/objects/blocks/Oven.java @@ -1,4 +1,4 @@ -package com.technovision.tutorial.blocks; +package com.technovision.tutorial.objects.blocks; import net.minecraft.block.*; import net.minecraft.block.material.Material; diff --git a/src/main/java/com/technovision/tutorial/blocks/RubyBlock.java b/src/main/java/com/technovision/tutorial/objects/blocks/RubyBlock.java similarity index 90% rename from src/main/java/com/technovision/tutorial/blocks/RubyBlock.java rename to src/main/java/com/technovision/tutorial/objects/blocks/RubyBlock.java index ee20e85..6bced98 100644 --- a/src/main/java/com/technovision/tutorial/blocks/RubyBlock.java +++ b/src/main/java/com/technovision/tutorial/objects/blocks/RubyBlock.java @@ -1,4 +1,4 @@ -package com.technovision.tutorial.blocks; +package com.technovision.tutorial.objects.blocks; import net.minecraft.block.*; import net.minecraft.block.material.Material; diff --git a/src/main/java/com/technovision/tutorial/blocks/RubyOre.java b/src/main/java/com/technovision/tutorial/objects/blocks/RubyOre.java similarity index 94% rename from src/main/java/com/technovision/tutorial/blocks/RubyOre.java rename to src/main/java/com/technovision/tutorial/objects/blocks/RubyOre.java index 40c692b..a432ece 100644 --- a/src/main/java/com/technovision/tutorial/blocks/RubyOre.java +++ b/src/main/java/com/technovision/tutorial/objects/blocks/RubyOre.java @@ -1,4 +1,4 @@ -package com.technovision.tutorial.blocks; +package com.technovision.tutorial.objects.blocks; import net.minecraft.block.Block; import net.minecraft.block.BlockState; diff --git a/src/main/java/com/technovision/tutorial/items/PoisonApple.java b/src/main/java/com/technovision/tutorial/objects/items/PoisonApple.java similarity index 94% rename from src/main/java/com/technovision/tutorial/items/PoisonApple.java rename to src/main/java/com/technovision/tutorial/objects/items/PoisonApple.java index 73fedbe..5734f57 100644 --- a/src/main/java/com/technovision/tutorial/items/PoisonApple.java +++ b/src/main/java/com/technovision/tutorial/objects/items/PoisonApple.java @@ -1,4 +1,4 @@ -package com.technovision.tutorial.items; +package com.technovision.tutorial.objects.items; import com.technovision.tutorial.Tutorial; import net.minecraft.item.Food; diff --git a/src/main/java/com/technovision/tutorial/util/RegistryHandler.java b/src/main/java/com/technovision/tutorial/util/RegistryHandler.java deleted file mode 100644 index 1925465..0000000 --- a/src/main/java/com/technovision/tutorial/util/RegistryHandler.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.technovision.tutorial.util; - -import com.technovision.tutorial.Tutorial; -import com.technovision.tutorial.armor.ModArmorMaterial; -import com.technovision.tutorial.blocks.Oven; -import com.technovision.tutorial.blocks.RubyBlock; -import com.technovision.tutorial.blocks.RubyOre; -import com.technovision.tutorial.items.PoisonApple; -import com.technovision.tutorial.tools.ModItemTier; -import net.minecraft.block.Block; -import net.minecraft.inventory.EquipmentSlotType; -import net.minecraft.item.*; -import net.minecraftforge.fml.RegistryObject; -import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; -import net.minecraftforge.registries.DeferredRegister; -import net.minecraftforge.registries.ForgeRegistries; - -public class RegistryHandler { - - public static final DeferredRegister ITEMS = DeferredRegister.create(ForgeRegistries.ITEMS, Tutorial.MOD_ID); - public static final DeferredRegister BLOCKS = DeferredRegister.create(ForgeRegistries.BLOCKS, Tutorial.MOD_ID); - - public static void init() { - ITEMS.register(FMLJavaModLoadingContext.get().getModEventBus()); - BLOCKS.register(FMLJavaModLoadingContext.get().getModEventBus()); - } - - // 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); - - // Tools - public static final RegistryObject RUBY_SWORD = ITEMS.register("ruby_sword", () -> - new SwordItem(ModItemTier.RUBY, 2, -2.4F, new Item.Properties().group(Tutorial.TAB))); - public static final RegistryObject RUBY_PICKAXE = ITEMS.register("ruby_pickaxe", () -> - new PickaxeItem(ModItemTier.RUBY, 0, -2.8F, new Item.Properties().group(Tutorial.TAB))); - public static final RegistryObject RUBY_SHOVEL = ITEMS.register("ruby_shovel", () -> - new ShovelItem(ModItemTier.RUBY, 0.5F, -3.0F, new Item.Properties().group(Tutorial.TAB))); - public static final RegistryObject RUBY_AXE = ITEMS.register("ruby_axe", () -> - new AxeItem(ModItemTier.RUBY, 5, -3.1F, new Item.Properties().group(Tutorial.TAB))); - public static final RegistryObject RUBY_HOE = ITEMS.register("ruby_hoe", () -> - new HoeItem(ModItemTier.RUBY,-3, -1.0F, new Item.Properties().group(Tutorial.TAB))); - - // Armor - public static final RegistryObject RUBY_HELMET = ITEMS.register("ruby_helmet", () -> - new ArmorItem(ModArmorMaterial.RUBY, EquipmentSlotType.HEAD, new Item.Properties().group(Tutorial.TAB))); - public static final RegistryObject RUBY_CHESTPLATE = ITEMS.register("ruby_chestplate", () -> - new ArmorItem(ModArmorMaterial.RUBY, EquipmentSlotType.CHEST, new Item.Properties().group(Tutorial.TAB))); - public static final RegistryObject RUBY_LEGGINGS = ITEMS.register("ruby_leggings", () -> - new ArmorItem(ModArmorMaterial.RUBY, EquipmentSlotType.LEGS, new Item.Properties().group(Tutorial.TAB))); - public static final RegistryObject RUBY_BOOTS = ITEMS.register("ruby_boots", () -> - new ArmorItem(ModArmorMaterial.RUBY, EquipmentSlotType.FEET, new Item.Properties().group(Tutorial.TAB))); - - // Blocks - public static final RegistryObject RUBY_BLOCK = BLOCKS.register("ruby_block", RubyBlock::new); - public static final RegistryObject RUBY_ORE = BLOCKS.register("ruby_ore", RubyOre::new); - public static final RegistryObject OVEN = BLOCKS.register("oven", Oven::new); - - // Block Items - public static final RegistryObject RUBY_BLOCK_ITEM = ITEMS.register("ruby_block", () -> new BlockItem(RUBY_BLOCK.get(), new Item.Properties().group(Tutorial.TAB))); - public static final RegistryObject RUBY_ORE_ITEM = ITEMS.register("ruby_ore", () -> new BlockItem(RUBY_ORE.get(), new Item.Properties().group(Tutorial.TAB))); - public static final RegistryObject OVEN_ITEM = ITEMS.register("oven", () -> new BlockItem(OVEN.get(), new Item.Properties().group(Tutorial.TAB))); -} diff --git a/src/main/java/com/technovision/tutorial/armor/ModArmorMaterial.java b/src/main/java/com/technovision/tutorial/util/enums/ModArmorMaterial.java similarity index 94% rename from src/main/java/com/technovision/tutorial/armor/ModArmorMaterial.java rename to src/main/java/com/technovision/tutorial/util/enums/ModArmorMaterial.java index 65285c8..606c44b 100644 --- a/src/main/java/com/technovision/tutorial/armor/ModArmorMaterial.java +++ b/src/main/java/com/technovision/tutorial/util/enums/ModArmorMaterial.java @@ -1,7 +1,7 @@ -package com.technovision.tutorial.armor; +package com.technovision.tutorial.util.enums; import com.technovision.tutorial.Tutorial; -import com.technovision.tutorial.util.RegistryHandler; +import com.technovision.tutorial.init.ModItems; import net.minecraft.inventory.EquipmentSlotType; import net.minecraft.item.IArmorMaterial; import net.minecraft.item.crafting.Ingredient; @@ -15,7 +15,7 @@ import java.util.function.Supplier; public enum ModArmorMaterial implements IArmorMaterial { RUBY(Tutorial.MOD_ID + ":ruby", 25, new int[] { 2, 5, 6, 2 }, 18, - SoundEvents.ITEM_ARMOR_EQUIP_GENERIC, 0, () -> { return Ingredient.fromItems(RegistryHandler.RUBY.get()); },0); + SoundEvents.ITEM_ARMOR_EQUIP_GENERIC, 0, () -> { return Ingredient.fromItems(ModItems.RUBY.get()); },0); private static final int[] MAX_DAMAGE_ARRAY = new int[] { 11, 16, 15, 13 }; private final String name; diff --git a/src/main/java/com/technovision/tutorial/tools/ModItemTier.java b/src/main/java/com/technovision/tutorial/util/enums/ModItemTier.java similarity index 89% rename from src/main/java/com/technovision/tutorial/tools/ModItemTier.java rename to src/main/java/com/technovision/tutorial/util/enums/ModItemTier.java index 128c899..2b2f597 100644 --- a/src/main/java/com/technovision/tutorial/tools/ModItemTier.java +++ b/src/main/java/com/technovision/tutorial/util/enums/ModItemTier.java @@ -1,6 +1,6 @@ -package com.technovision.tutorial.tools; +package com.technovision.tutorial.util.enums; -import com.technovision.tutorial.util.RegistryHandler; +import com.technovision.tutorial.init.ModItems; import net.minecraft.item.IItemTier; import net.minecraft.item.crafting.Ingredient; @@ -9,7 +9,7 @@ import java.util.function.Supplier; public enum ModItemTier implements IItemTier { RUBY(3, 800, 7.0F, 3.0F, 12, () -> { - return Ingredient.fromItems(RegistryHandler.RUBY.get()); + return Ingredient.fromItems(ModItems.RUBY.get()); }); private final int harvestLevel; diff --git a/src/main/java/com/technovision/tutorial/world/gen/ModOreGen.java b/src/main/java/com/technovision/tutorial/world/gen/ModOreGen.java index a584529..67d812e 100644 --- a/src/main/java/com/technovision/tutorial/world/gen/ModOreGen.java +++ b/src/main/java/com/technovision/tutorial/world/gen/ModOreGen.java @@ -1,12 +1,11 @@ package com.technovision.tutorial.world.gen; import com.technovision.tutorial.Tutorial; -import com.technovision.tutorial.util.RegistryHandler; +import com.technovision.tutorial.init.ModBlocks; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; import net.minecraft.block.pattern.BlockMatcher; import net.minecraft.world.biome.Biome; -import net.minecraft.world.biome.Biomes; import net.minecraft.world.gen.GenerationStage; import net.minecraft.world.gen.feature.Feature; import net.minecraft.world.gen.feature.OreFeatureConfig; @@ -30,13 +29,13 @@ public class ModOreGen { //Nether Generation if (biome.getCategory() == Biome.Category.NETHER) { - genOre(biome, 12, 5, 5, 80, OreFeatureConfig.FillerBlockType.NETHERRACK, RegistryHandler.RUBY_ORE.get().getDefaultState(), 4); + genOre(biome, 12, 5, 5, 80, OreFeatureConfig.FillerBlockType.NETHERRACK, ModBlocks.RUBY_ORE.get().getDefaultState(), 4); //End Generation } else if (biome.getCategory() == Biome.Category.THEEND) { - genOre(biome, 18, 3, 5, 80, END_STONE, RegistryHandler.RUBY_ORE.get().getDefaultState(), 12); + genOre(biome, 18, 3, 5, 80, END_STONE, ModBlocks.RUBY_ORE.get().getDefaultState(), 12); //World Generation } else { - genOre(biome, 15, 8, 5, 50, OreFeatureConfig.FillerBlockType.NATURAL_STONE, RegistryHandler.RUBY_ORE.get().getDefaultState(), 6); + genOre(biome, 15, 8, 5, 50, OreFeatureConfig.FillerBlockType.NATURAL_STONE, ModBlocks.RUBY_ORE.get().getDefaultState(), 6); } } }