Skip to content

Pre rewrite/fabric/1.21.1 masa #979

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.

Sign up for GitHub

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

Open
PunChen wants to merge 9 commits into
base: pre-rewrite/fabric/1.21.1-masa
Choose a base branch
from
Open

Pre rewrite/fabric/1.21.1 masa #979

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
1ac12e3
add simple mode draw circle
PunChen May 10, 2025
6eaa8e9
add simple mode draw circle-fix y
PunChen May 10, 2025
895222f
add complex mode
PunChen May 12, 2025
6a683a7
add complex mode
PunChen May 13, 2025
3a41770
remove complex mode due to litematica printer only use normal mode
PunChen May 16, 2025
1ce273e
add special mode to normal mode to generate circle and round-- todo o…
PunChen May 16, 2025
d6a820e
use more efficiency algorithm, but can not use two circles for iron wall
PunChen May 17, 2025
87516e5
add circle drawing, need fix rendering
PunChen May 18, 2025
251c701
add circle drawing, optimize box merging, reduce box numbers
PunChen May 18, 2025
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
114 changes: 114 additions & 0 deletions src/main/java/fi/dy/masa/litematica/gui/GuiAreaSelectionEditorComplex.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,114 @@
//package fi.dy.masa.litematica.gui;
//
//import fi.dy.masa.litematica.data.DataManager;
//import fi.dy.masa.litematica.gui.widgets.WidgetListSelectionSubRegions;
//import fi.dy.masa.litematica.selection.AreaSelection;
//import fi.dy.masa.litematica.selection.Box;
//import fi.dy.masa.litematica.util.PositionUtils.Corner;
//import fi.dy.masa.malilib.MaLiLib;
//import fi.dy.masa.malilib.util.StringUtils;
//import net.minecraft.util.math.BlockPos;
//
//public class GuiAreaSelectionEditorComplex extends GuiAreaSelectionEditorNormal
//{
// protected static String defaultBoxName = "DefaultComplexBox";
//
// public GuiAreaSelectionEditorComplex(AreaSelection selection)
// {
// super(selection);
//
// if (DataManager.getSchematicProjectsManager().hasProjectOpen())
// {
// this.title = StringUtils.translate("litematica.gui.title.area_editor_normal_schematic_projects");
// }
// else
// {
// this.title = StringUtils.translate("litematica.gui.title.area_editor_complex");
// }
// }
//
// @Override
// public void initGui()
// {
// super.initGui();
//
// if (this.selection != null)
// {
// this.createSelectionEditFields();
// this.addSubRegionFields(this.xOrigin, this.yNext);
// this.updateCheckBoxes();
// }
// else
// {
// this.addLabel(20, 30, 120, 12, 0xFFFFAA00, StringUtils.translate("litematica.error.area_editor.no_selection"));
// }
// }
//
//
// @Override
// protected int addSubRegionFields(int x, int y)
// {
// x = 12;
// y += 20;
//
// int width = 68;
//
// int nextY = 0;
// this.createCoordinateInputs(x, y, width, Corner.CORNER_1);
// x += width + 42;
// nextY = this.createCoordinateInputs(x, y, width, Corner.CORNER_2);
// this.createButton(x + 10, nextY, -1, ButtonListener.Type.ANALYZE_AREA);
// x += width + 42;
//
// x = this.createButton(22, nextY, -1, ButtonListener.Type.CREATE_SCHEMATIC) + 26;
//
// x = this.createButton(22, nextY + 22, -1, ButtonListener.Type.TOGGLE_GENERATE_CIRCLE);
// nextY += 22;
// this.createButtonOnOff(22, nextY + 22, -1, circleMode, ButtonListener.Type.TOGGLE_CIRCLE_ENABLED);
//
// this.addRenderingDisabledWarning(250, 48);
//
// return y;
// }
//
// @Override
// protected Box getBox()
// {
// // 设置默认位置和名称
// Box selBox = this.selection.getSelectedSubRegionBox();
// this.selection.removeSelectedSubRegionBox();
// if (selBox != null) {
// selBox.setName(defaultBoxName);
// } else if (this.mc.player != null) {
// BlockPos pos = fi.dy.masa.malilib.util.PositionUtils.getEntityBlockPos(this.mc.player);
// selBox = new Box(pos, pos, defaultBoxName);
// } else {
// MaLiLib.logger.error("can not getSelectedSubRegionBox");
// selBox = new Box();
// selBox.setName(defaultBoxName);
// }
// this.selection.addSubRegionBox(selBox,false);
// this.selection.setSelectedSubRegionBox(defaultBoxName);
// return selBox;
// }
//
// @Override
// protected WidgetListSelectionSubRegions getListWidget()
// {
// return this.createListWidget(8, 116);
// }
//
// @Override
// protected void reCreateListWidget()
// {
//// super.createListWidget(8,116);
// // NO-OP
// }
//
// @Override
// protected WidgetListSelectionSubRegions createListWidget(int listX, int listY)
// {
// return new WidgetListSelectionSubRegions(listX, listY,
// this.getBrowserWidth(), this.getBrowserHeight(), this.selection, this);
// }
//}
119 changes: 114 additions & 5 deletions src/main/java/fi/dy/masa/litematica/gui/GuiAreaSelectionEditorNormal.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
import java.util.ArrayList;
import java.util.List;
import javax.annotation.Nullable;

