minecraft-mods/totem_of_reviving
Private
Public Access
1
0
Fork 0
Code Issues 1 Projects Releases 2 Wiki Activity

Changed groupId to dev.micle from com.micle.

Browse Source
This commit is contained in:
micle
2021-11-20 22:24:18 +00:00
parent 9e9e2a57c8
commit a216749c00
16 changed files with 618 additions and 618 deletions
Download Patch File Download Diff File Expand all files Collapse all files

106
src/main/java/com/micle/totemofreviving/TotemOfReviving.java → src/main/java/dev/micle/totemofreviving/TotemOfReviving.java
View File

@ -1,53 +1,53 @@
package com.micle.totemofreviving; package dev.micle.totemofreviving;
import com.micle.totemofreviving.network.C2SRequestPlayerRevive; import dev.micle.totemofreviving.network.C2SRequestPlayerRevive;
import com.micle.totemofreviving.network.C2SRequestTotemCharge; import dev.micle.totemofreviving.network.C2SRequestTotemCharge;
import com.micle.totemofreviving.network.C2SRequestTotemTarget; import dev.micle.totemofreviving.network.C2SRequestTotemTarget;
import com.micle.totemofreviving.setup.Registration; import dev.micle.totemofreviving.setup.Registration;
import net.minecraft.resources.ResourceLocation; import net.minecraft.resources.ResourceLocation;
import net.minecraft.server.players.PlayerList; import net.minecraft.server.players.PlayerList;
import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fmllegacy.network.NetworkRegistry; import net.minecraftforge.fmllegacy.network.NetworkRegistry;
import net.minecraftforge.fmllegacy.network.simple.SimpleChannel; import net.minecraftforge.fmllegacy.network.simple.SimpleChannel;
@Mod(TotemOfReviving.MOD_ID) @Mod(TotemOfReviving.MOD_ID)
public class TotemOfReviving { public class TotemOfReviving {
public static final String MOD_ID = "totemofreviving"; public static final String MOD_ID = "totemofreviving";
public static PlayerList players; public static PlayerList players;
private static final String PROTOCOL_VERSION = "1"; private static final String PROTOCOL_VERSION = "1";
public static final SimpleChannel INSTANCE = NetworkRegistry.newSimpleChannel( public static final SimpleChannel INSTANCE = NetworkRegistry.newSimpleChannel(
new ResourceLocation(TotemOfReviving.MOD_ID, "main"), new ResourceLocation(TotemOfReviving.MOD_ID, "main"),
() -> PROTOCOL_VERSION, () -> PROTOCOL_VERSION,
PROTOCOL_VERSION::equals, PROTOCOL_VERSION::equals,
PROTOCOL_VERSION::equals PROTOCOL_VERSION::equals
); );
public TotemOfReviving() { public TotemOfReviving() {
Registration.register(); Registration.register();
int id = 0; int id = 0;
INSTANCE.registerMessage(id++, INSTANCE.registerMessage(id++,
C2SRequestPlayerRevive.class, C2SRequestPlayerRevive.class,
C2SRequestPlayerRevive::encode, C2SRequestPlayerRevive::encode,
C2SRequestPlayerRevive::decode, C2SRequestPlayerRevive::decode,
C2SRequestPlayerRevive::handle C2SRequestPlayerRevive::handle
); );
INSTANCE.registerMessage(id++, INSTANCE.registerMessage(id++,
C2SRequestTotemTarget.class, C2SRequestTotemTarget.class,
C2SRequestTotemTarget::encode, C2SRequestTotemTarget::encode,
C2SRequestTotemTarget::decode, C2SRequestTotemTarget::decode,
C2SRequestTotemTarget::handle C2SRequestTotemTarget::handle
); );
INSTANCE.registerMessage(id++, INSTANCE.registerMessage(id++,
C2SRequestTotemCharge.class, C2SRequestTotemCharge.class,
C2SRequestTotemCharge::encode, C2SRequestTotemCharge::encode,
C2SRequestTotemCharge::decode, C2SRequestTotemCharge::decode,
C2SRequestTotemCharge::handle C2SRequestTotemCharge::handle
); );
// Register ourselves for server and other game events we are interested in // Register ourselves for server and other game events we are interested in
MinecraftForge.EVENT_BUS.register(this); MinecraftForge.EVENT_BUS.register(this);
} }
} }

48
src/main/java/com/micle/totemofreviving/data/DataGenerators.java → src/main/java/dev/micle/totemofreviving/data/DataGenerators.java
View File

@ -1,24 +1,24 @@
package com.micle.totemofreviving.data; package dev.micle.totemofreviving.data;
import com.micle.totemofreviving.TotemOfReviving; import dev.micle.totemofreviving.TotemOfReviving;
import com.micle.totemofreviving.data.client.ModItemModelProvider; import dev.micle.totemofreviving.data.client.ModItemModelProvider;
import net.minecraft.data.DataGenerator; import net.minecraft.data.DataGenerator;
import net.minecraftforge.common.data.ExistingFileHelper; import net.minecraftforge.common.data.ExistingFileHelper;
import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.eventbus.api.SubscribeEvent;
import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.forge.event.lifecycle.GatherDataEvent; import net.minecraftforge.forge.event.lifecycle.GatherDataEvent;
@Mod.EventBusSubscriber(modid = TotemOfReviving.MOD_ID, bus = Mod.EventBusSubscriber.Bus.MOD) @Mod.EventBusSubscriber(modid = TotemOfReviving.MOD_ID, bus = Mod.EventBusSubscriber.Bus.MOD)
public class DataGenerators { public class DataGenerators {
private DataGenerators() {} private DataGenerators() {}
@SubscribeEvent @SubscribeEvent
public static void gatherData(GatherDataEvent e) { public static void gatherData(GatherDataEvent e) {
DataGenerator gen = e.getGenerator(); DataGenerator gen = e.getGenerator();
ExistingFileHelper existing_file_helper = e.getExistingFileHelper(); ExistingFileHelper existing_file_helper = e.getExistingFileHelper();
gen.addProvider(new ModItemModelProvider(gen, existing_file_helper)); gen.addProvider(new ModItemModelProvider(gen, existing_file_helper));
gen.addProvider(new ModRecipeProvider(gen)); gen.addProvider(new ModRecipeProvider(gen));
} }
} }

112
src/main/java/com/micle/totemofreviving/data/ModRecipeProvider.java → src/main/java/dev/micle/totemofreviving/data/ModRecipeProvider.java
View File

