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

Reorganize packages and classes

Browse Source
This commit is contained in:
TechnoVisionDev 2020-07-22 15:09:54 -07:00
parent a239bcc3b2
commit 8bfe812fe8
12 changed files with 102 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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());
}
};

7
src/main/java/com/technovision/tutorial/events/ModClientEvents.java
View File

@ -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) {

20
src/main/java/com/technovision/tutorial/init/ModBlocks.java Normal file
View File

@ -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<Block> BLOCKS = DeferredRegister.create(ForgeRegistries.BLOCKS, Tutorial.MOD_ID);
// Blocks
public static final RegistryObject<Block> RUBY_BLOCK = BLOCKS.register("ruby_block", RubyBlock::new);
public static final RegistryObject<Block> RUBY_ORE = BLOCKS.register("ruby_ore", RubyOre::new);
public static final RegistryObject<Block> OVEN = BLOCKS.register("oven", Oven::new);
}

59
src/main/java/com/technovision/tutorial/init/ModItems.java Normal file
View File

@ -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<Item> ITEMS = DeferredRegister.create(ForgeRegistries.ITEMS, Tutorial.MOD_ID);
// Items
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);
// Block Items
public static final RegistryObject<Item> RUBY_BLOCK_ITEM = ITEMS.register("ruby_block",
() -> new BlockItem(ModBlocks.RUBY_BLOCK.get(), new Item.Properties().group(Tutorial.TAB)));
public static final RegistryObject<Item> RUBY_ORE_ITEM = ITEMS.register("ruby_ore",
() -> new BlockItem(ModBlocks.RUBY_ORE.get(), new Item.Properties().group(Tutorial.TAB)));
public static final RegistryObject<Item> OVEN_ITEM = ITEMS.register("oven",
() -> new BlockItem(ModBlocks.OVEN.get(), new Item.Properties().group(Tutorial.TAB)));
// Tools
public static final RegistryObject<SwordItem> RUBY_SWORD = ITEMS.register("ruby_sword",
() -> new SwordItem(ModItemTier.RUBY, 2, -2.4F, new Item.Properties().group(Tutorial.TAB)));
public static final RegistryObject<PickaxeItem> RUBY_PICKAXE = ITEMS.register("ruby_pickaxe",
() -> new PickaxeItem(ModItemTier.RUBY, 0, -2.8F, new Item.Properties().group(Tutorial.TAB)));
public static final RegistryObject<ShovelItem> RUBY_SHOVEL = ITEMS.register("ruby_shovel",
() -> new ShovelItem(ModItemTier.RUBY, 0.5F, -3.0F, new Item.Properties().group(Tutorial.TAB)));
public static final RegistryObject<AxeItem> RUBY_AXE = ITEMS.register("ruby_axe",
() -> new AxeItem(ModItemTier.RUBY, 5, -3.1F, new Item.Properties().group(Tutorial.TAB)));
public static final RegistryObject<HoeItem> RUBY_HOE = ITEMS.register("ruby_hoe",
() -> new HoeItem(ModItemTier.RUBY,-3, -1.0F, new Item.Properties().group(Tutorial.TAB)));
// Armor
public static final RegistryObject<ArmorItem> RUBY_HELMET = ITEMS.register("ruby_helmet",
() -> new ArmorItem(ModArmorMaterial.RUBY, EquipmentSlotType.HEAD, new Item.Properties().group(Tutorial.TAB)));
public static final RegistryObject<ArmorItem> RUBY_CHESTPLATE = ITEMS.register("ruby_chestplate",
() -> new ArmorItem(ModArmorMaterial.RUBY, EquipmentSlotType.CHEST, new Item.Properties().group(Tutorial.TAB)));
public static final RegistryObject<ArmorItem> RUBY_LEGGINGS = ITEMS.register("ruby_leggings",
() -> new ArmorItem(ModArmorMaterial.RUBY, EquipmentSlotType.LEGS, new Item.Properties().group(Tutorial.TAB)));
public static final RegistryObject<ArmorItem> RUBY_BOOTS = ITEMS.register("ruby_boots",
() -> new ArmorItem(ModArmorMaterial.RUBY, EquipmentSlotType.FEET, new Item.Properties().group(Tutorial.TAB)));
}

2
src/main/java/com/technovision/tutorial/blocks/Oven.java → src/main/java/com/technovision/tutorial/objects/blocks/Oven.java
View File

@ -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;

2
src/main/java/com/technovision/tutorial/blocks/RubyBlock.java → src/main/java/com/technovision/tutorial/objects/blocks/RubyBlock.java
View File

