[1.20.1] Implement Refabricated Skillet tweaks.

src/main/java/vectorwing/farmersdelight/client/ClientSetup.java

@@ -1,16 +1,27 @@
 package vectorwing.farmersdelight.client;
 
 import net.minecraft.client.gui.screens.MenuScreens;
+import net.minecraft.client.model.HumanoidModel;
+import net.minecraft.client.renderer.item.ItemProperties;
+import net.minecraft.resources.ResourceLocation;
 import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent;
 import vectorwing.farmersdelight.client.gui.ComfortHealthOverlay;
 import vectorwing.farmersdelight.client.gui.CookingPotScreen;
 import vectorwing.farmersdelight.client.gui.NourishmentHungerOverlay;
+import vectorwing.farmersdelight.client.renderer.SkilletItemRenderer;
+import vectorwing.farmersdelight.common.registry.ModItems;
 import vectorwing.farmersdelight.common.registry.ModMenuTypes;
 
 public class ClientSetup
 {
+	public static final HumanoidModel.ArmPose SKILLET_FLIP = HumanoidModel.ArmPose.create("SKILLET_FLIP", false, new SkilletItemRenderer.ArmPoseTransformer());
+
 	public static void init(final FMLClientSetupEvent event) {
-		event.enqueueWork(() -> MenuScreens.register(ModMenuTypes.COOKING_POT.get(), CookingPotScreen::new));
+		event.enqueueWork(() -> {
+			MenuScreens.register(ModMenuTypes.COOKING_POT.get(), CookingPotScreen::new);
+			ItemProperties.register(ModItems.SKILLET.get(), new ResourceLocation("cooking"),
+					(stack, world, entity, s) -> stack.getTagElement("Cooking") != null ? 1 : 0);
+		});
 
 		NourishmentHungerOverlay.init();
 		ComfortHealthOverlay.init();

src/main/java/vectorwing/farmersdelight/client/event/ClientSetupEvents.java

@@ -2,17 +2,13 @@
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.entity.ThrownItemRenderer;
-import net.minecraft.client.resources.model.BakedModel;
-import net.minecraft.client.resources.model.ModelResourceLocation;
-import net.minecraft.resources.ResourceLocation;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.client.event.*;
 import net.minecraftforge.eventbus.api.EventPriority;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
 import net.minecraftforge.fml.common.Mod;
 import vectorwing.farmersdelight.FarmersDelight;
 import vectorwing.farmersdelight.client.gui.CookingPotTooltip;
-import vectorwing.farmersdelight.client.model.SkilletModel;
 import vectorwing.farmersdelight.client.particle.StarParticle;
 import vectorwing.farmersdelight.client.particle.SteamParticle;
 import vectorwing.farmersdelight.client.recipebook.RecipeCategories;
@@ -21,8 +17,6 @@
 import vectorwing.farmersdelight.common.registry.ModEntityTypes;
 import vectorwing.farmersdelight.common.registry.ModParticleTypes;
 
-import java.util.Map;
-
 @Mod.EventBusSubscriber(modid = FarmersDelight.MODID, bus = Mod.EventBusSubscriber.Bus.MOD, value = Dist.CLIENT)
 public class ClientSetupEvents
 {
@@ -36,27 +30,11 @@ public static void registerCustomTooltipRenderers(RegisterClientTooltipComponent
 		event.register(CookingPotTooltip.CookingPotTooltipComponent.class, CookingPotTooltip::new);
 	}
 
-	@SubscribeEvent
-	public static void onModelRegister(ModelEvent.RegisterAdditional event) {
-		event.register(new ModelResourceLocation(new ResourceLocation(FarmersDelight.MODID, "skillet_cooking"), "inventory"));
-	}
-
 	@SubscribeEvent
 	public static void onEntityRendererRegister(EntityRenderersEvent.RegisterRenderers event) {
 		event.registerEntityRenderer(ModEntityTypes.ROTTEN_TOMATO.get(), ThrownItemRenderer::new);
 	}
 
-	@SubscribeEvent
-	public static void onModelBake(ModelEvent.ModifyBakingResult event) {
-		Map<ResourceLocation, BakedModel> modelRegistry = event.getModels();
-
-		ModelResourceLocation skilletLocation = new ModelResourceLocation(new ResourceLocation(FarmersDelight.MODID, "skillet"), "inventory");
-		BakedModel skilletModel = modelRegistry.get(skilletLocation);
-		ModelResourceLocation skilletCookingLocation = new ModelResourceLocation(new ResourceLocation(FarmersDelight.MODID, "skillet_cooking"), "inventory");
-		BakedModel skilletCookingModel = modelRegistry.get(skilletCookingLocation);
-		modelRegistry.put(skilletLocation, new SkilletModel(event.getModelBakery(), skilletModel, skilletCookingModel));
-	}
-
 	@SubscribeEvent
 	public static void onRegisterRenderers(EntityRenderersEvent.RegisterRenderers event) {
 		event.registerBlockEntityRenderer(ModBlockEntityTypes.STOVE.get(), StoveRenderer::new);

src/main/java/vectorwing/farmersdelight/client/event/KeybindEvents.java

@@ -0,0 +1,29 @@
+package vectorwing.farmersdelight.client.event;
+
+import net.minecraft.client.Minecraft;
+import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.item.ItemStack;
+import net.minecraftforge.api.distmarker.Dist;
+import net.minecraftforge.event.TickEvent;
+import net.minecraftforge.eventbus.api.SubscribeEvent;
+import net.minecraftforge.fml.common.Mod;
+import vectorwing.farmersdelight.FarmersDelight;
+import vectorwing.farmersdelight.common.item.SkilletItem;
+import vectorwing.farmersdelight.common.networking.ModNetworking;
+
+@Mod.EventBusSubscriber(modid = FarmersDelight.MODID, bus = Mod.EventBusSubscriber.Bus.FORGE, value = Dist.CLIENT)
+public class KeybindEvents {
+    @SubscribeEvent
+    public static void preClientTick(TickEvent.ClientTickEvent event) { // Run this on pre so inputs don't get eaten up.
+        Minecraft mc = Minecraft.getInstance();
+        Player player = mc.player;
+        if (player != null && player.isUsingItem()) {
+            ItemStack useItem = player.getUseItem();
+            if (useItem.getItem() instanceof SkilletItem && useItem.getOrCreateTag().getLong("FlipTimeStamp") == 0L) {
+                while (mc.options.keyAttack.consumeClick()) {
+                    ModNetworking.INSTANCE.sendToServer(new ModNetworking.FlipSkilletMessage());
+                }
+            }
+        }
+    }
+}

src/main/java/vectorwing/farmersdelight/client/renderer/SkilletItemRenderer.java

@@ -0,0 +1,98 @@
+package vectorwing.farmersdelight.client.renderer;
+
+import com.mojang.blaze3d.vertex.PoseStack;
+import com.mojang.math.Axis;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.model.HumanoidModel;
+import net.minecraft.client.renderer.BlockEntityWithoutLevelRenderer;
+import net.minecraft.client.renderer.MultiBufferSource;
+import net.minecraft.nbt.CompoundTag;
+import net.minecraft.util.Mth;
+import net.minecraft.world.entity.HumanoidArm;
+import net.minecraft.world.entity.LivingEntity;
+import net.minecraft.world.item.BlockItem;
+import net.minecraft.world.item.ItemDisplayContext;
+import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.level.block.state.BlockState;
+import net.minecraftforge.client.IArmPoseTransformer;
+import vectorwing.farmersdelight.common.item.SkilletItem;
+
+public class SkilletItemRenderer extends BlockEntityWithoutLevelRenderer {
+    public SkilletItemRenderer() {
+        super(Minecraft.getInstance().getBlockEntityRenderDispatcher(), Minecraft.getInstance().getEntityModels());
+    }
+
+    @Override
+    public void renderByItem(ItemStack stack, ItemDisplayContext displayContext, PoseStack poseStack, MultiBufferSource buffer, int packedLight, int packedOverlay) {
+        //render block
+        BlockItem item = ((BlockItem) stack.getItem());
+        BlockState state = item.getBlock().defaultBlockState();
+
+        CompoundTag tag = stack.getTagElement("Cooking");
+        ItemStack ingredientStack = ItemStack.of(tag);
+
+        float animation = 0;
+
+        if (!ingredientStack.isEmpty()) {
+            poseStack.pushPose();
+            poseStack.translate(0.5, 1 / 16f, 0.5);
+
+            long gameTime = Minecraft.getInstance().level.getGameTime();
+            long time = stack.getOrCreateTag().getLong("FlipTimeStamp");
+            if (time != 0) {
+                float partialTicks = Minecraft.getInstance().getFrameTime();
+                animation = ((gameTime - time) + partialTicks) / SkilletItem.FLIP_TIME;
+                animation = Mth.clamp(animation, 0, 1);
+                float maxH = 0.4F;
+                poseStack.translate(0, maxH * Mth.sin(animation * Mth.PI), 0);
+                float rotationAnimation = stack.getOrCreateTag().getBoolean("Flipped") ? animation + 1.0F : animation;
+                poseStack.mulPose(Axis.XP.rotationDegrees(180 * rotationAnimation));
+            } else {
+                poseStack.mulPose(Axis.XP.rotationDegrees(stack.getOrCreateTag().getBoolean("Flipped") ? 180 : 0));
+            }
+
+            poseStack.mulPose(Axis.XP.rotationDegrees(90));
+            poseStack.scale(0.5F, 0.5F, 0.5F);
+
+            if (displayContext != ItemDisplayContext.GUI) {
+                var itemRenderer = Minecraft.getInstance().getItemRenderer();
+                itemRenderer.renderStatic(ingredientStack, ItemDisplayContext.FIXED, packedLight,
+                        packedOverlay, poseStack, buffer, null, 0);
+            }
+
+            poseStack.popPose();
+        }
+
+        poseStack.pushPose();
+
+        if (animation != 0 && displayContext.firstPerson()) {
+            poseStack.translate(0, 0, 1);
+            poseStack.mulPose(Axis.XN.rotationDegrees(Mth.sin(animation * Mth.TWO_PI) * 6));
+            poseStack.translate(0F, 0, -1);
+            poseStack.translate(0, 0, -Mth.sin(animation * Mth.PI) * 0.2);
+        }
+        Minecraft.getInstance().getBlockRenderer().renderSingleBlock(state, poseStack, buffer, packedLight, packedOverlay);
+
+        poseStack.popPose();
+
+    }
+
+    public static class ArmPoseTransformer implements IArmPoseTransformer {
+        @Override
+        public void applyTransform(HumanoidModel<?> model, LivingEntity entity, HumanoidArm arm) {
+            ItemStack stack = entity.getUseItem();
+            long time = stack.getOrCreateTag().getLong("FlipTimeStamp");
+            if (time > 0) {
+                float partialTicks = Minecraft.getInstance().getFrameTime();
+                float animation = ((entity.level().getGameTime() - time) + partialTicks) / SkilletItem.FLIP_TIME;
+                animation = Mth.clamp(animation, 0, 1);
+
+                if (arm == HumanoidArm.LEFT) {
+                    model.leftArm.xRot = (-Mth.sin(animation * Mth.TWO_PI) * 15 - 20) * (float) (Math.PI / 180.0);
+                } else {
+                    model.rightArm.xRot = (-Mth.sin(animation * Mth.TWO_PI) * 15 - 20) * (float) (Math.PI / 180.0);
+                }
+            }
+        }
+    }
+}

src/main/java/vectorwing/farmersdelight/common/CommonSetup.java

@@ -24,6 +24,7 @@
 import net.minecraftforge.registries.ForgeRegistries;
 import vectorwing.farmersdelight.common.crafting.condition.VanillaCrateEnabledCondition;
 import vectorwing.farmersdelight.common.entity.RottenTomatoEntity;
+import vectorwing.farmersdelight.common.networking.ModNetworking;
 import vectorwing.farmersdelight.common.registry.ModAdvancements;
 import vectorwing.farmersdelight.common.registry.ModItems;
 
@@ -39,6 +40,7 @@ public static void init(final FMLCommonSetupEvent event) {
 			registerDispenserBehaviors();
 			registerItemSetAdditions();
 			registerStackSizeOverrides();
+			ModNetworking.register();
 		});
 
 		ModAdvancements.register();

src/main/java/vectorwing/farmersdelight/common/item/SkilletItem.java

@@ -4,6 +4,8 @@
 import com.google.common.collect.Multimap;
 import com.google.common.collect.Sets;
 import net.minecraft.advancements.CriteriaTriggers;
+import net.minecraft.client.model.HumanoidModel;
+import net.minecraft.client.renderer.BlockEntityWithoutLevelRenderer;
 import net.minecraft.core.BlockPos;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.server.level.ServerPlayer;
@@ -37,25 +39,34 @@
 import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.phys.Vec3;
+import net.minecraftforge.api.distmarker.Dist;
+import net.minecraftforge.api.distmarker.OnlyIn;
+import net.minecraftforge.client.extensions.common.IClientItemExtensions;
 import net.minecraftforge.event.entity.living.LivingDamageEvent;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
 import net.minecraftforge.fml.common.Mod;
 import vectorwing.farmersdelight.FarmersDelight;
+import vectorwing.farmersdelight.client.ClientSetup;
+import vectorwing.farmersdelight.client.renderer.SkilletItemRenderer;
 import vectorwing.farmersdelight.common.block.SkilletBlock;
 import vectorwing.farmersdelight.common.block.entity.SkilletBlockEntity;
 import vectorwing.farmersdelight.common.registry.ModItems;
 import vectorwing.farmersdelight.common.registry.ModSounds;
 import vectorwing.farmersdelight.common.tag.ModTags;
+import vectorwing.farmersdelight.common.utility.ClientRenderUtils;
 import vectorwing.farmersdelight.common.utility.TextUtils;
 
 import javax.annotation.Nullable;
 import java.util.Optional;
 import java.util.Set;
 import java.util.UUID;
+import java.util.function.Consumer;
 
 @SuppressWarnings({"deprecation", "unused"})
 public class SkilletItem extends BlockItem
 {
+	public static final float FLIP_TIME = 12;
+
 	public static final Tiers SKILLET_TIER = Tiers.IRON;
 	protected static final UUID FD_ATTACK_KNOCKBACK_UUID = UUID.fromString("e56350e0-8756-464d-92f9-54289ab41e0a");
 
@@ -149,6 +160,7 @@ public InteractionResultHolder<ItemStack> use(Level level, Player player, Intera
 				ItemStack cookingStackUnit = cookingStackCopy.split(1);
 				skilletStack.getOrCreateTag().put("Cooking", cookingStackUnit.serializeNBT());
 				skilletStack.getOrCreateTag().putInt("CookTimeHandheld", recipe.get().getCookingTime());
+				skilletStack.getOrCreateTag().putBoolean("Flipped", false);
 				player.startUsingItem(hand);
 				player.setItemInHand(otherHand, cookingStackCopy);
 				return InteractionResultHolder.consume(skilletStack);
@@ -169,6 +181,15 @@ public void onUseTick(Level level, LivingEntity entity, ItemStack stack, int cou
 			if (level.random.nextInt(50) == 0) {
 				level.playLocalSound(x, y, z, ModSounds.BLOCK_SKILLET_SIZZLE.get(), SoundSource.BLOCKS, 0.4F, level.random.nextFloat() * 0.2F + 0.9F, false);
 			}
+			CompoundTag tag = stack.getOrCreateTag();
+			if (tag.contains("FlipTimeStamp")) {
+				long flipTimeStamp = tag.getLong("FlipTimeStamp");
+				if (level.getGameTime() - flipTimeStamp > FLIP_TIME) {
+					tag.remove("FlipTimeStamp");
+					tag.putBoolean("Flipped", !tag.getBoolean("Flipped"));
+					level.playLocalSound(x, y, z, ModSounds.BLOCK_SKILLET_ADD_FOOD.get(), SoundSource.BLOCKS, 0.4F, level.random.nextFloat() * 0.2F + 0.9F, false);
+				}
+			}
 		}
 	}
 
@@ -212,6 +233,28 @@ public ItemStack finishUsingItem(ItemStack stack, Level level, LivingEntity enti
 		return stack;
 	}
 
+	@Override
+	public int getBarWidth(ItemStack stack) {
+		if (stack.getTagElement("Cooking") != null) {
+			return Math.round(13.0F - (float) ClientRenderUtils.getClientPlayerHack().getUseItemRemainingTicks() * 13.0F / (float) this.getUseDuration(stack));
+		}else{
+			return super.getBarWidth(stack);
+		}
+	}
+
+	@Override
+	public int getBarColor(ItemStack stack) {
+		if (stack.getTagElement("Cooking") != null) {
+			return 0xFF8B4F;
+		}
+		else return super.getBarColor(stack);
+	}
+
+	@Override
+	public boolean isBarVisible(ItemStack stack) {
+		return super.isBarVisible(stack) || stack.getTagElement("Cooking") != null;
+	}
+
 	public static Optional<CampfireCookingRecipe> getCookingRecipe(ItemStack stack, Level level) {
 		if (stack.isEmpty()) {
 			return Optional.empty();
@@ -269,4 +312,22 @@ public int getEnchantmentValue() {
 	public Multimap<Attribute, AttributeModifier> getDefaultAttributeModifiers(EquipmentSlot equipmentSlot) {
 		return equipmentSlot == EquipmentSlot.MAINHAND ? this.toolAttributes : super.getDefaultAttributeModifiers(equipmentSlot);
 	}
+
+	@Override
+	@OnlyIn(Dist.CLIENT)
+	public void initializeClient(Consumer<IClientItemExtensions> consumer) {
+		consumer.accept(new IClientItemExtensions() {
+			private static BlockEntityWithoutLevelRenderer renderer = new SkilletItemRenderer();
+
+			@Override
+			public BlockEntityWithoutLevelRenderer getCustomRenderer() {
+				return renderer;
+			}
+
+			@Override
+			public [email protected] ArmPose getArmPose(LivingEntity living, InteractionHand hand, ItemStack stack) {
+				return stack.getOrCreateTag().contains("FlipTimeStamp") ? ClientSetup.SKILLET_FLIP : null;
+			}
+		});
+	}
 }