@ -1,56 +1,56 @@
package com.micle.totemofreviving.data; package dev.micle.totemofreviving.data;
import com.micle.totemofreviving.setup.ModItems; import dev.micle.totemofreviving.setup.ModItems;
import net.minecraft.data.DataGenerator; import net.minecraft.data.DataGenerator;
import net.minecraft.data.recipes.FinishedRecipe; import net.minecraft.data.recipes.FinishedRecipe;
import net.minecraft.data.recipes.RecipeProvider; import net.minecraft.data.recipes.RecipeProvider;
import net.minecraft.data.recipes.ShapedRecipeBuilder; import net.minecraft.data.recipes.ShapedRecipeBuilder;
import net.minecraft.world.item.Items; import net.minecraft.world.item.Items;
import java.util.function.Consumer; import java.util.function.Consumer;
public class ModRecipeProvider extends RecipeProvider { public class ModRecipeProvider extends RecipeProvider {
public ModRecipeProvider(DataGenerator generator_in) { public ModRecipeProvider(DataGenerator generator_in) {
super(generator_in); super(generator_in);
} }
@Override @Override
protected void buildCraftingRecipes(Consumer<FinishedRecipe> consumer) { protected void buildCraftingRecipes(Consumer<FinishedRecipe> consumer) {
ShapedRecipeBuilder.shaped(ModItems.TOTEM_OF_REVIVING.get()) ShapedRecipeBuilder.shaped(ModItems.TOTEM_OF_REVIVING.get())
.define('#', Items.TOTEM_OF_UNDYING) .define('#', Items.TOTEM_OF_UNDYING)
.define('@', Items.DIAMOND) .define('@', Items.DIAMOND)
.pattern("@@@") .pattern("@@@")
.pattern("@#@") .pattern("@#@")
.pattern("@@@") .pattern("@@@")
.unlockedBy("has_item", has(Items.TOTEM_OF_UNDYING)) .unlockedBy("has_item", has(Items.TOTEM_OF_UNDYING))
.save(consumer); .save(consumer);
ShapedRecipeBuilder.shaped(ModItems.REVIVING_CHARGE.get()) ShapedRecipeBuilder.shaped(ModItems.REVIVING_CHARGE.get())
.define('#', Items.TOTEM_OF_UNDYING) .define('#', Items.TOTEM_OF_UNDYING)
.define('@', Items.DIAMOND_BLOCK) .define('@', Items.DIAMOND_BLOCK)
.define('E', Items.ENDER_PEARL) .define('E', Items.ENDER_PEARL)
.pattern("@E@") .pattern("@E@")
.pattern("E#E") .pattern("E#E")
.pattern("@E@") .pattern("@E@")
.unlockedBy("has_item", has(ModItems.TOTEM_OF_REVIVING.get())) .unlockedBy("has_item", has(ModItems.TOTEM_OF_REVIVING.get()))
.save(consumer); .save(consumer);
ShapedRecipeBuilder.shaped(ModItems.STRAW_TOTEM.get()) ShapedRecipeBuilder.shaped(ModItems.STRAW_TOTEM.get())
.define('W', Items.WHEAT) .define('W', Items.WHEAT)
.define('/', Items.STICK) .define('/', Items.STICK)
.define('S', Items.STRING) .define('S', Items.STRING)
.define('N', Items.IRON_NUGGET) .define('N', Items.IRON_NUGGET)
.pattern("NSN") .pattern("NSN")
.pattern("NWN") .pattern("NWN")
.pattern("N/N") .pattern("N/N")
.unlockedBy("has_item", has(Items.WHEAT)) .unlockedBy("has_item", has(Items.WHEAT))
.save(consumer); .save(consumer);
ShapedRecipeBuilder.shaped(ModItems.STRAW_CHARGE.get()) ShapedRecipeBuilder.shaped(ModItems.STRAW_CHARGE.get())
.define('W', Items.WHEAT) .define('W', Items.WHEAT)
.define('E', Items.EMERALD) .define('E', Items.EMERALD)
.define('I', Items.IRON_INGOT) .define('I', Items.IRON_INGOT)
.pattern("IWI") .pattern("IWI")
.pattern("WEW") .pattern("WEW")
.pattern("IWI") .pattern("IWI")
.unlockedBy("has_item", has(Items.EMERALD)) .unlockedBy("has_item", has(Items.EMERALD))
.save(consumer); .save(consumer);
} }
} }

56
src/main/java/com/micle/totemofreviving/data/client/ModItemModelProvider.java → src/main/java/dev/micle/totemofreviving/data/client/ModItemModelProvider.java
View File

@ -1,28 +1,28 @@
package com.micle.totemofreviving.data.client; package dev.micle.totemofreviving.data.client;
import com.micle.totemofreviving.TotemOfReviving; import dev.micle.totemofreviving.TotemOfReviving;
import net.minecraft.data.DataGenerator; import net.minecraft.data.DataGenerator;
import net.minecraftforge.client.model.generators.ItemModelBuilder; import net.minecraftforge.client.model.generators.ItemModelBuilder;
import net.minecraftforge.client.model.generators.ItemModelProvider; import net.minecraftforge.client.model.generators.ItemModelProvider;
import net.minecraftforge.client.model.generators.ModelFile; import net.minecraftforge.client.model.generators.ModelFile;
import net.minecraftforge.common.data.ExistingFileHelper; import net.minecraftforge.common.data.ExistingFileHelper;
public class ModItemModelProvider extends ItemModelProvider { public class ModItemModelProvider extends ItemModelProvider {
public ModItemModelProvider(DataGenerator generator, ExistingFileHelper existing_file_helper) { public ModItemModelProvider(DataGenerator generator, ExistingFileHelper existing_file_helper) {
super(generator, TotemOfReviving.MOD_ID, existing_file_helper); super(generator, TotemOfReviving.MOD_ID, existing_file_helper);
} }
@Override @Override
protected void registerModels() { protected void registerModels() {
ModelFile item_generated = getExistingFile(mcLoc("item/generated")); ModelFile item_generated = getExistingFile(mcLoc("item/generated"));
builder(item_generated, "totem_of_reviving"); builder(item_generated, "totem_of_reviving");
builder(item_generated, "reviving_charge"); builder(item_generated, "reviving_charge");
builder(item_generated, "straw_totem"); builder(item_generated, "straw_totem");
builder(item_generated, "straw_charge"); builder(item_generated, "straw_charge");
} }
private ItemModelBuilder builder(ModelFile item_generated, String name) { private ItemModelBuilder builder(ModelFile item_generated, String name) {
return getBuilder(name).parent(item_generated).texture("layer0", "item/" + name); return getBuilder(name).parent(item_generated).texture("layer0", "item/" + name);
} }
} }

26
src/main/java/com/micle/totemofreviving/events/ServerTickEventHandler.java → src/main/java/dev/micle/totemofreviving/events/ServerTickEventHandler.java
View File

@ -1,13 +1,13 @@
package com.micle.totemofreviving.events; package dev.micle.totemofreviving.events;
import com.micle.totemofreviving.TotemOfReviving; import dev.micle.totemofreviving.TotemOfReviving;
import net.minecraftforge.event.TickEvent; import net.minecraftforge.event.TickEvent;
import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.eventbus.api.SubscribeEvent;
import net.minecraftforge.fmllegacy.server.ServerLifecycleHooks; import net.minecraftforge.fmllegacy.server.ServerLifecycleHooks;
public class ServerTickEventHandler { public class ServerTickEventHandler {
@SubscribeEvent @SubscribeEvent
public void onServerTick(TickEvent.ServerTickEvent event) { public void onServerTick(TickEvent.ServerTickEvent event) {
TotemOfReviving.players = ServerLifecycleHooks.getCurrentServer().getPlayerList(); TotemOfReviving.players = ServerLifecycleHooks.getCurrentServer().getPlayerList();
} }
} }

22
src/main/java/com/micle/totemofreviving/items/RevivingChargeItem.java → src/main/java/dev/micle/totemofreviving/items/RevivingChargeItem.java
View File

@ -1,11 +1,11 @@
package com.micle.totemofreviving.items; package dev.micle.totemofreviving.items;
import net.minecraft.world.item.CreativeModeTab; import net.minecraft.world.item.CreativeModeTab;
import net.minecraft.world.item.Item; import net.minecraft.world.item.Item;
import net.minecraft.world.item.Rarity; import net.minecraft.world.item.Rarity;
public class RevivingChargeItem extends Item { public class RevivingChargeItem extends Item {
public RevivingChargeItem() { public RevivingChargeItem() {
super(new Item.Properties().tab(CreativeModeTab.TAB_MISC).rarity(Rarity.RARE)); super(new Item.Properties().tab(CreativeModeTab.TAB_MISC).rarity(Rarity.RARE));
} }
} }

22
src/main/java/com/micle/totemofreviving/items/StrawChargeItem.java → src/main/java/dev/micle/totemofreviving/items/StrawChargeItem.java
View File

