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

New ore filter implementation #1561

Merged
merged 46 commits into from
Apr 7, 2023
Merged
Show file tree
Hide file tree
Changes from 44 commits
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
c58a3b0
OreGlob prototype
Tictim Mar 1, 2023
1f83d45
Apply manual inversion for !(ore) syntax
Tictim Mar 1, 2023
606c4c6
Fix ebnf
Tictim Mar 4, 2023
e5a4743
Remove OreEvaluator interface, finish OreGlobInterpreter javadoc
Tictim Mar 4, 2023
bdc66c4
Works
Tictim Mar 4, 2023
ca1718b
Test case for empty input, group negation, impossible, any char, inve…
Tictim Mar 4, 2023
87e0604
!() parsing & test
Tictim Mar 4, 2023
bc28234
Inline token field and get rid of Token class for more cursedness
Tictim Mar 4, 2023
082854d
Fix groups advancing token twice, slight style change
Tictim Mar 4, 2023
f6fffaa
Insert prefix like 'or' 'and' to improve readability
Tictim Mar 4, 2023
82308f8
Merge branch 'master' into oreglob
Tictim Mar 5, 2023
c9e49ff
Merge branch 'master' into oreglob
Tictim Mar 6, 2023
7702676
Crude implementation of branch elimination
Tictim Mar 6, 2023
6dc654a
Make OreGlob abstract, structural equality test cases
Tictim Mar 6, 2023
ad2b563
Modify NodeVisitor to handle complete descriptions separately
Tictim Mar 6, 2023
f8bb7df
Repackage
Tictim Mar 6, 2023
04455ba
make getIndividualNodeMatchDescription abstract
Tictim Mar 6, 2023
03492b7
Optimization case for consecutive inverted string matches
Tictim Mar 7, 2023
9f3fe03
some compilation warnings, treat empty expression as impossible match…
Tictim Mar 7, 2023
9914596
logical inversion warning/optimization test
Tictim Mar 7, 2023
abcd0e3
Report inversion chains as well as nested inversions
Tictim Mar 7, 2023
1724f44
Correct nested inversion warning condition
Tictim Mar 7, 2023
44582a0
error visit fix etc
Tictim Mar 7, 2023
2887479
hardcode oreglob to only match char below 0xFFFF, docs update
Tictim Mar 7, 2023
1e4e36b
MASSIVE COVER-UP
Tictim Mar 7, 2023
4bb0165
Hide node constructors, make BranchType an inner class of BranchNode
Tictim Mar 7, 2023
edc0cbf
Update EBNF
Tictim Mar 7, 2023
e444886
Update EBNF
Tictim Mar 7, 2023
a04f3ee
Always return no match glob if there's compilation error
Tictim Mar 13, 2023
ca4e146
Merge branch 'master' into oreglob
Tictim Mar 13, 2023
c89261f
Integrate oreglob into actual ore filter
Tictim Mar 14, 2023
ef5294a
small adjustments & docs
Tictim Mar 14, 2023
37fac74
change some terms
Tictim Mar 14, 2023
9350ef0
Minor docs edit
Tictim Mar 14, 2023
4e1ae96
Minor docs edit 2
Tictim Mar 14, 2023
17d82a3
Correct XNOR visualization
Tictim Mar 14, 2023
936efe3
Additional term change
Tictim Mar 16, 2023
dff5191
Merge branch 'master' into oreglob
Tictim Mar 16, 2023
ba26979
Compilation flags
Tictim Mar 16, 2023
3b81d72
Merge branch 'master' into oreglob
Tictim Mar 29, 2023
7d14061
update lang
Tictim Mar 29, 2023
127e1ce
Rename CompileStatusWidget
Tictim Mar 29, 2023
bb38d49
Divide OreFilterTestSlot implementation for future tutorial app (tm)
Tictim Mar 29, 2023
5f35af2
Remove unnecessary package specification
Tictim Apr 1, 2023
31409bb
Correct highlight rule for compilation flags, remove loop labels in f…
Tictim Apr 3, 2023
e1193d3
Comment getCursorPosFromMouse bit
Tictim Apr 3, 2023
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
3 changes: 3 additions & 0 deletions src/main/java/gregtech/GregTechMod.java
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,10 @@
import gregtech.api.GTValues;
import gregtech.api.GregTechAPI;
import gregtech.api.modules.ModuleContainerRegistryEvent;
import gregtech.api.util.oreglob.OreGlob;
import gregtech.client.utils.BloomEffectUtil;
import gregtech.integration.groovy.GroovyScriptCompat;
import gregtech.common.covers.filter.oreglob.impl.OreGlobParser;
import gregtech.modules.GregTechModules;
import gregtech.modules.ModuleManager;
import net.minecraftforge.common.MinecraftForge;
Expand Down Expand Up @@ -42,6 +44,7 @@ public GregTechMod() {
public void onConstruction(FMLConstructionEvent event) {
moduleManager = ModuleManager.getInstance();
GregTechAPI.moduleManager = moduleManager;
OreGlob.setCompiler(input -> new OreGlobParser(input).compile());
moduleManager.registerContainer(new GregTechModules());
MinecraftForge.EVENT_BUS.post(new ModuleContainerRegistryEvent());

Expand Down
10 changes: 10 additions & 0 deletions src/main/java/gregtech/api/gui/GuiTextures.java
Original file line number Diff line number Diff line change
Expand Up @@ -219,6 +219,16 @@ public class GuiTextures {
// Covers
public static final TextureArea COVER_MACHINE_CONTROLLER = TextureArea.fullImage("textures/items/metaitems/cover.controller.png");

// Ore Filter
public static final TextureArea ORE_FILTER_INFO = TextureArea.fullImage("textures/gui/widget/ore_filter/info.png");
public static final TextureArea ORE_FILTER_SUCCESS = TextureArea.fullImage("textures/gui/widget/ore_filter/success.png");
public static final TextureArea ORE_FILTER_ERROR = TextureArea.fullImage("textures/gui/widget/ore_filter/error.png");
public static final TextureArea ORE_FILTER_WARN = TextureArea.fullImage("textures/gui/widget/ore_filter/warn.png");
public static final TextureArea ORE_FILTER_WAITING = TextureArea.fullImage("textures/gui/widget/ore_filter/waiting.png");

public static final TextureArea ORE_FILTER_MATCH = TextureArea.fullImage("textures/gui/widget/ore_filter/match.png");
public static final TextureArea ORE_FILTER_NO_MATCH = TextureArea.fullImage("textures/gui/widget/ore_filter/no_match.png");

//Terminal
public static final TextureArea ICON_REMOVE = TextureArea.fullImage("textures/gui/terminal/icon/remove_hover.png");
public static final TextureArea ICON_UP = TextureArea.fullImage("textures/gui/terminal/icon/up_hover.png");
Expand Down
142 changes: 0 additions & 142 deletions src/main/java/gregtech/api/gui/widgets/OreDictFilterTestSlot.java

This file was deleted.

Loading