Skip to content

Commit

Permalink
Merge pull request #885 from Gu-ZT/releases/1.20.1
Browse files Browse the repository at this point in the history 
优化Emi配方显示
  • Loading branch information
@Gugle2308
Gugle2308 authored Jun 12, 2024
2 parents 894616d + e298697 commit d07726d
Show file tree
Hide file tree
Showing 4 changed files with 74 additions and 28 deletions.
48 changes: 28 additions & 20 deletions common/src/main/java/dev/dubhe/anvilcraft/integration/emi/recipe/AnvilProcessEmiRecipe.java
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package dev.dubhe.anvilcraft.integration.emi.recipe;

import com.google.common.collect.ImmutableSet;
import dev.dubhe.anvilcraft.AnvilCraft;
import dev.dubhe.anvilcraft.data.recipe.anvil.AnvilRecipe;
import dev.dubhe.anvilcraft.data.recipe.anvil.RecipeOutcome;
Expand All @@ -8,6 +9,7 @@
import dev.dubhe.anvilcraft.data.recipe.anvil.outcome.SetBlock;
import dev.dubhe.anvilcraft.data.recipe.anvil.outcome.SpawnItem;
import dev.dubhe.anvilcraft.data.recipe.anvil.predicate.HasBlock;
import dev.dubhe.anvilcraft.data.recipe.anvil.predicate.HasBlockIngredient;
import dev.dubhe.anvilcraft.data.recipe.anvil.predicate.HasFluidCauldron;
import dev.dubhe.anvilcraft.data.recipe.anvil.predicate.HasItem;
import dev.dubhe.anvilcraft.data.recipe.anvil.predicate.NotHasBlock;
Expand Down Expand Up @@ -44,6 +46,7 @@
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.Set;