@ -1,11 +1,11 @@
package com.micle.totemofreviving.items; package dev.micle.totemofreviving.items;
import net.minecraft.world.item.CreativeModeTab; import net.minecraft.world.item.CreativeModeTab;
import net.minecraft.world.item.Item; import net.minecraft.world.item.Item;
import net.minecraft.world.item.Rarity; import net.minecraft.world.item.Rarity;
public class StrawChargeItem extends Item { public class StrawChargeItem extends Item {
public StrawChargeItem() { public StrawChargeItem() {
super(new Item.Properties().tab(CreativeModeTab.TAB_MISC).rarity(Rarity.UNCOMMON)); super(new Item.Properties().tab(CreativeModeTab.TAB_MISC).rarity(Rarity.UNCOMMON));
} }
} }

162
src/main/java/com/micle/totemofreviving/items/StrawTotemItem.java → src/main/java/dev/micle/totemofreviving/items/StrawTotemItem.java
View File

@ -1,81 +1,81 @@
package com.micle.totemofreviving.items; package dev.micle.totemofreviving.items;
import com.micle.totemofreviving.TotemOfReviving; import dev.micle.totemofreviving.TotemOfReviving;
import com.micle.totemofreviving.network.C2SRequestPlayerRevive; import dev.micle.totemofreviving.network.C2SRequestPlayerRevive;
import com.micle.totemofreviving.network.C2SRequestTotemCharge; import dev.micle.totemofreviving.network.C2SRequestTotemCharge;
import com.micle.totemofreviving.network.C2SRequestTotemTarget; import dev.micle.totemofreviving.network.C2SRequestTotemTarget;
import com.micle.totemofreviving.setup.ModKeyMappings; import dev.micle.totemofreviving.setup.ModKeyMappings;
import net.minecraft.ChatFormatting; import net.minecraft.ChatFormatting;
import net.minecraft.network.chat.Component; import net.minecraft.network.chat.Component;
import net.minecraft.network.chat.TextComponent; import net.minecraft.network.chat.TextComponent;
import net.minecraft.world.InteractionHand; import net.minecraft.world.InteractionHand;
import net.minecraft.world.InteractionResultHolder; import net.minecraft.world.InteractionResultHolder;
import net.minecraft.world.entity.player.Player; import net.minecraft.world.entity.player.Player;
import net.minecraft.world.item.*; import net.minecraft.world.item.*;
import net.minecraft.world.level.Level; import net.minecraft.world.level.Level;
import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.api.distmarker.OnlyIn;
import java.util.List; import java.util.List;
public class StrawTotemItem extends Item { public class StrawTotemItem extends Item {
public static final String TAG_CHARGE_AMOUNT = "charge"; public static final String TAG_CHARGE_AMOUNT = "charge";
public static final String TAG_TARGET_INDEX = "target_index"; public static final String TAG_TARGET_INDEX = "target_index";
public static final String TAG_TARGET_NAME = "target_name"; public static final String TAG_TARGET_NAME = "target_name";
public static final String TAG_FAIL_CHANCE = "fail_chance"; public static final String TAG_FAIL_CHANCE = "fail_chance";
public static final int STARTING_FAIL_CHANCE = 45; public static final int STARTING_FAIL_CHANCE = 45;
public StrawTotemItem() { public StrawTotemItem() {
super(new Item.Properties().tab(CreativeModeTab.TAB_MISC).stacksTo(1).rarity(Rarity.UNCOMMON)); super(new Item.Properties().tab(CreativeModeTab.TAB_MISC).stacksTo(1).rarity(Rarity.UNCOMMON));
} }
@Override @Override
@OnlyIn(Dist.CLIENT) @OnlyIn(Dist.CLIENT)
public void appendHoverText(ItemStack stack, Level world, List<Component> tooltip, TooltipFlag flag) { public void appendHoverText(ItemStack stack, Level world, List<Component> tooltip, TooltipFlag flag) {
super.appendHoverText(stack, world, tooltip, flag); super.appendHoverText(stack, world, tooltip, flag);
tooltip.add(new TextComponent(ChatFormatting.GOLD + "Charges: " + ChatFormatting.GRAY + stack.getOrCreateTag().getInt(TAG_CHARGE_AMOUNT))); tooltip.add(new TextComponent(ChatFormatting.GOLD + "Charges: " + ChatFormatting.GRAY + stack.getOrCreateTag().getInt(TAG_CHARGE_AMOUNT)));
tooltip.add(new TextComponent(ChatFormatting.GOLD + "Target: " + ChatFormatting.GRAY + stack.getOrCreateTag().getString(TAG_TARGET_NAME))); tooltip.add(new TextComponent(ChatFormatting.GOLD + "Target: " + ChatFormatting.GRAY + stack.getOrCreateTag().getString(TAG_TARGET_NAME)));
tooltip.add(new TextComponent(ChatFormatting.GOLD + "Fail Chance: " + ChatFormatting.GRAY + stack.getOrCreateTag().getInt(TAG_FAIL_CHANCE))); tooltip.add(new TextComponent(ChatFormatting.GOLD + "Fail Chance: " + ChatFormatting.GRAY + stack.getOrCreateTag().getInt(TAG_FAIL_CHANCE)));
tooltip.add(new TextComponent( ChatFormatting.DARK_GRAY + "" + ChatFormatting.ITALIC + "\"Feels kinda funky.\"")); tooltip.add(new TextComponent( ChatFormatting.DARK_GRAY + "" + ChatFormatting.ITALIC + "\"Feels kinda funky.\""));
tooltip.add(new TextComponent("")); tooltip.add(new TextComponent(""));
if (ModKeyMappings.KEYMAP_UI_LSHIFT.isDown()) { if (ModKeyMappings.KEYMAP_UI_LSHIFT.isDown()) {
tooltip.add(new TextComponent(ChatFormatting.YELLOW + "R-CLICK")); tooltip.add(new TextComponent(ChatFormatting.YELLOW + "R-CLICK"));
tooltip.add(new TextComponent(ChatFormatting.GOLD + "When other hand is empty: attempt to revive target.")); tooltip.add(new TextComponent(ChatFormatting.GOLD + "When other hand is empty: attempt to revive target."));
tooltip.add(new TextComponent(ChatFormatting.GOLD + "When other hand has " + ChatFormatting.GRAY + "Straw Reviving Charge" + ChatFormatting.GOLD + ": charge totem.")); tooltip.add(new TextComponent(ChatFormatting.GOLD + "When other hand has " + ChatFormatting.GRAY + "Straw Reviving Charge" + ChatFormatting.GOLD + ": charge totem."));
tooltip.add(new TextComponent("")); tooltip.add(new TextComponent(""));
tooltip.add(new TextComponent(ChatFormatting.YELLOW + "SHIFT R-CLICK")); tooltip.add(new TextComponent(ChatFormatting.YELLOW + "SHIFT R-CLICK"));
tooltip.add(new TextComponent(ChatFormatting.GOLD + "Cycle through available targets.")); tooltip.add(new TextComponent(ChatFormatting.GOLD + "Cycle through available targets."));
} else { } else {
tooltip.add(new TextComponent(ChatFormatting.GRAY + "[" + ChatFormatting.WHITE + "LSHIFT" + ChatFormatting.GRAY + "] for advanced tooltip.")); tooltip.add(new TextComponent(ChatFormatting.GRAY + "[" + ChatFormatting.WHITE + "LSHIFT" + ChatFormatting.GRAY + "] for advanced tooltip."));
} }
} }
@Override @Override
public void onCraftedBy(ItemStack stack, Level world, Player player) { public void onCraftedBy(ItemStack stack, Level world, Player player) {
super.onCraftedBy(stack, world, player); super.onCraftedBy(stack, world, player);
stack.getOrCreateTag().putInt(TAG_CHARGE_AMOUNT, 0); stack.getOrCreateTag().putInt(TAG_CHARGE_AMOUNT, 0);
stack.getOrCreateTag().putInt(TAG_FAIL_CHANCE, STARTING_FAIL_CHANCE); stack.getOrCreateTag().putInt(TAG_FAIL_CHANCE, STARTING_FAIL_CHANCE);
} }
@Override @Override
@OnlyIn(Dist.CLIENT) @OnlyIn(Dist.CLIENT)
public InteractionResultHolder<ItemStack> use(Level world, Player player, InteractionHand hand) { public InteractionResultHolder<ItemStack> use(Level world, Player player, InteractionHand hand) {
if (!world.isClientSide) { return super.use(world, player, hand); } if (!world.isClientSide) { return super.use(world, player, hand); }
if (player.isCrouching()) { if (player.isCrouching()) {
TotemOfReviving.INSTANCE.sendToServer(new C2SRequestTotemTarget(player.getUUID(), hand)); TotemOfReviving.INSTANCE.sendToServer(new C2SRequestTotemTarget(player.getUUID(), hand));
} else { } else {
InteractionHand item_charge_hand = InteractionHand.MAIN_HAND; InteractionHand item_charge_hand = InteractionHand.MAIN_HAND;
if (hand.equals(InteractionHand.MAIN_HAND)) { if (hand.equals(InteractionHand.MAIN_HAND)) {
item_charge_hand = InteractionHand.OFF_HAND; item_charge_hand = InteractionHand.OFF_HAND;
} }
Item item_charge = player.getItemInHand(item_charge_hand).getItem(); Item item_charge = player.getItemInHand(item_charge_hand).getItem();
if (item_charge instanceof StrawChargeItem) { if (item_charge instanceof StrawChargeItem) {
TotemOfReviving.INSTANCE.sendToServer(new C2SRequestTotemCharge(player.getUUID(), hand, item_charge_hand)); TotemOfReviving.INSTANCE.sendToServer(new C2SRequestTotemCharge(player.getUUID(), hand, item_charge_hand));
} else { } else {
TotemOfReviving.INSTANCE.sendToServer(new C2SRequestPlayerRevive(player.getUUID(), hand)); TotemOfReviving.INSTANCE.sendToServer(new C2SRequestPlayerRevive(player.getUUID(), hand));
} }
} }
return super.use(world, player, hand); return super.use(world, player, hand);
} }
} }