import fi.dy.masa.malilib.MaLiLib;
import net.minecraft.util.math.BlockPos;
import fi.dy.masa.litematica.config.Configs;
import fi.dy.masa.litematica.config.Hotkeys;
Expand Down Expand Up @@ -35,6 +37,7 @@
import fi.dy.masa.malilib.interfaces.IStringConsumerFeedback;
import fi.dy.masa.malilib.util.PositionUtils.CoordinateType;
import fi.dy.masa.malilib.util.StringUtils;
import net.minecraft.util.math.Vec3i;

public class GuiAreaSelectionEditorNormal extends GuiListBase<String, WidgetSelectionSubRegion, WidgetListSelectionSubRegions>
implements ISelectionListener<String>
Expand All @@ -48,7 +51,11 @@ public class GuiAreaSelectionEditorNormal extends GuiListBase<String, WidgetSele
protected int yNext;
protected int xOrigin;
@Nullable protected String selectionId;

protected static boolean specialMode = false;
protected static boolean expandCircle = false;
protected BlockPos cor1 = BlockPos.ORIGIN;
protected BlockPos cor2 = BlockPos.ORIGIN;
protected static final String defaultBoxName = "defaultBoxName";
public GuiAreaSelectionEditorNormal(AreaSelection selection)
{
super(8, 116);
Expand Down Expand Up @@ -76,7 +83,6 @@ public void setSelectionId(@Nullable String selectionId)
public void initGui()
{
super.initGui();

if (this.selection != null)
{
this.createSelectionEditFields();
Expand Down Expand Up @@ -105,7 +111,7 @@ protected void createSelectionEditFields()
this.addLabel(x, y, -1, 16, 0xFFFFFFFF, StringUtils.translate("litematica.gui.label.area_editor.selection_name"));
y += 13;

int width = 202;
int width = 150;
this.textFieldSelectionName = new GuiTextFieldGeneric(x, y + 2, width, 16, this.textRenderer);
this.textFieldSelectionName.setText(this.selection.getName());
this.addTextField(this.textFieldSelectionName, new TextFieldListenerDummy());
Expand All @@ -128,12 +134,16 @@ protected int addSubRegionFields(int x, int y)
xSave += this.createButtonOnOff(xSave, ySave, -1, currentlyOn, ButtonListener.Type.TOGGLE_ORIGIN_ENABLED) + 4;
xSave += this.createButton(xSave, ySave, -1, ButtonListener.Type.CREATE_SCHEMATIC) + 4;

int offsetForExplicitOrigin = 0;
// Manual Origin defined
if (this.selection.getExplicitOrigin() != null)
{
x = Math.max(xSave, this.xOrigin);
this.createCoordinateInputs(x, 5, width, Corner.NONE);
offsetForExplicitOrigin = 105;
}
// add special area selection
addCurrentSelectCorner(xSave + offsetForExplicitOrigin, 5);

x = 12;
y = this.getListY() - 12;
Expand Down Expand Up @@ -168,6 +178,23 @@ protected int addSubRegionFields(int x, int y)
return y;
}

protected void addCurrentSelectCorner(int curX, int curY) {
int width = 68;
this.createCoordinateInputs(curX, curY, width, Corner.CORNER_1);
curX += width + 37;
this.createCoordinateInputs(curX, curY, width, Corner.CORNER_2);
curX += width + 37;
this.createButtonOnOff(curX, curY, -1, specialMode, ButtonListener.Type.TOGGLE_SPECIAL_ENABLED);
curY += 22;
this.createButtonOnOff(curX, curY, -1, expandCircle, ButtonListener.Type.TOGGLE_EXPAND_CIRCLE_ENABLED);
curY += 22;
this.createButton(curX, curY, -1, ButtonListener.Type.TOGGLE_GENERATE_CIRCLE);
curY += 22;
this.createButton(curX, curY, -1, ButtonListener.Type.TOGGLE_GENERATE_ROUND);
curY += 22;
this.createButton(curX, curY, -1, ButtonListener.Type.TOGGLE_REMOVE_ALL_REGION);
}

protected void addRenderingDisabledWarning(int x, int y)
{
if (Configs.Visuals.ENABLE_AREA_SELECTION_RENDERING.getBooleanValue() == false)
Expand Down Expand Up @@ -240,6 +267,35 @@ protected int createCoordinateInputs(int x, int y, int width, Corner corner)
return y;
}

protected void updateCircleModeParams(CoordinateType coordType, Corner corner, String text) {
if (corner == Corner.NONE) {
return;
}
BlockPos pos = corner == Corner.CORNER_1 ? cor1 : cor2;
int value;
try {
value = Integer.parseInt(text);
} catch (Exception e) {
return;
}
switch (coordType) {
case X:
pos = new BlockPos(value, pos.getY(), pos.getZ());
break;
case Y:
pos = new BlockPos(pos.getX(), value, pos.getZ());
break;
case Z:
pos = new BlockPos(pos.getX(), pos.getY(), value);
break;
}
if (corner == Corner.CORNER_1) {
cor1 = pos;
} else if (corner == Corner.CORNER_2) {
cor2 = pos;
}
}

protected void createCoordinateInput(int x, int y, int width, CoordinateType coordType, Corner corner)
{
String label = coordType.name() + ":";
Expand Down Expand Up @@ -267,6 +323,9 @@ protected void createCoordinateInput(int x, int y, int width, CoordinateType coo
break;
}

// 创建的时候更新角点的坐标值
updateCircleModeParams(coordType, corner, text);

GuiTextFieldInteger textField = new GuiTextFieldInteger(x + offset, y, width, 16, this.textRenderer);
TextFieldListener listener = new TextFieldListener(coordType, corner, this);
textField.setText(text);
Expand Down Expand Up @@ -359,7 +418,22 @@ protected void updateCheckBoxes()
@Nullable
protected Box getBox()
{
return null;
// 设置默认位置和名称
Box selBox = this.selection.getSelectedSubRegionBox();
this.selection.removeSelectedSubRegionBox();
if (selBox != null) {
selBox.setName(defaultBoxName);
} else if (this.mc.player != null) {
BlockPos pos = fi.dy.masa.malilib.util.PositionUtils.getEntityBlockPos(this.mc.player);
selBox = new Box(pos, pos, defaultBoxName);
} else {
MaLiLib.logger.error("can not getSelectedSubRegionBox");
selBox = new Box();
selBox.setName(defaultBoxName);
}
this.selection.addSubRegionBox(selBox,false);
this.selection.setSelectedSubRegionBox(defaultBoxName);
return selBox;
}

protected void updatePosition(String numberString, Corner corner, CoordinateType type)
Expand Down Expand Up @@ -536,6 +610,30 @@ public void actionPerformedWithButton(ButtonBase button, int mouseButton)
this.parent.selection.setExplicitOrigin(null);
}
break;
case TOGGLE_GENERATE_CIRCLE:
MaLiLib.logger.error("click TOGGLE_GENERATE_CIRCLE " + specialMode);
if (specialMode) {
this.parent.selection.createNewSubRegionBoxCircle(this.parent.cor1, this.parent.cor2, true, expandCircle);
}
break;
case TOGGLE_GENERATE_ROUND:
MaLiLib.logger.error("click TOGGLE_GENERATE_ROUND " + specialMode);
if (specialMode) {
this.parent.selection.createNewSubRegionBoxCircle(this.parent.cor1, this.parent.cor2,false, expandCircle);
}
break;
case TOGGLE_SPECIAL_ENABLED:
MaLiLib.logger.error("click TOGGLE_SPECIAL_ENABLED " + specialMode);
specialMode = !specialMode;
break;
case TOGGLE_REMOVE_ALL_REGION:
MaLiLib.logger.error("click TOGGLE_REMOVE_ALL_REGION " + specialMode);
this.parent.selection.removeAllSubRegion();
break;
case TOGGLE_EXPAND_CIRCLE_ENABLED:
MaLiLib.logger.error("click TOGGLE_EXPAND_CIRCLE_ENABLED " + expandCircle);
expandCircle = !expandCircle;
break;
}

this.parent.initGui(); // Re-create buttons/text fields
Expand All @@ -546,6 +644,11 @@ public enum Type
SET_SELECTION_NAME ("litematica.gui.button.area_editor.set_selection_name"),
SET_BOX_NAME ("litematica.gui.button.area_editor.set_box_name"),
TOGGLE_ORIGIN_ENABLED ("litematica.gui.button.area_editor.origin_enabled"),
TOGGLE_SPECIAL_ENABLED ("litematica.gui.button.area_editor.special_enabled"),
TOGGLE_EXPAND_CIRCLE_ENABLED ("litematica.gui.button.area_editor.expand_circle_enabled"),
TOGGLE_GENERATE_CIRCLE ("litematica.gui.button.area_editor.generate_circle"),
TOGGLE_GENERATE_ROUND ("litematica.gui.button.area_editor.generate_round"),
TOGGLE_REMOVE_ALL_REGION ("litematica.gui.button.area_editor.remove_all_region"),
CREATE_SUB_REGION ("litematica.gui.button.area_editor.create_sub_region"),
CREATE_SCHEMATIC ("litematica.gui.button.area_editor.create_schematic"),
ANALYZE_AREA ("litematica.gui.button.area_editor.analyze_area"),
Expand Down Expand Up @@ -598,7 +701,13 @@ public TextFieldListener(CoordinateType type, Corner corner, GuiAreaSelectionEdi
@Override
public boolean onTextChange(GuiTextFieldGeneric textField)
{
this.parent.updatePosition(textField.getText(), this.corner, this.type);
if (specialMode) {
// updateCircleModeParams(coordType, corner, text);
this.parent.updatePosition(textField.getText(), this.corner, this.type);
// todo nothing
} else {
this.parent.updatePosition(textField.getText(), this.corner, this.type);
}
return false;
}
}
Expand Down
1 change: 1 addition & 0 deletions src/main/java/fi/dy/masa/litematica/render/OverlayRenderer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import java.util.List;
import java.util.Map;
import com.google.common.collect.ImmutableMap;
import fi.dy.masa.malilib.MaLiLib;
import org.joml.Matrix4f;
import com.mojang.blaze3d.systems.RenderSystem;
import net.minecraft.block.BlockState;
Expand Down
Loading