Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Skillet try 2 #911

Open
wants to merge 7 commits into
base: 1.20
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,5 @@ docsOut

# Files from Forge MDK
forge*changelog.txt
/src/generated/resources/.cache/
/src/generated/resources/.cache/
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
"values": [
"minecraft:lava",
"#minecraft:campfires",
"#minecraft:fire"
"#minecraft:fire",
{"id":"decorative_blocks:braziers","required":false}
]
}
9 changes: 9 additions & 0 deletions src/main/java/vectorwing/farmersdelight/FarmersDelight.java
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,14 @@
import vectorwing.farmersdelight.client.ClientSetup;
import vectorwing.farmersdelight.common.CommonSetup;
import vectorwing.farmersdelight.common.Configuration;
import vectorwing.farmersdelight.common.block.entity.CookingPotBlockEntity;
import vectorwing.farmersdelight.common.block.entity.CuttingBoardBlockEntity;
import vectorwing.farmersdelight.common.event.CommonEvents;
import vectorwing.farmersdelight.common.event.VillagerEvents;
import vectorwing.farmersdelight.common.item.DogFoodItem;
import vectorwing.farmersdelight.common.item.HorseFeedItem;
import vectorwing.farmersdelight.common.item.KnifeItem;
import vectorwing.farmersdelight.common.networking.ModNetworking;
import vectorwing.farmersdelight.common.registry.*;
import vectorwing.farmersdelight.common.world.VillageStructures;
import vectorwing.farmersdelight.common.world.WildCropGeneration;
Expand Down Expand Up @@ -61,5 +69,6 @@ public FarmersDelight() {
MinecraftForge.EVENT_BUS.addListener(VillageStructures::addNewVillageBuilding);

MinecraftForge.EVENT_BUS.register(this);
ModNetworking.init();
}
}
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
package vectorwing.farmersdelight.client;

import net.minecraft.client.gui.screens.MenuScreens;
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.common.registry.ModItems;
import vectorwing.farmersdelight.common.registry.ModMenuTypes;

public class ClientSetup
Expand All @@ -14,5 +17,9 @@ public static void init(final FMLClientSetupEvent event) {

NourishmentHungerOverlay.init();
ComfortHealthOverlay.init();

ItemProperties.register(ModItems.SKILLET.get(), new ResourceLocation("cooking"),
(stack, world, entity, s) -> stack.getTagElement("Cooking") != null ? 1 : 0);

}
}
Original file line number Diff line number Diff line change
@@ -1,24 +1,31 @@
package vectorwing.farmersdelight.client.event;

import com.mojang.blaze3d.platform.InputConstants;
import com.mojang.datafixers.util.Pair;
import net.minecraft.client.Minecraft;
import net.minecraft.network.chat.Component;
import net.minecraft.network.chat.MutableComponent;
import net.minecraft.world.effect.MobEffectInstance;
import net.minecraft.world.effect.MobEffectUtil;
import net.minecraft.world.food.FoodProperties;
import net.minecraft.world.item.Item;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.client.event.InputEvent;
import net.minecraftforge.event.entity.player.ItemTooltipEvent;
import net.minecraftforge.eventbus.api.SubscribeEvent;
import net.minecraftforge.fml.common.Mod;
import org.lwjgl.glfw.GLFW;
import vectorwing.farmersdelight.FarmersDelight;
import vectorwing.farmersdelight.common.Configuration;
import vectorwing.farmersdelight.common.FoodValues;
import vectorwing.farmersdelight.common.item.SkilletItem;
import vectorwing.farmersdelight.common.networking.ModNetworking;
import vectorwing.farmersdelight.common.registry.ModItems;

import java.util.List;

@Mod.EventBusSubscriber(modid = FarmersDelight.MODID, value = Dist.CLIENT)
public class TooltipEvents
public class ClientEvents
{
@SubscribeEvent
public static void addTooltipToVanillaSoups(ItemTooltipEvent event) {
Expand All @@ -42,4 +49,18 @@ public static void addTooltipToVanillaSoups(ItemTooltipEvent event) {
}
}
}