154
src/main/java/com/micle/totemofreviving/items/TotemOfRevivingItem.java → src/main/java/dev/micle/totemofreviving/items/TotemOfRevivingItem.java
View File

@ -1,77 +1,77 @@
package com.micle.totemofreviving.items; package dev.micle.totemofreviving.items;
import com.micle.totemofreviving.TotemOfReviving; import dev.micle.totemofreviving.TotemOfReviving;
import com.micle.totemofreviving.network.C2SRequestPlayerRevive; import dev.micle.totemofreviving.network.C2SRequestPlayerRevive;
import com.micle.totemofreviving.network.C2SRequestTotemCharge; import dev.micle.totemofreviving.network.C2SRequestTotemCharge;
import com.micle.totemofreviving.network.C2SRequestTotemTarget; import dev.micle.totemofreviving.network.C2SRequestTotemTarget;
import com.micle.totemofreviving.setup.ModKeyMappings; import dev.micle.totemofreviving.setup.ModKeyMappings;
import net.minecraft.ChatFormatting; import net.minecraft.ChatFormatting;
import net.minecraft.network.chat.Component; import net.minecraft.network.chat.Component;
import net.minecraft.network.chat.TextComponent; import net.minecraft.network.chat.TextComponent;
import net.minecraft.world.InteractionHand; import net.minecraft.world.InteractionHand;
import net.minecraft.world.InteractionResultHolder; import net.minecraft.world.InteractionResultHolder;
import net.minecraft.world.entity.player.Player; import net.minecraft.world.entity.player.Player;
import net.minecraft.world.item.*; import net.minecraft.world.item.*;
import net.minecraft.world.level.Level; import net.minecraft.world.level.Level;
import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.api.distmarker.OnlyIn;
import java.util.List; import java.util.List;
public class TotemOfRevivingItem extends Item { public class TotemOfRevivingItem extends Item {
public static final String TAG_CHARGE_AMOUNT = "charge"; public static final String TAG_CHARGE_AMOUNT = "charge";
public static final String TAG_TARGET_INDEX = "target_index"; public static final String TAG_TARGET_INDEX = "target_index";
public static final String TAG_TARGET_NAME = "target_name"; public static final String TAG_TARGET_NAME = "target_name";
public TotemOfRevivingItem() { public TotemOfRevivingItem() {
super(new Item.Properties().tab(CreativeModeTab.TAB_MISC).stacksTo(1).rarity(Rarity.RARE)); super(new Item.Properties().tab(CreativeModeTab.TAB_MISC).stacksTo(1).rarity(Rarity.RARE));
} }
@Override @Override
@OnlyIn(Dist.CLIENT) @OnlyIn(Dist.CLIENT)
public void appendHoverText(ItemStack stack, Level world, List<Component> tooltip, TooltipFlag flag) { public void appendHoverText(ItemStack stack, Level world, List<Component> tooltip, TooltipFlag flag) {
super.appendHoverText(stack, world, tooltip, flag); super.appendHoverText(stack, world, tooltip, flag);
tooltip.add(new TextComponent(ChatFormatting.DARK_AQUA + "Charges: " + ChatFormatting.BLUE + stack.getOrCreateTag().getInt(TAG_CHARGE_AMOUNT)) { tooltip.add(new TextComponent(ChatFormatting.DARK_AQUA + "Charges: " + ChatFormatting.BLUE + stack.getOrCreateTag().getInt(TAG_CHARGE_AMOUNT)) {
}); });
tooltip.add(new TextComponent(ChatFormatting.DARK_AQUA + "Target: " + ChatFormatting.BLUE + stack.getOrCreateTag().getString(TAG_TARGET_NAME))); tooltip.add(new TextComponent(ChatFormatting.DARK_AQUA + "Target: " + ChatFormatting.BLUE + stack.getOrCreateTag().getString(TAG_TARGET_NAME)));
tooltip.add(new TextComponent("")); tooltip.add(new TextComponent(""));
if (ModKeyMappings.KEYMAP_UI_LSHIFT.isDown()) { if (ModKeyMappings.KEYMAP_UI_LSHIFT.isDown()) {
tooltip.add(new TextComponent(ChatFormatting.AQUA + "R-CLICK")); tooltip.add(new TextComponent(ChatFormatting.AQUA + "R-CLICK"));
tooltip.add(new TextComponent(ChatFormatting.DARK_AQUA + "When other hand is empty: attempt to revive target.")); tooltip.add(new TextComponent(ChatFormatting.DARK_AQUA + "When other hand is empty: attempt to revive target."));
tooltip.add(new TextComponent(ChatFormatting.DARK_AQUA + "When other hand has " + ChatFormatting.BLUE + "Reviving Charge" + ChatFormatting.DARK_AQUA + ": charge totem.")); tooltip.add(new TextComponent(ChatFormatting.DARK_AQUA + "When other hand has " + ChatFormatting.BLUE + "Reviving Charge" + ChatFormatting.DARK_AQUA + ": charge totem."));
tooltip.add(new TextComponent("")); tooltip.add(new TextComponent(""));
tooltip.add(new TextComponent(ChatFormatting.AQUA + "SHIFT R-CLICK")); tooltip.add(new TextComponent(ChatFormatting.AQUA + "SHIFT R-CLICK"));
tooltip.add(new TextComponent(ChatFormatting.DARK_AQUA + "Cycle through available targets.")); tooltip.add(new TextComponent(ChatFormatting.DARK_AQUA + "Cycle through available targets."));
} else { } else {
tooltip.add(new TextComponent(ChatFormatting.GRAY + "[" + ChatFormatting.WHITE + "LSHIFT" + ChatFormatting.GRAY + "] for advanced tooltip.")); tooltip.add(new TextComponent(ChatFormatting.GRAY + "[" + ChatFormatting.WHITE + "LSHIFT" + ChatFormatting.GRAY + "] for advanced tooltip."));
} }
} }
@Override @Override
public void onCraftedBy(ItemStack stack, Level world, Player player) { public void onCraftedBy(ItemStack stack, Level world, Player player) {
super.onCraftedBy(stack, world, player); super.onCraftedBy(stack, world, player);
stack.getOrCreateTag().putInt(TAG_CHARGE_AMOUNT, 0); stack.getOrCreateTag().putInt(TAG_CHARGE_AMOUNT, 0);
} }
@Override @Override
@OnlyIn(Dist.CLIENT) @OnlyIn(Dist.CLIENT)
public InteractionResultHolder<ItemStack> use(Level world, Player player, InteractionHand hand) { public InteractionResultHolder<ItemStack> use(Level world, Player player, InteractionHand hand) {
if (!world.isClientSide) { return super.use(world, player, hand); } if (!world.isClientSide) { return super.use(world, player, hand); }
if (player.isCrouching()) { if (player.isCrouching()) {
TotemOfReviving.INSTANCE.sendToServer(new C2SRequestTotemTarget(player.getUUID(), hand)); TotemOfReviving.INSTANCE.sendToServer(new C2SRequestTotemTarget(player.getUUID(), hand));
} else { } else {
InteractionHand item_charge_hand = InteractionHand.MAIN_HAND; InteractionHand item_charge_hand = InteractionHand.MAIN_HAND;
if (hand.equals(InteractionHand.MAIN_HAND)) { if (hand.equals(InteractionHand.MAIN_HAND)) {
item_charge_hand = InteractionHand.OFF_HAND; item_charge_hand = InteractionHand.OFF_HAND;
} }
Item item_charge = player.getItemInHand(item_charge_hand).getItem(); Item item_charge = player.getItemInHand(item_charge_hand).getItem();
if (item_charge instanceof RevivingChargeItem) { if (item_charge instanceof RevivingChargeItem) {
TotemOfReviving.INSTANCE.sendToServer(new C2SRequestTotemCharge(player.getUUID(), hand, item_charge_hand)); TotemOfReviving.INSTANCE.sendToServer(new C2SRequestTotemCharge(player.getUUID(), hand, item_charge_hand));
} else { } else {
TotemOfReviving.INSTANCE.sendToServer(new C2SRequestPlayerRevive(player.getUUID(), hand)); TotemOfReviving.INSTANCE.sendToServer(new C2SRequestPlayerRevive(player.getUUID(), hand));
} }
} }
return super.use(world, player, hand); return super.use(world, player, hand);
} }
} }