@ -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;

2
src/main/java/com/technovision/tutorial/blocks/RubyOre.java → src/main/java/com/technovision/tutorial/objects/blocks/RubyOre.java
View File

@ -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;

2
src/main/java/com/technovision/tutorial/items/PoisonApple.java → src/main/java/com/technovision/tutorial/objects/items/PoisonApple.java
View File

@ -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;

63
src/main/java/com/technovision/tutorial/util/RegistryHandler.java
View File

@ -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<Item> ITEMS = DeferredRegister.create(ForgeRegistries.ITEMS, Tutorial.MOD_ID);
public static final DeferredRegister<Block> 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<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);
// Tools
public static final RegistryObject<SwordItem> RUBY_SWORD = ITEMS.register("ruby_sword", () ->
new SwordItem(ModItemTier.RUBY, 2, -2.4F, new Item.Properties().group(Tutorial.TAB)));
public static final RegistryObject<PickaxeItem> RUBY_PICKAXE = ITEMS.register("ruby_pickaxe", () ->
new PickaxeItem(ModItemTier.RUBY, 0, -2.8F, new Item.Properties().group(Tutorial.TAB)));
public static final RegistryObject<ShovelItem> RUBY_SHOVEL = ITEMS.register("ruby_shovel", () ->
new ShovelItem(ModItemTier.RUBY, 0.5F, -3.0F, new Item.Properties().group(Tutorial.TAB)));
public static final RegistryObject<AxeItem> RUBY_AXE = ITEMS.register("ruby_axe", () ->
new AxeItem(ModItemTier.RUBY, 5, -3.1F, new Item.Properties().group(Tutorial.TAB)));
public static final RegistryObject<HoeItem> RUBY_HOE = ITEMS.register("ruby_hoe", () ->
new HoeItem(ModItemTier.RUBY,-3, -1.0F, new Item.Properties().group(Tutorial.TAB)));
// Armor
public static final RegistryObject<ArmorItem> RUBY_HELMET = ITEMS.register("ruby_helmet", () ->
new ArmorItem(ModArmorMaterial.RUBY, EquipmentSlotType.HEAD, new Item.Properties().group(Tutorial.TAB)));
public static final RegistryObject<ArmorItem> RUBY_CHESTPLATE = ITEMS.register("ruby_chestplate", () ->
new ArmorItem(ModArmorMaterial.RUBY, EquipmentSlotType.CHEST, new Item.Properties().group(Tutorial.TAB)));
public static final RegistryObject<ArmorItem> RUBY_LEGGINGS = ITEMS.register("ruby_leggings", () ->
new ArmorItem(ModArmorMaterial.RUBY, EquipmentSlotType.LEGS, new Item.Properties().group(Tutorial.TAB)));
public static final RegistryObject<ArmorItem> RUBY_BOOTS = ITEMS.register("ruby_boots", () ->
new ArmorItem(ModArmorMaterial.RUBY, EquipmentSlotType.FEET, new Item.Properties().group(Tutorial.TAB)));
// Blocks
public static final RegistryObject<Block> RUBY_BLOCK = BLOCKS.register("ruby_block", RubyBlock::new);
public static final RegistryObject<Block> RUBY_ORE = BLOCKS.register("ruby_ore", RubyOre::new);
public static final RegistryObject<Block> OVEN = BLOCKS.register("oven", Oven::new);
// Block Items
public static final RegistryObject<Item> RUBY_BLOCK_ITEM = ITEMS.register("ruby_block", () -> new BlockItem(RUBY_BLOCK.get(), new Item.Properties().group(Tutorial.TAB)));
public static final RegistryObject<Item> RUBY_ORE_ITEM = ITEMS.register("ruby_ore", () -> new BlockItem(RUBY_ORE.get(), new Item.Properties().group(Tutorial.TAB)));
public static final RegistryObject<Item> OVEN_ITEM = ITEMS.register("oven", () -> new BlockItem(OVEN.get(), new Item.Properties().group(Tutorial.TAB)));
}

6
src/main/java/com/technovision/tutorial/armor/ModArmorMaterial.java → src/main/java/com/technovision/tutorial/util/enums/ModArmorMaterial.java
View File

@ -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;

6
src/main/java/com/technovision/tutorial/tools/ModItemTier.java → src/main/java/com/technovision/tutorial/util/enums/ModItemTier.java
View File

@ -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;

9
src/main/java/com/technovision/tutorial/world/gen/ModOreGen.java
View File

@ -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);
}
}
}