@SubscribeEvent
public static void onMouseClicked(InputEvent.MouseButton event){
if (event.getButton() == GLFW.GLFW_MOUSE_BUTTON_1 && event.getAction() == InputConstants.PRESS) {
var player = Minecraft.getInstance().player;
if (player != null && player.isUsingItem()) {
if (player.getUseItem().getItem() instanceof SkilletItem) {
ModNetworking.CHANNEL.sendToServer(new ModNetworking.FlipSkilletMessage());
}
}
}
}


}
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
package vectorwing.farmersdelight.client.renderer;

import com.mojang.blaze3d.vertex.PoseStack;
import com.mojang.math.Vector3f;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.BlockEntityWithoutLevelRenderer;
import net.minecraft.client.renderer.MultiBufferSource;
import net.minecraft.client.renderer.block.model.ItemTransforms;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.util.Mth;
import net.minecraft.world.item.BlockItem;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.level.block.state.BlockState;
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, ItemTransforms.TransformType pTransformType, PoseStack poseStack, MultiBufferSource buffer, int packedLight, int packedOverlay) {
//render block
poseStack.pushPose();
BlockItem item = ((BlockItem) stack.getItem());
BlockState state = item.getBlock().defaultBlockState();
Minecraft.getInstance().getBlockRenderer().renderSingleBlock(state, poseStack, buffer, packedLight, packedOverlay);
poseStack.popPose();

CompoundTag tag = stack.getTagElement("Cooking");
ItemStack ingredientStack = ItemStack.of(tag);

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();
float animation = ((gameTime - time) + partialTicks) / SkilletItem.FLIP_TIME;
float maxH = 1;
poseStack.translate(0, maxH * Mth.sin(animation * Mth.PI), 0);
poseStack.mulPose(Vector3f.XP.rotationDegrees(360 * animation));
}

poseStack.mulPose(Vector3f.XP.rotationDegrees(90));
poseStack.scale(0.5F, 0.5F, 0.5F);

var itemRenderer = Minecraft.getInstance().getItemRenderer();
itemRenderer.renderStatic(ingredientStack, ItemTransforms.TransformType.FIXED, packedLight,
packedOverlay, poseStack, buffer, 0);

poseStack.popPose();
}


}


}
Original file line number Diff line number Diff line change
Expand Up @@ -8,69 +8,83 @@
import net.minecraft.client.renderer.blockentity.BlockEntityRenderer;
import net.minecraft.client.renderer.blockentity.BlockEntityRendererProvider;
import net.minecraft.core.Direction;
import net.minecraft.util.Mth;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.ItemDisplayContext;
import net.minecraft.world.item.ItemStack;
import net.minecraftforge.items.IItemHandler;
import vectorwing.farmersdelight.common.block.StoveBlock;
import vectorwing.farmersdelight.common.block.entity.SkilletBlockEntity;
import vectorwing.farmersdelight.common.item.SkilletItem;

import java.util.Random;