172
src/main/java/com/micle/totemofreviving/network/C2SRequestPlayerRevive.java → src/main/java/dev/micle/totemofreviving/network/C2SRequestPlayerRevive.java
View File

@ -1,86 +1,86 @@
package com.micle.totemofreviving.network; package dev.micle.totemofreviving.network;
import com.micle.totemofreviving.TotemOfReviving; import dev.micle.totemofreviving.TotemOfReviving;
import com.micle.totemofreviving.items.StrawTotemItem; import dev.micle.totemofreviving.items.StrawTotemItem;
import com.micle.totemofreviving.items.TotemOfRevivingItem; import dev.micle.totemofreviving.items.TotemOfRevivingItem;
import com.micle.totemofreviving.utils.Utils; import dev.micle.totemofreviving.utils.Utils;
import net.minecraft.ChatFormatting; import net.minecraft.ChatFormatting;
import net.minecraft.network.FriendlyByteBuf; import net.minecraft.network.FriendlyByteBuf;
import net.minecraft.network.chat.TextComponent; import net.minecraft.network.chat.TextComponent;
import net.minecraft.server.level.ServerLevel; import net.minecraft.server.level.ServerLevel;
import net.minecraft.server.level.ServerPlayer; import net.minecraft.server.level.ServerPlayer;
import net.minecraft.stats.Stats; import net.minecraft.stats.Stats;
import net.minecraft.world.InteractionHand; import net.minecraft.world.InteractionHand;
import net.minecraft.world.effect.MobEffectInstance; import net.minecraft.world.effect.MobEffectInstance;
import net.minecraft.world.effect.MobEffects; import net.minecraft.world.effect.MobEffects;
import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.ItemStack;
import net.minecraft.world.level.GameType; import net.minecraft.world.level.GameType;
import net.minecraftforge.fmllegacy.network.NetworkEvent; import net.minecraftforge.fmllegacy.network.NetworkEvent;
import java.util.UUID; import java.util.UUID;
import java.util.function.Supplier; import java.util.function.Supplier;
public class C2SRequestPlayerRevive { public class C2SRequestPlayerRevive {
private final UUID player_uuid; private final UUID player_uuid;
private final InteractionHand hand; private final InteractionHand hand;
public C2SRequestPlayerRevive(final UUID player_uuid, final InteractionHand hand) { public C2SRequestPlayerRevive(final UUID player_uuid, final InteractionHand hand) {
this.player_uuid = player_uuid; this.player_uuid = player_uuid;
this.hand = hand; this.hand = hand;
} }
public static void encode(final C2SRequestPlayerRevive msg, FriendlyByteBuf packet_buffer) { public static void encode(final C2SRequestPlayerRevive msg, FriendlyByteBuf packet_buffer) {
packet_buffer.writeUUID( msg.player_uuid); packet_buffer.writeUUID( msg.player_uuid);
packet_buffer.writeEnum(msg.hand); packet_buffer.writeEnum(msg.hand);
} }
public static C2SRequestPlayerRevive decode(final FriendlyByteBuf packet_buffer) { public static C2SRequestPlayerRevive decode(final FriendlyByteBuf packet_buffer) {
return new C2SRequestPlayerRevive(packet_buffer.readUUID(), packet_buffer.readEnum(InteractionHand.class)); return new C2SRequestPlayerRevive(packet_buffer.readUUID(), packet_buffer.readEnum(InteractionHand.class));
} }
public static void handle(final C2SRequestPlayerRevive msg, final Supplier<NetworkEvent.Context> context_supplier) { public static void handle(final C2SRequestPlayerRevive msg, final Supplier<NetworkEvent.Context> context_supplier) {
final NetworkEvent.Context context = context_supplier.get(); final NetworkEvent.Context context = context_supplier.get();
context.enqueueWork(() -> { context.enqueueWork(() -> {
final ServerPlayer sender = TotemOfReviving.players.getPlayer(msg.player_uuid); final ServerPlayer sender = TotemOfReviving.players.getPlayer(msg.player_uuid);
if (sender == null) { return; } if (sender == null) { return; }
ItemStack item = sender.getItemInHand(msg.hand); ItemStack item = sender.getItemInHand(msg.hand);
if (item.getOrCreateTag().getInt(TotemOfRevivingItem.TAG_TARGET_INDEX) > TotemOfReviving.players.getPlayerCount()-1 || item.getOrCreateTag().getString(TotemOfRevivingItem.TAG_TARGET_NAME).equals("")) { if (item.getOrCreateTag().getInt(TotemOfRevivingItem.TAG_TARGET_INDEX) > TotemOfReviving.players.getPlayerCount()-1 || item.getOrCreateTag().getString(TotemOfRevivingItem.TAG_TARGET_NAME).equals("")) {
sender.sendMessage(new TextComponent(ChatFormatting.RED + "Error getting target! (Try selecting the target again)"), sender.getUUID()); sender.sendMessage(new TextComponent(ChatFormatting.RED + "Error getting target! (Try selecting the target again)"), sender.getUUID());
} else { } else {
ServerPlayer player_to_revive = TotemOfReviving.players.getPlayerByName(item.getOrCreateTag().getString(TotemOfRevivingItem.TAG_TARGET_NAME)); ServerPlayer player_to_revive = TotemOfReviving.players.getPlayerByName(item.getOrCreateTag().getString(TotemOfRevivingItem.TAG_TARGET_NAME));
ServerLevel player_to_revive_world = player_to_revive.getLevel(); ServerLevel player_to_revive_world = player_to_revive.getLevel();
ServerLevel sender_world = sender.getLevel(); ServerLevel sender_world = sender.getLevel();
int required_charge = player_to_revive.getStats().getValue(Stats.CUSTOM.get(Stats.DEATHS)); int required_charge = player_to_revive.getStats().getValue(Stats.CUSTOM.get(Stats.DEATHS));
if (player_to_revive.isSpectator()) { if (player_to_revive.isSpectator()) {
if (player_to_revive_world.equals(sender_world)) { if (player_to_revive_world.equals(sender_world)) {
if (item.getOrCreateTag().getInt(TotemOfRevivingItem.TAG_CHARGE_AMOUNT) >= required_charge) { if (item.getOrCreateTag().getInt(TotemOfRevivingItem.TAG_CHARGE_AMOUNT) >= required_charge) {
if (item.getOrCreateTag().contains(StrawTotemItem.TAG_FAIL_CHANCE)) { if (item.getOrCreateTag().contains(StrawTotemItem.TAG_FAIL_CHANCE)) {
int fail_chance = item.getOrCreateTag().getInt(StrawTotemItem.TAG_FAIL_CHANCE); int fail_chance = item.getOrCreateTag().getInt(StrawTotemItem.TAG_FAIL_CHANCE);
if (Utils.randomIntRange(0, 100) <= fail_chance) { if (Utils.randomIntRange(0, 100) <= fail_chance) {
item.getOrCreateTag().putInt(StrawTotemItem.TAG_CHARGE_AMOUNT, item.getOrCreateTag().getInt(StrawTotemItem.TAG_CHARGE_AMOUNT)-required_charge); item.getOrCreateTag().putInt(StrawTotemItem.TAG_CHARGE_AMOUNT, item.getOrCreateTag().getInt(StrawTotemItem.TAG_CHARGE_AMOUNT)-required_charge);
item.getOrCreateTag().putInt(StrawTotemItem.TAG_FAIL_CHANCE, fail_chance-(5*required_charge)); item.getOrCreateTag().putInt(StrawTotemItem.TAG_FAIL_CHANCE, fail_chance-(5*required_charge));
sender.addEffect(new MobEffectInstance(MobEffects.POISON, ((fail_chance*10) / 2), 1)); sender.addEffect(new MobEffectInstance(MobEffects.POISON, ((fail_chance*10) / 2), 1));
return; return;
} else { } else {
item.getOrCreateTag().putInt(StrawTotemItem.TAG_FAIL_CHANCE, fail_chance-(5*required_charge)); item.getOrCreateTag().putInt(StrawTotemItem.TAG_FAIL_CHANCE, fail_chance-(5*required_charge));
} }
} }
player_to_revive.teleportTo(sender.getX(), sender.getY(), sender.getZ()); player_to_revive.teleportTo(sender.getX(), sender.getY(), sender.getZ());
player_to_revive.setGameMode(GameType.SURVIVAL); player_to_revive.setGameMode(GameType.SURVIVAL);
item.getOrCreateTag().putInt(TotemOfRevivingItem.TAG_CHARGE_AMOUNT, item.getOrCreateTag().getInt(TotemOfRevivingItem.TAG_CHARGE_AMOUNT) - required_charge); item.getOrCreateTag().putInt(TotemOfRevivingItem.TAG_CHARGE_AMOUNT, item.getOrCreateTag().getInt(TotemOfRevivingItem.TAG_CHARGE_AMOUNT) - required_charge);
sender.sendMessage(new TextComponent(ChatFormatting.GRAY + "Successfully revived " + ChatFormatting.DARK_GRAY + player_to_revive.getDisplayName().getString()), sender.getUUID()); sender.sendMessage(new TextComponent(ChatFormatting.GRAY + "Successfully revived " + ChatFormatting.DARK_GRAY + player_to_revive.getDisplayName().getString()), sender.getUUID());
} else { } else {
sender.sendMessage(new TextComponent(ChatFormatting.GRAY + "Not enough charge! Required charge is: " + ChatFormatting.DARK_GRAY + required_charge), sender.getUUID()); sender.sendMessage(new TextComponent(ChatFormatting.GRAY + "Not enough charge! Required charge is: " + ChatFormatting.DARK_GRAY + required_charge), sender.getUUID());
} }
} else { } else {
sender.sendMessage(new TextComponent(ChatFormatting.DARK_GRAY + player_to_revive.getDisplayName().getString() + ChatFormatting.GRAY + " is not in this dimension!"), sender.getUUID()); sender.sendMessage(new TextComponent(ChatFormatting.DARK_GRAY + player_to_revive.getDisplayName().getString() + ChatFormatting.GRAY + " is not in this dimension!"), sender.getUUID());
} }
} else { } else {
sender.sendMessage(new TextComponent(ChatFormatting.DARK_GRAY + player_to_revive.getDisplayName().getString() + ChatFormatting.GRAY + " is not dead!"), sender.getUUID()); sender.sendMessage(new TextComponent(ChatFormatting.DARK_GRAY + player_to_revive.getDisplayName().getString() + ChatFormatting.GRAY + " is not dead!"), sender.getUUID());
} }
} }
}); });
context.setPacketHandled(true); context.setPacketHandled(true);
} }
} }