@SuppressWarnings("SameParameterValue")
Expand All @@ -68,8 +71,10 @@ public class AnvilProcessEmiRecipe implements EmiRecipe {
* @param category 配方类型
* @param recipe {@link AnvilRecipe}配方
*/
@SuppressWarnings({"UnstableApiUsage"})
public AnvilProcessEmiRecipe(EmiRecipeCategory category, @NotNull AnvilRecipe recipe) {
@SuppressWarnings({"UnstableApiUsage", "unchecked"})
public <T extends Comparable<T>, V extends T> AnvilProcessEmiRecipe(
EmiRecipeCategory category, @NotNull AnvilRecipe recipe
) {
this.category = category;
this.recipe = recipe;
for (RecipePredicate predicate : recipe.getPredicates()) {
Expand All @@ -86,6 +91,7 @@ public AnvilProcessEmiRecipe(EmiRecipeCategory category, @NotNull AnvilRecipe re
List<EmiStack> items = matchItem.getItems().stream().map(EmiStack::of).toList();
this.inputs.add(new ListEmiIngredient(items, count));
} else if (predicate instanceof HasBlock block && !(block instanceof NotHasBlock)) {
boolean flag = block instanceof HasBlockIngredient;
HasBlock.ModBlockPredicate matchBlock = block.getMatchBlock();
TagKey<Block> tag = matchBlock.getTag();
Map<String, String> properties = matchBlock.getProperties();
Expand All @@ -96,45 +102,47 @@ public AnvilProcessEmiRecipe(EmiRecipeCategory category, @NotNull AnvilRecipe re
List<BlockStateEmiStack> blocks = blockSet.stream()
.map(block1 -> {
BlockState workBlockState = block1.defaultBlockState();
for (BlockState blockState : block1.getStateDefinition().getPossibleStates()) {
first:
for (Map.Entry<String, String> entry : properties.entrySet()) {
for (Map.Entry<Property<?>, Comparable<?>> entry1 : blockState.getValues().entrySet()) {
if (!entry1.getKey().getName().equals(entry.getKey())) continue;
if (!entry1.getValue().toString().equals(entry.getValue())) break first;
}
}
workBlockState = blockState;
ImmutableSet<Property<?>> keySet = workBlockState.getValues().keySet();
for (Property<?> property : keySet) {
if (!properties.containsKey(property.getName())) continue;
String value = properties.get(property.getName());
Optional<?> first = property.getAllValues()
.map(Property.Value::value)
.filter(v -> value.equals(v.toString()))
.findFirst();
if (first.isEmpty()) continue;
workBlockState = workBlockState.setValue((Property<T>) property, (V) first.get());
}
return BlockStateEmiStack.of(workBlockState);
})
.toList();
ListBlockStateEmiIngredient ingredient = ListBlockStateEmiIngredient.of(blocks);
if (block.getOffset().equals(new Vec3(0.0d, -1.0d, 0.0d))) {
this.inputBlocks.set(0, ingredient.get());
if (!flag) this.outputBlocks.set(0, ingredient.get());
continue;
}
if (block.getOffset().equals(new Vec3(0.0d, -2.0d, 0.0d))) {
this.inputBlocks.set(1, ingredient.get());
if (!flag) this.outputBlocks.set(1, ingredient.get());
continue;
}
this.inputs.add(ingredient);
} else if (predicate instanceof HasFluidCauldron cauldron) {
BlockStateEmiStack ingredient = BlockStateEmiStack.of(cauldron.getMatchBlock().defaultBlockState());
if (cauldron.getOffset().equals(new Vec3(0.0d, -1.0d, 0.0d))) {
this.inputBlocks.set(0, ingredient);
this.outputBlocks.set(0, ingredient);
continue;
}
if (cauldron.getOffset().equals(new Vec3(0.0d, -2.0d, 0.0d))) {
this.inputBlocks.set(1, ingredient);
this.outputBlocks.set(0, ingredient);
continue;
}
this.inputs.add(ingredient);
}
}
for (int i = 0; i < this.inputBlocks.size(); i++) {
if (outputBlocks.get(i).isEmpty()) this.outputBlocks.set(i, this.inputBlocks.get(i));
}
for (RecipeOutcome outcome : recipe.getOutcomes()) {
if (outcome instanceof SpawnItem item) {
this.outputs.add(EmiStack.of(item.getResult()).setChance((float) item.getChance()));
Expand Down Expand Up @@ -198,12 +206,12 @@ public void addWidgets(WidgetHolder widgets) {
this.addOutputArrow(widgets, 163, 30);
this.addOutputs(widgets);
}
widgets.addDrawable(90, 25, 0, 0, new BlockWidget(ANVIL_BLOCK_STATE, 1));
widgets.addDrawable(90, 25, 0, 0, new BlockWidget(this.inputBlocks.get(0).getState(), -1));
widgets.addDrawable(90, 25, 0, 0, new BlockWidget(this.outputBlocks.get(1).getState(), -2));
widgets.addDrawable(135, 25, 0, 0, new BlockWidget(ANVIL_BLOCK_STATE, 0));
widgets.addDrawable(135, 25, 0, 0, new BlockWidget(this.outputBlocks.get(0).getState(), -1));
widgets.addDrawable(135, 25, 0, 0, new BlockWidget(this.outputBlocks.get(1).getState(), -2));
BlockWidget.of(widgets, ANVIL_BLOCK_STATE, 1, 90, 11);
BlockWidget.of(widgets, this.inputBlocks.get(0).getState(), -1, 90, 39);
BlockWidget.of(widgets, this.inputBlocks.get(1).getState(), -2, 90, 53);
BlockWidget.of(widgets, ANVIL_BLOCK_STATE, 0, 135, 25);
BlockWidget.of(widgets, this.outputBlocks.get(0).getState(), -1, 135, 39);
BlockWidget.of(widgets, this.outputBlocks.get(1).getState(), -2, 135, 53);
}

protected void addStraightArrow(@NotNull WidgetHolder widgets, int x, int y) {
Expand Down
6 changes: 5 additions & 1 deletion common/src/main/java/dev/dubhe/anvilcraft/integration/emi/stack/BlockStateEmiStack.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,11 @@ public List<Component> getTooltipText() {
return BlockStateEmiStack.getTooltipLines(this.state);
}

private static @NotNull List<Component> getTooltipLines(@NotNull BlockState state) {
/**
* @param state 方块状态
* @return 工具提示
*/
public static @NotNull List<Component> getTooltipLines(@NotNull BlockState state) {
ArrayList<Component> list = Lists.newArrayList();
ChatFormatting color = state.getBlock().asItem().getDefaultInstance().getRarity().color;
Component name = Component.translatable(state.getBlock().getDescriptionId());
Expand Down
45 changes: 40 additions & 5 deletions common/src/main/java/dev/dubhe/anvilcraft/integration/emi/ui/BlockWidget.java
View file
Original file line number Diff line number Diff line change
@@ -1,21 +1,56 @@
package dev.dubhe.anvilcraft.integration.emi.ui;

import com.mojang.blaze3d.vertex.PoseStack;
import dev.dubhe.anvilcraft.integration.emi.stack.BlockStateEmiStack;
import dev.dubhe.anvilcraft.util.BlockStateRender;
import dev.emi.emi.EmiPort;
import dev.emi.emi.api.widget.Bounds;
import dev.emi.emi.api.widget.DrawableWidget.DrawableWidgetConsumer;
import dev.emi.emi.api.widget.Widget;
import dev.emi.emi.api.widget.WidgetHolder;
import net.minecraft.client.gui.GuiGraphics;
import net.minecraft.client.gui.screens.inventory.tooltip.ClientTooltipComponent;
import net.minecraft.world.level.block.state.BlockState;
import org.jetbrains.annotations.NotNull;

public class BlockWidget implements DrawableWidgetConsumer {
import java.util.List;
import java.util.stream.Collectors;

public class BlockWidget extends Widget implements DrawableWidgetConsumer {
private final BlockState blockState;
private final int posY;
private final int offsetX;
private final int offsetY;

public BlockWidget(BlockState blockStates, int posY) {
this.blockState = blockStates;
private BlockWidget(BlockState blockState, int posY, int offsetX, int offsetY) {
this.blockState = blockState;
this.posY = posY;
this.offsetX = offsetX;
this.offsetY = offsetY;
}

public static void of(@NotNull WidgetHolder widgets, BlockState blockState, int posY, int offsetX, int offsetY) {
widgets.add(new BlockWidget(blockState, posY, offsetX, offsetY));
}

@Override
public Bounds getBounds() {
return new Bounds(this.offsetX, this.offsetY, 25, 25);
}

@Override
public List<ClientTooltipComponent> getTooltip(int mouseX, int mouseY) {
if (this.blockState.isAir()) return List.of();
return BlockStateEmiStack.getTooltipLines(this.blockState)
.stream().map(EmiPort::ordered).map(ClientTooltipComponent::create).collect(Collectors.toList());
}

@Override
public void render(GuiGraphics draw, int mouseX, int mouseY, float delta) {
BlockStateRender.renderBlocks(blockState, posY, draw, 25);
public void render(@NotNull GuiGraphics draw, int mouseX, int mouseY, float delta) {
PoseStack pose = draw.pose();
pose.pushPose();
pose.translate(this.offsetX, 25.0, 0.0);
BlockStateRender.renderBlock(this.blockState, this.posY, draw, 25);
pose.popPose();
}
}
3 changes: 1 addition & 2 deletions common/src/main/java/dev/dubhe/anvilcraft/util/BlockStateRender.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ public class BlockStateRender {
* 渲染方块状态
*/

public static void renderBlocks(
public static void renderBlock(
BlockState state,
int posY,
@NotNull GuiGraphics draw,
Expand All @@ -41,7 +41,6 @@ public static void renderBlocks(
0xF000F0,
OverlayTexture.NO_OVERLAY
);
poseStack.translate(0, -posY, 0);
poseStack.popPose();
draw.flush();
}
Expand Down

0 comments on commit d07726d

Please sign in to comment.