public class SkilletRenderer implements BlockEntityRenderer<SkilletBlockEntity>
{
private final Random random = new Random();
public class SkilletRenderer implements BlockEntityRenderer<SkilletBlockEntity> {
private final Random random = new Random();

public SkilletRenderer(BlockEntityRendererProvider.Context context) {
}
public SkilletRenderer(BlockEntityRendererProvider.Context context) {
}

@Override
public void render(SkilletBlockEntity skilletEntity, float partialTicks, PoseStack poseStack, MultiBufferSource buffer, int combinedLight, int combinedOverlay) {
Direction direction = skilletEntity.getBlockState().getValue(StoveBlock.FACING);
IItemHandler inventory = skilletEntity.getInventory();
int posLong = (int) skilletEntity.getBlockPos().asLong();
@Override
public void render(SkilletBlockEntity skilletEntity, float partialTicks, PoseStack poseStack, MultiBufferSource buffer, int combinedLight, int combinedOverlay) {
Direction direction = skilletEntity.getBlockState().getValue(StoveBlock.FACING);
IItemHandler inventory = skilletEntity.getInventory();
int posLong = (int) skilletEntity.getBlockPos().asLong();

ItemStack stack = inventory.getStackInSlot(0);
int seed = stack.isEmpty() ? 187 : Item.getId(stack.getItem()) + stack.getDamageValue();
this.random.setSeed(seed);
ItemStack stack = inventory.getStackInSlot(0);
int seed = stack.isEmpty() ? 187 : Item.getId(stack.getItem()) + stack.getDamageValue();
this.random.setSeed(seed);

if (!stack.isEmpty()) {
int itemRenderCount = this.getModelCount(stack);
for (int i = 0; i < itemRenderCount; i++) {
poseStack.pushPose();
if (!stack.isEmpty()) {
int itemRenderCount = this.getModelCount(stack);
for (int i = 0; i < itemRenderCount; i++) {
poseStack.pushPose();

// Stack up items in the skillet, with a slight offset per item
float xOffset = (this.random.nextFloat() * 2.0F - 1.0F) * 0.15F * 0.5F;
float zOffset = (this.random.nextFloat() * 2.0F - 1.0F) * 0.15F * 0.5F;
poseStack.translate(0.5D + xOffset, 0.1D + 0.03 * (i + 1), 0.5D + zOffset);
// Stack up items in the skillet, with a slight offset per item
float xOffset = (this.random.nextFloat() * 2.0F - 1.0F) * 0.15F * 0.5F;
float zOffset = (this.random.nextFloat() * 2.0F - 1.0F) * 0.15F * 0.5F;
poseStack.translate(0.5D + xOffset, 0.1D + 0.03 * (i + 1), 0.5D + zOffset);

// Rotate item to face the skillet's front side
float degrees = -direction.toYRot();
poseStack.mulPose(Axis.YP.rotationDegrees(degrees));
// Rotate item to face the skillet's front side
float degrees = -direction.toYRot();
poseStack.mulPose(Axis.YP.rotationDegrees(degrees));

// Rotate item flat on the skillet. Use X and Y from now on
poseStack.mulPose(Axis.XP.rotationDegrees(90.0F));
// epic flip last item
if(i == itemRenderCount - 1) {
long gameTime = Minecraft.getInstance().level.getGameTime();
long time = skilletEntity.lastFlippedTime;
float animation = ((gameTime - time) + partialTicks) / SkilletItem.FLIP_TIME;
if (animation < 1) {
float maxH = 0.5f;
poseStack.translate(0, maxH * Mth.sin(animation * Mth.PI), 0);
poseStack.mulPose(Axis.XP.rotationDegrees(360 * animation));
}
}

// Resize the items
poseStack.scale(0.5F, 0.5F, 0.5F);

if (skilletEntity.getLevel() != null)
Minecraft.getInstance().getItemRenderer().renderStatic(stack, ItemDisplayContext.FIXED, combinedLight, combinedOverlay, poseStack, buffer, skilletEntity.getLevel(), posLong);
poseStack.popPose();
}
}
}
// Rotate item flat on the skillet. Use X and Y from now on
poseStack.mulPose(Axis.XP.rotationDegrees(90.0F));

protected int getModelCount(ItemStack stack) {
if (stack.getCount() > 48) {
return 5;
} else if (stack.getCount() > 32) {
return 4;
} else if (stack.getCount() > 16) {
return 3;
} else if (stack.getCount() > 1) {
return 2;
}
return 1;
}
// Resize the items
poseStack.scale(0.5F, 0.5F, 0.5F);

if (skilletEntity.getLevel() != null)
Minecraft.getInstance().getItemRenderer().renderStatic(stack, ItemDisplayContext.FIXED, combinedLight, combinedOverlay, poseStack, buffer, skilletEntity.getLevel(), posLong);
poseStack.popPose();
}
}
}

protected int getModelCount(ItemStack stack) {
if (stack.getCount() > 48) {
return 5;
} else if (stack.getCount() > 32) {
return 4;
} else if (stack.getCount() > 16) {
return 3;
} else if (stack.getCount() > 1) {
return 2;
}
return 1;
}
}
Loading