126
src/main/java/com/micle/totemofreviving/network/C2SRequestTotemCharge.java → src/main/java/dev/micle/totemofreviving/network/C2SRequestTotemCharge.java
View File

@ -1,63 +1,63 @@
package com.micle.totemofreviving.network; package dev.micle.totemofreviving.network;
import com.micle.totemofreviving.TotemOfReviving; import dev.micle.totemofreviving.TotemOfReviving;
import com.micle.totemofreviving.items.StrawTotemItem; import dev.micle.totemofreviving.items.StrawTotemItem;
import com.micle.totemofreviving.items.TotemOfRevivingItem; import dev.micle.totemofreviving.items.TotemOfRevivingItem;
import com.micle.totemofreviving.utils.Utils; import dev.micle.totemofreviving.utils.Utils;
import net.minecraft.network.FriendlyByteBuf; import net.minecraft.network.FriendlyByteBuf;
import net.minecraft.server.level.ServerPlayer; import net.minecraft.server.level.ServerPlayer;
import net.minecraft.world.InteractionHand; import net.minecraft.world.InteractionHand;
import net.minecraft.world.effect.MobEffectInstance; import net.minecraft.world.effect.MobEffectInstance;
import net.minecraft.world.effect.MobEffects; import net.minecraft.world.effect.MobEffects;
import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.Items; import net.minecraft.world.item.Items;
import net.minecraftforge.fmllegacy.network.NetworkEvent; import net.minecraftforge.fmllegacy.network.NetworkEvent;
import java.util.UUID; import java.util.UUID;
import java.util.function.Supplier; import java.util.function.Supplier;
public class C2SRequestTotemCharge { public class C2SRequestTotemCharge {
private final UUID player_uuid; private final UUID player_uuid;
private final InteractionHand hand; private final InteractionHand hand;
private final InteractionHand item_charge_hand; private final InteractionHand item_charge_hand;
public C2SRequestTotemCharge(final UUID player_uuid, final InteractionHand hand, final InteractionHand item_charge_hand) { public C2SRequestTotemCharge(final UUID player_uuid, final InteractionHand hand, final InteractionHand item_charge_hand) {
this.player_uuid = player_uuid; this.player_uuid = player_uuid;
this.hand = hand; this.hand = hand;
this.item_charge_hand = item_charge_hand; this.item_charge_hand = item_charge_hand;
} }
public static void encode(final C2SRequestTotemCharge msg, final FriendlyByteBuf packet_buffer) { public static void encode(final C2SRequestTotemCharge msg, final FriendlyByteBuf packet_buffer) {
packet_buffer.writeUUID(msg.player_uuid); packet_buffer.writeUUID(msg.player_uuid);
packet_buffer.writeEnum(msg.hand); packet_buffer.writeEnum(msg.hand);
packet_buffer.writeEnum(msg.item_charge_hand); packet_buffer.writeEnum(msg.item_charge_hand);
} }
public static C2SRequestTotemCharge decode(final FriendlyByteBuf packet_buffer) { public static C2SRequestTotemCharge decode(final FriendlyByteBuf packet_buffer) {
return new C2SRequestTotemCharge(packet_buffer.readUUID(), packet_buffer.readEnum(InteractionHand.class), packet_buffer.readEnum(InteractionHand.class)); return new C2SRequestTotemCharge(packet_buffer.readUUID(), packet_buffer.readEnum(InteractionHand.class), packet_buffer.readEnum(InteractionHand.class));
} }
public static void handle(final C2SRequestTotemCharge msg, final Supplier<NetworkEvent.Context> context_supplier) { public static void handle(final C2SRequestTotemCharge msg, final Supplier<NetworkEvent.Context> context_supplier) {
final NetworkEvent.Context context = context_supplier.get(); final NetworkEvent.Context context = context_supplier.get();
context.enqueueWork(() -> { context.enqueueWork(() -> {
final ServerPlayer sender = TotemOfReviving.players.getPlayer(msg.player_uuid); final ServerPlayer sender = TotemOfReviving.players.getPlayer(msg.player_uuid);
if (sender == null) { return; } if (sender == null) { return; }
ItemStack charge_item = sender.getItemInHand(msg.item_charge_hand); ItemStack charge_item = sender.getItemInHand(msg.item_charge_hand);
ItemStack totem_item = sender.getItemInHand(msg.hand); ItemStack totem_item = sender.getItemInHand(msg.hand);
charge_item.setCount(charge_item.getCount()-1); charge_item.setCount(charge_item.getCount()-1);
totem_item.getOrCreateTag().putInt(TotemOfRevivingItem.TAG_CHARGE_AMOUNT, totem_item.getOrCreateTag().getInt(TotemOfRevivingItem.TAG_CHARGE_AMOUNT)+1); totem_item.getOrCreateTag().putInt(TotemOfRevivingItem.TAG_CHARGE_AMOUNT, totem_item.getOrCreateTag().getInt(TotemOfRevivingItem.TAG_CHARGE_AMOUNT)+1);
if (totem_item.getOrCreateTag().contains(StrawTotemItem.TAG_FAIL_CHANCE)) { if (totem_item.getOrCreateTag().contains(StrawTotemItem.TAG_FAIL_CHANCE)) {
int fail_chance = totem_item.getOrCreateTag().getInt(StrawTotemItem.TAG_FAIL_CHANCE); int fail_chance = totem_item.getOrCreateTag().getInt(StrawTotemItem.TAG_FAIL_CHANCE);
if (Utils.randomIntRange(0, 100) <= fail_chance) { if (Utils.randomIntRange(0, 100) <= fail_chance) {
sender.setItemInHand(msg.hand, new ItemStack(Items.AIR)); sender.setItemInHand(msg.hand, new ItemStack(Items.AIR));
sender.addEffect(new MobEffectInstance(MobEffects.POISON, ((fail_chance*10) / 2), 1)); sender.addEffect(new MobEffectInstance(MobEffects.POISON, ((fail_chance*10) / 2), 1));
} else { } else {
totem_item.getOrCreateTag().putInt(StrawTotemItem.TAG_FAIL_CHANCE, fail_chance+5); totem_item.getOrCreateTag().putInt(StrawTotemItem.TAG_FAIL_CHANCE, fail_chance+5);
} }
} }
}); });
context.setPacketHandled(true); context.setPacketHandled(true);
} }
} }

