From edf1b8b2d0d401a171ec3fe5c1630fe1c2dfed6f Mon Sep 17 00:00:00 2001 From: dragonruler1000 Date: Thu, 8 May 2025 21:33:16 -0500 Subject: [PATCH] Working on getting a dust item added. --- .../us/minecraftchest2/hdm_mod/Hdm_mod.java | 19 +-- .../hdm_mod/init/ItemInit.java | 28 ----- .../hdm_mod/item/ModItems.java | 26 +++++ .../hdm_mod/item/SpyGlass.java | 20 ++++ .../hdm_mod/items/SpyGlass.java | 20 ---- .../hdm_mod/util/ModItemTier.java | 108 +++++++++--------- .../world/dimension/ModDimensions.java | 2 +- .../world/dimension/SimpleTeleporter.java | 64 ++++++++++- .../resources/assets/hdm_mod/lang/en_us.json | 3 +- .../assets/hdm_mod/models/item/dust.json | 6 + .../assets/hdm_mod/textures/items/dust.png | Bin 0 -> 191 bytes .../data/{ => hdm_mod}/dimension/testdim.json | 0 12 files changed, 181 insertions(+), 115 deletions(-) delete mode 100644 src/main/java/us/minecraftchest2/hdm_mod/init/ItemInit.java create mode 100644 src/main/java/us/minecraftchest2/hdm_mod/item/ModItems.java create mode 100644 src/main/java/us/minecraftchest2/hdm_mod/item/SpyGlass.java delete mode 100644 src/main/java/us/minecraftchest2/hdm_mod/items/SpyGlass.java create mode 100644 src/main/resources/assets/hdm_mod/models/item/dust.json create mode 100644 src/main/resources/assets/hdm_mod/textures/items/dust.png rename src/main/resources/data/{ => hdm_mod}/dimension/testdim.json (100%) diff --git a/src/main/java/us/minecraftchest2/hdm_mod/Hdm_mod.java b/src/main/java/us/minecraftchest2/hdm_mod/Hdm_mod.java index 7a03b78..6b1a7d5 100644 --- a/src/main/java/us/minecraftchest2/hdm_mod/Hdm_mod.java +++ b/src/main/java/us/minecraftchest2/hdm_mod/Hdm_mod.java @@ -16,7 +16,8 @@ import net.minecraftforge.fml.event.server.FMLServerStartingEvent; import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import us.minecraftchest2.hdm_mod.init.ItemInit; +import us.minecraftchest2.hdm_mod.item.ModItems; +//import us.minecraftchest2.hdm_mod.init.ItemInit; import java.util.stream.Collectors; @@ -30,20 +31,24 @@ public class Hdm_mod { public Hdm_mod() { // Register the setup method for modloading - FMLJavaModLoadingContext.get().getModEventBus().addListener(this::setup); + IEventBus modEventBus1 = FMLJavaModLoadingContext.get().getModEventBus(); + + ModItems.register(modEventBus1); + + modEventBus1.addListener(this::setup); // Register the enqueueIMC method for modloading - FMLJavaModLoadingContext.get().getModEventBus().addListener(this::enqueueIMC); + modEventBus1.addListener(this::enqueueIMC); // Register the processIMC method for modloading - FMLJavaModLoadingContext.get().getModEventBus().addListener(this::processIMC); + modEventBus1.addListener(this::processIMC); // Register the doClientStuff method for modloading - FMLJavaModLoadingContext.get().getModEventBus().addListener(this::doClientStuff); + modEventBus1.addListener(this::doClientStuff); // Register ourselves for server and other game events we are interested in MinecraftForge.EVENT_BUS.register(this); - final IEventBus modEventBus = FMLJavaModLoadingContext.get().getModEventBus(); + final IEventBus modEventBus = modEventBus1; modEventBus.addListener(this::setup); - ItemInit.ITEMS.register(modEventBus); + //ItemInit.ITEMS.register(modEventBus); MinecraftForge.EVENT_BUS.register(this); } diff --git a/src/main/java/us/minecraftchest2/hdm_mod/init/ItemInit.java b/src/main/java/us/minecraftchest2/hdm_mod/init/ItemInit.java deleted file mode 100644 index 9e8f00a..0000000 --- a/src/main/java/us/minecraftchest2/hdm_mod/init/ItemInit.java +++ /dev/null @@ -1,28 +0,0 @@ -package us.minecraftchest2.hdm_mod.init; - -import net.minecraft.item.*; -import net.minecraftforge.fml.RegistryObject; -import net.minecraftforge.registries.DeferredRegister; -import net.minecraftforge.registries.ForgeRegistries; -import us.minecraftchest2.hdm_mod.Hdm_mod; -import us.minecraftchest2.hdm_mod.util.ModItemTier; - -public class ItemInit { - public static final DeferredRegister ITEMS = DeferredRegister.create(ForgeRegistries.ITEMS, Hdm_mod.MOD_ID); - public static final RegistryObject KNIFE = ITEMS.register("knife", () -> new SwordItem(ModItemTier.MGTI, 3,-1f, new Item.Properties().tab(ModCreativeTab.Items))); - public static final RegistryObject OMELET = ITEMS.register("omelet", () -> new Item(new Item.Properties().tab(ModCreativeTab.Items).food(new Food.Builder().nutrition(4).saturationMod(2).build()))); - public static final RegistryObject SPYGLASS = ITEMS.register("spyglass", () -> new Item(new Item.Properties().tab(ModCreativeTab.Items))); - - public static class ModCreativeTab extends ItemGroup { - public static final ModCreativeTab Items = new ModCreativeTab(ItemGroup.TABS.length, "HDM Mod Items"); - private ModCreativeTab(int index, String label) { - super(index, label); - } - - @Override - public ItemStack makeIcon() { - return new ItemStack(KNIFE.get()); - } - } -} - diff --git a/src/main/java/us/minecraftchest2/hdm_mod/item/ModItems.java b/src/main/java/us/minecraftchest2/hdm_mod/item/ModItems.java new file mode 100644 index 0000000..3ce4632 --- /dev/null +++ b/src/main/java/us/minecraftchest2/hdm_mod/item/ModItems.java @@ -0,0 +1,26 @@ +package us.minecraftchest2.hdm_mod.item; + +import net.minecraft.item.Item; +import net.minecraft.item.ItemGroup; +import net.minecraftforge.eventbus.api.IEventBus; +import net.minecraftforge.fml.RegistryObject; +import net.minecraftforge.registries.DeferredRegister; +import net.minecraftforge.registries.ForgeRegistries; +import us.minecraftchest2.hdm_mod.Hdm_mod; + +public class ModItems { + + public static final DeferredRegister ITEMS = + DeferredRegister.create(ForgeRegistries.ITEMS, Hdm_mod.MOD_ID); + + public static final RegistryObject DUST = ITEMS.register("dust", + () -> new Item(new Item.Properties().isImmuneToFire().maxStackSize(65).group(ItemGroup.MATERIALS))); + + + + public static void register(IEventBus eventBus) { + ITEMS.register(eventBus); + } + + +} diff --git a/src/main/java/us/minecraftchest2/hdm_mod/item/SpyGlass.java b/src/main/java/us/minecraftchest2/hdm_mod/item/SpyGlass.java new file mode 100644 index 0000000..8d6cfcf --- /dev/null +++ b/src/main/java/us/minecraftchest2/hdm_mod/item/SpyGlass.java @@ -0,0 +1,20 @@ +//package us.minecraftchest2.hdm_mod.items; +// +//import net.minecraft.entity.player.PlayerEntity; +//import net.minecraft.item.Item; +//import net.minecraft.item.ItemStack; +//import net.minecraft.util.ActionResult; +//import net.minecraft.util.Hand; +//import net.minecraft.world.World; +// +//public class SpyGlass extends Item { +// public SpyGlass(Properties properties) +// { +// super(properties); +// } +// @Override +// public ActionResult use(World world, PlayerEntity player, Hand hand) { +// return super.use(world, player, hand); +// } +// +//} diff --git a/src/main/java/us/minecraftchest2/hdm_mod/items/SpyGlass.java b/src/main/java/us/minecraftchest2/hdm_mod/items/SpyGlass.java deleted file mode 100644 index b9dbfa9..0000000 --- a/src/main/java/us/minecraftchest2/hdm_mod/items/SpyGlass.java +++ /dev/null @@ -1,20 +0,0 @@ -package us.minecraftchest2.hdm_mod.items; - -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.ActionResult; -import net.minecraft.util.Hand; -import net.minecraft.world.World; - -public class SpyGlass extends Item { - public SpyGlass(Properties properties) - { - super(properties); - } - @Override - public ActionResult use(World world, PlayerEntity player, Hand hand) { - return super.use(world, player, hand); - } - -} diff --git a/src/main/java/us/minecraftchest2/hdm_mod/util/ModItemTier.java b/src/main/java/us/minecraftchest2/hdm_mod/util/ModItemTier.java index 0bbefcf..7c656fb 100644 --- a/src/main/java/us/minecraftchest2/hdm_mod/util/ModItemTier.java +++ b/src/main/java/us/minecraftchest2/hdm_mod/util/ModItemTier.java @@ -1,54 +1,54 @@ -package us.minecraftchest2.hdm_mod.util; - -import net.minecraft.item.IItemTier; -import net.minecraft.item.crafting.Ingredient; -import net.minecraft.util.LazyValue; -import us.minecraftchest2.hdm_mod.init.ItemInit; - -import java.util.function.Supplier; - -public enum ModItemTier implements IItemTier { - MGTI(4, 30000, 10.0F, 20.0F, 5, () -> { - return Ingredient.of(ItemInit.KNIFE.get()); - }); - - private final int level; - private final int uses; - private final float speed; - private final float damage; - private final int enchantmentValue; - private final LazyValue repairIngredient; - - ModItemTier(int level, int durability, float miningSpeed, float damage, int enchantability, Supplier repairIngredient) { - this.level = level; - this.uses = durability; - this.speed = miningSpeed; - this.damage = damage; - this.enchantmentValue = enchantability; - this.repairIngredient = new LazyValue<>(repairIngredient); - } - - public int getUses() { - return this.uses; - } - - public float getSpeed() { - return this.speed; - } - - public float getAttackDamageBonus() { - return this.damage; - } - - public int getLevel() { - return this.level; - } - - public int getEnchantmentValue() { - return this.enchantmentValue; - } - - public Ingredient getRepairIngredient() { - return this.repairIngredient.get(); - } -} \ No newline at end of file +//package us.minecraftchest2.hdm_mod.util; +// +//import net.minecraft.item.IItemTier; +//import net.minecraft.item.crafting.Ingredient; +//import net.minecraft.util.LazyValue; +////import us.minecraftchest2.hdm_mod.init.ItemInit; +// +//import java.util.function.Supplier; +// +//public enum ModItemTier implements IItemTier { +// MGTI(4, 30000, 10.0F, 20.0F, 5, () -> { +// //return Ingredient.of(ItemInit.KNIFE.get()); +// }); +// +// private final int level; +// private final int uses; +// private final float speed; +// private final float damage; +// private final int enchantmentValue; +// private final LazyValue repairIngredient; +// +// ModItemTier(int level, int durability, float miningSpeed, float damage, int enchantability, Supplier repairIngredient) { +// this.level = level; +// this.uses = durability; +// this.speed = miningSpeed; +// this.damage = damage; +// this.enchantmentValue = enchantability; +// this.repairIngredient = new LazyValue<>(repairIngredient); +// } +// +// public int getUses() { +// return this.uses; +// } +// +// public float getSpeed() { +// return this.speed; +// } +// +// public float getAttackDamageBonus() { +// return this.damage; +// } +// +// public int getLevel() { +// return this.level; +// } +// +// public int getEnchantmentValue() { +// return this.enchantmentValue; +// } +// +// public Ingredient getRepairIngredient() { +// return this.repairIngredient.get(); +// } +//} \ No newline at end of file diff --git a/src/main/java/us/minecraftchest2/hdm_mod/world/dimension/ModDimensions.java b/src/main/java/us/minecraftchest2/hdm_mod/world/dimension/ModDimensions.java index acc29ac..74d4232 100644 --- a/src/main/java/us/minecraftchest2/hdm_mod/world/dimension/ModDimensions.java +++ b/src/main/java/us/minecraftchest2/hdm_mod/world/dimension/ModDimensions.java @@ -7,6 +7,6 @@ import net.minecraft.world.World; import us.minecraftchest2.hdm_mod.Hdm_mod; public class ModDimensions { - public static RegistryKey TestDim = RegistryKey.createRegistryKey(Registry.WORLD_KEY, + public static RegistryKey TestDim = RegistryKey.getOrCreateKey(Registry.WORLD_KEY, new ResourceLocation(Hdm_mod.MOD_ID, "testdim")); } diff --git a/src/main/java/us/minecraftchest2/hdm_mod/world/dimension/SimpleTeleporter.java b/src/main/java/us/minecraftchest2/hdm_mod/world/dimension/SimpleTeleporter.java index 6bea85d..26a1531 100644 --- a/src/main/java/us/minecraftchest2/hdm_mod/world/dimension/SimpleTeleporter.java +++ b/src/main/java/us/minecraftchest2/hdm_mod/world/dimension/SimpleTeleporter.java @@ -1,4 +1,60 @@ -package us.minecraftchest2.hdm_mod.world.dimension; - -public class SimpleTeleporter { -} +//package us.minecraftchest2.hdm_mod.world.dimension; +// +//import net.minecraft.block.material.Material; +//import net.minecraft.entity.Entity; +//import net.minecraft.fluid.Fluids; +//import net.minecraft.util.math.BlockPos; +//import net.minecraft.world.server.ServerWorld; +//import net.minecraftforge.common.util.ITeleporter; +//import us.minecraftchest2.hdm_mod. +// +//import java.util.function.Function; +// +//public class KJTeleporter implements ITeleporter { +// public static BlockPos thisPos = BlockPos.ZERO; +// public static boolean insideDimension = true; +// +// public KJTeleporter(BlockPos pos, boolean insideDim) { +// thisPos = pos; +// insideDimension = insideDim; +// } +// +// @Override +// public Entity placeEntity(Entity entity, ServerWorld currentWorld, ServerWorld destinationWorld, +// float yaw, Function repositionEntity) { +// entity = repositionEntity.apply(false); +// double y = 61; +// +// if (!insideDimension) { +// y = thisPos.getY(); +// } +// +// BlockPos destinationPos = new BlockPos(thisPos.getX(), y, thisPos.getZ()); +// +// int tries = 0; +// while ((destinationWorld.getBlockState(destinationPos).getMaterial() != Material.AIR) && +// !destinationWorld.getBlockState(destinationPos).isReplaceable(Fluids.WATER) && +// destinationWorld.getBlockState(destinationPos.up()).getMaterial() != Material.AIR && +// !destinationWorld.getBlockState(destinationPos.up()).isReplaceable(Fluids.WATER) && tries < 25) { +// destinationPos = destinationPos.up(2); +// tries++; +// } +// +// entity.setPositionAndUpdate(destinationPos.getX(), destinationPos.getY(), destinationPos.getZ()); +// +// if (insideDimension) { +// boolean doSetBlock = true; +// for (BlockPos checkPos : BlockPos.getAllInBoxMutable(destinationPos.down(10).west(10), destinationPos.up(10).east(10))) { +// if (destinationWorld.getBlockState(checkPos).getBlock() instanceof KaupenAltarBlock) { +// doSetBlock = false; +// break; +// } +// } +// if (doSetBlock) { +// destinationWorld.setBlockState(destinationPos, ModBlocks.KAUPEN_ALTAR.get().getDefaultState()); +// } +// } +// +// return entity; +// } +//} diff --git a/src/main/resources/assets/hdm_mod/lang/en_us.json b/src/main/resources/assets/hdm_mod/lang/en_us.json index 59e2b0d..9488c57 100644 --- a/src/main/resources/assets/hdm_mod/lang/en_us.json +++ b/src/main/resources/assets/hdm_mod/lang/en_us.json @@ -2,5 +2,6 @@ "itemGroup.hdm_mod": "HDM Mod Items", "item.hdm_mod.knife": "Subtle Knife", - "item.hdm_mod.omelet": "Omelet" + "item.hdm_mod.omelet": "Omelet", + "item.hdm_mod.dust": "Dust" } \ No newline at end of file diff --git a/src/main/resources/assets/hdm_mod/models/item/dust.json b/src/main/resources/assets/hdm_mod/models/item/dust.json new file mode 100644 index 0000000..ed817d9 --- /dev/null +++ b/src/main/resources/assets/hdm_mod/models/item/dust.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "hdm_mod:item/dust" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/hdm_mod/textures/items/dust.png b/src/main/resources/assets/hdm_mod/textures/items/dust.png new file mode 100644 index 0000000000000000000000000000000000000000..24181098ad8dc82e9dadd2caeb7925aa3eb677bb GIT binary patch literal 191 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`ZJsWUAr_~T6C~~}IOqJ)o@4Ub zpI^21|NsB}$izGj4`z?Y=e3Iue3|Cd{y%V<(f^Z|c#2p%e5WWHoHgiq!!$uA&N-pZ zZJXp0#v|@&-&pZx?tMr0vf`W(8GRY%tnQmq*%egP`HfA>6