104
src/main/java/com/micle/totemofreviving/network/C2SRequestTotemTarget.java → src/main/java/dev/micle/totemofreviving/network/C2SRequestTotemTarget.java
View File

@ -1,52 +1,52 @@
package com.micle.totemofreviving.network; package dev.micle.totemofreviving.network;
import com.micle.totemofreviving.TotemOfReviving; import dev.micle.totemofreviving.TotemOfReviving;
import com.micle.totemofreviving.items.TotemOfRevivingItem; import dev.micle.totemofreviving.items.TotemOfRevivingItem;
import net.minecraft.ChatFormatting; import net.minecraft.ChatFormatting;
import net.minecraft.network.FriendlyByteBuf; import net.minecraft.network.FriendlyByteBuf;
import net.minecraft.network.chat.TextComponent; import net.minecraft.network.chat.TextComponent;
import net.minecraft.server.level.ServerPlayer; import net.minecraft.server.level.ServerPlayer;
import net.minecraft.world.InteractionHand; import net.minecraft.world.InteractionHand;
import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.ItemStack;
import net.minecraftforge.fmllegacy.network.NetworkEvent; import net.minecraftforge.fmllegacy.network.NetworkEvent;
import java.util.UUID; import java.util.UUID;
import java.util.function.Supplier; import java.util.function.Supplier;
public class C2SRequestTotemTarget { public class C2SRequestTotemTarget {
private final UUID player_uuid; private final UUID player_uuid;
private final InteractionHand hand; private final InteractionHand hand;
public C2SRequestTotemTarget(final UUID player_uuid, final InteractionHand hand) { public C2SRequestTotemTarget(final UUID player_uuid, final InteractionHand hand) {
this.player_uuid = player_uuid; this.player_uuid = player_uuid;
this.hand = hand; this.hand = hand;
} }
public static void encode(final C2SRequestTotemTarget msg, final FriendlyByteBuf packet_buffer) { public static void encode(final C2SRequestTotemTarget msg, final FriendlyByteBuf packet_buffer) {
packet_buffer.writeUUID(msg.player_uuid); packet_buffer.writeUUID(msg.player_uuid);
packet_buffer.writeEnum(msg.hand); packet_buffer.writeEnum(msg.hand);
} }
public static C2SRequestTotemTarget decode(final FriendlyByteBuf packet_buffer) { public static C2SRequestTotemTarget decode(final FriendlyByteBuf packet_buffer) {
return new C2SRequestTotemTarget(packet_buffer.readUUID(), packet_buffer.readEnum(InteractionHand.class)); return new C2SRequestTotemTarget(packet_buffer.readUUID(), packet_buffer.readEnum(InteractionHand.class));
} }
public static void handle(final C2SRequestTotemTarget msg, final Supplier<NetworkEvent.Context> context_supplier) { public static void handle(final C2SRequestTotemTarget msg, final Supplier<NetworkEvent.Context> context_supplier) {
final NetworkEvent.Context context = context_supplier.get(); final NetworkEvent.Context context = context_supplier.get();
context.enqueueWork(() -> { context.enqueueWork(() -> {
final ServerPlayer sender = TotemOfReviving.players.getPlayer(msg.player_uuid); final ServerPlayer sender = TotemOfReviving.players.getPlayer(msg.player_uuid);
if (sender == null) { return; } if (sender == null) { return; }
ItemStack item = sender.getItemInHand(msg.hand); ItemStack item = sender.getItemInHand(msg.hand);
int current_player_index = item.getOrCreateTag().getInt(TotemOfRevivingItem.TAG_TARGET_INDEX) + 1; int current_player_index = item.getOrCreateTag().getInt(TotemOfRevivingItem.TAG_TARGET_INDEX) + 1;
if (current_player_index > TotemOfReviving.players.getPlayerCount()-1) { if (current_player_index > TotemOfReviving.players.getPlayerCount()-1) {
current_player_index = 0; current_player_index = 0;
} }
item.getOrCreateTag().putInt(TotemOfRevivingItem.TAG_TARGET_INDEX, current_player_index); item.getOrCreateTag().putInt(TotemOfRevivingItem.TAG_TARGET_INDEX, current_player_index);
item.getOrCreateTag().putString(TotemOfRevivingItem.TAG_TARGET_NAME, TotemOfReviving.players.getPlayers().get(current_player_index).getDisplayName().getString()); item.getOrCreateTag().putString(TotemOfRevivingItem.TAG_TARGET_NAME, TotemOfReviving.players.getPlayers().get(current_player_index).getDisplayName().getString());
sender.sendMessage(new TextComponent(ChatFormatting.GRAY + "Target: " + ChatFormatting.DARK_GRAY + item.getOrCreateTag().getString(TotemOfRevivingItem.TAG_TARGET_NAME)), sender.getUUID()); sender.sendMessage(new TextComponent(ChatFormatting.GRAY + "Target: " + ChatFormatting.DARK_GRAY + item.getOrCreateTag().getString(TotemOfRevivingItem.TAG_TARGET_NAME)), sender.getUUID());
}); });
context.setPacketHandled(true); context.setPacketHandled(true);
} }
} }

36
src/main/java/com/micle/totemofreviving/setup/ModItems.java → src/main/java/dev/micle/totemofreviving/setup/ModItems.java
View File

@ -1,18 +1,18 @@
package com.micle.totemofreviving.setup; package dev.micle.totemofreviving.setup;
import com.micle.totemofreviving.items.RevivingChargeItem; import dev.micle.totemofreviving.items.RevivingChargeItem;
import com.micle.totemofreviving.items.StrawChargeItem; import dev.micle.totemofreviving.items.StrawChargeItem;
import com.micle.totemofreviving.items.StrawTotemItem; import dev.micle.totemofreviving.items.StrawTotemItem;
import com.micle.totemofreviving.items.TotemOfRevivingItem; import dev.micle.totemofreviving.items.TotemOfRevivingItem;
import net.minecraft.world.item.Item; import net.minecraft.world.item.Item;
import net.minecraftforge.fmllegacy.RegistryObject; import net.minecraftforge.fmllegacy.RegistryObject;
public class ModItems { public class ModItems {
public static final RegistryObject<Item> TOTEM_OF_REVIVING = Registration.ITEMS.register("totem_of_reviving", TotemOfRevivingItem::new); public static final RegistryObject<Item> TOTEM_OF_REVIVING = Registration.ITEMS.register("totem_of_reviving", TotemOfRevivingItem::new);
public static final RegistryObject<Item> REVIVING_CHARGE = Registration.ITEMS.register("reviving_charge", RevivingChargeItem::new); public static final RegistryObject<Item> REVIVING_CHARGE = Registration.ITEMS.register("reviving_charge", RevivingChargeItem::new);
public static final RegistryObject<Item> STRAW_TOTEM = Registration.ITEMS.register("straw_totem", StrawTotemItem::new); public static final RegistryObject<Item> STRAW_TOTEM = Registration.ITEMS.register("straw_totem", StrawTotemItem::new);
public static final RegistryObject<Item> STRAW_CHARGE = Registration.ITEMS.register("straw_charge", StrawChargeItem::new); public static final RegistryObject<Item> STRAW_CHARGE = Registration.ITEMS.register("straw_charge", StrawChargeItem::new);
static void register() { static void register() {
} }
} }

2
src/main/java/com/micle/totemofreviving/setup/ModKeyMappings.java → src/main/java/dev/micle/totemofreviving/setup/ModKeyMappings.java
View File

@ -1,4 +1,4 @@
package com.micle.totemofreviving.setup; package dev.micle.totemofreviving.setup;
import com.mojang.blaze3d.platform.InputConstants; import com.mojang.blaze3d.platform.InputConstants;
import net.minecraft.client.KeyMapping; import net.minecraft.client.KeyMapping;

50
src/main/java/com/micle/totemofreviving/setup/Registration.java → src/main/java/dev/micle/totemofreviving/setup/Registration.java
View File

@ -1,25 +1,25 @@
package com.micle.totemofreviving.setup; package dev.micle.totemofreviving.setup;
import com.micle.totemofreviving.TotemOfReviving; import dev.micle.totemofreviving.TotemOfReviving;
import com.micle.totemofreviving.events.ServerTickEventHandler; import dev.micle.totemofreviving.events.ServerTickEventHandler;
import net.minecraft.world.item.Item; import net.minecraft.world.item.Item;
import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.Block;
import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.eventbus.api.IEventBus; import net.minecraftforge.eventbus.api.IEventBus;
import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
import net.minecraftforge.registries.DeferredRegister; import net.minecraftforge.registries.DeferredRegister;
import net.minecraftforge.registries.ForgeRegistries; import net.minecraftforge.registries.ForgeRegistries;
public class Registration { public class Registration {
public static final DeferredRegister<Block> BLOCKS = DeferredRegister.create(ForgeRegistries.BLOCKS, TotemOfReviving.MOD_ID); public static final DeferredRegister<Block> BLOCKS = DeferredRegister.create(ForgeRegistries.BLOCKS, TotemOfReviving.MOD_ID);
public static final DeferredRegister<Item> ITEMS = DeferredRegister.create(ForgeRegistries.ITEMS, TotemOfReviving.MOD_ID); public static final DeferredRegister<Item> ITEMS = DeferredRegister.create(ForgeRegistries.ITEMS, TotemOfReviving.MOD_ID);
public static void register() { public static void register() {
IEventBus mod_event_bus = FMLJavaModLoadingContext.get().getModEventBus(); IEventBus mod_event_bus = FMLJavaModLoadingContext.get().getModEventBus();
BLOCKS.register(mod_event_bus); BLOCKS.register(mod_event_bus);
ITEMS.register(mod_event_bus); ITEMS.register(mod_event_bus);
MinecraftForge.EVENT_BUS.register(new ServerTickEventHandler()); MinecraftForge.EVENT_BUS.register(new ServerTickEventHandler());
ModItems.register(); ModItems.register();
} }
} }

38
src/main/java/com/micle/totemofreviving/utils/Utils.java → src/main/java/dev/micle/totemofreviving/utils/Utils.java
View File

@ -1,19 +1,19 @@
package com.micle.totemofreviving.utils; package dev.micle.totemofreviving.utils;
public class Utils { public class Utils {
public static float clamp(float val, float min, float max) { public static float clamp(float val, float min, float max) {
return Math.max(min, Math.min(max, val)); return Math.max(min, Math.min(max, val));
} }
public static int randomIntRange(int min, int max) { public static int randomIntRange(int min, int max) {
return (int) randomDoubleRange(min, max); return (int) randomDoubleRange(min, max);
} }
public static float randomFloatRange(float min, float max) { public static float randomFloatRange(float min, float max) {
return (float) randomDoubleRange(min, max); return (float) randomDoubleRange(min, max);
} }
public static double randomDoubleRange(double min, double max) { public static double randomDoubleRange(double min, double max) {
return ((Math.random() * (max - min)) + min); return ((Math.random() * (max - min)) + min);
} }
} }