Skip to content
Open
Show file tree
Hide file tree
Changes from 17 commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
889a345
use forge provided dye tag keys instead of adding duplicate TagKey de…
screret Aug 4, 2026
940ca2a
Fix lens tags & make their field names match forge's formatting
screret Aug 4, 2026
70acaef
Use DyeColor enum in favor of GTValues.COLORS string array
screret Aug 4, 2026
bd18bb7
Add `forge:lenses` and `forge:lenses/glass` tags & add all dyed lense…
screret Aug 4, 2026
5a2f2b0
fix `RecipeRemoval.hardDyeRecipes` removing dye crafting recipes 15 t…
screret Aug 4, 2026
2e01514
fix the glass lens lang replacement
screret Aug 4, 2026
839481d
Make lens tags be in the GT namespace
screret Aug 4, 2026
a953fba
Add tag builder helpers for optional entries/suppliers and make mater…
screret Aug 4, 2026
a113841
add all of GT's tool tags to `#forge:tools`
screret Aug 4, 2026
6d31a61
Formatting changes/fixes
screret Aug 4, 2026
e82eb38
group tags into subclasses by their type
screret Aug 4, 2026
33e9917
Rename CustomTags to GTTags
screret Aug 4, 2026
2637642
datagen
screret Aug 4, 2026
07d029e
spot dn
screret Aug 4, 2026
9611cc8
Fix the battery/circuit tag fields' word order
screret Aug 4, 2026
2d42926
Add `TOOLS_` to all tool tags fields' names
screret Aug 4, 2026
2405452
rename crafting tools tags to `crafting_tools/x` (from `tools/craftin…
screret Aug 4, 2026
b6e4c68
Add changes to update doc
screret Aug 10, 2026
e7f8d00
Merge branch '1.20.1' into sc/clean-up-CustomTags
screret Aug 10, 2026
1c1dde7
datagen + spotless
screret Aug 10, 2026
0ce1e96
Merge branch '1.20.1' into sc/clean-up-CustomTags
screret Aug 15, 2026
2614e3f
Fix the color item (-tag) maps
screret Aug 15, 2026
1700ceb
Also make the spray can item array a map
screret Aug 15, 2026
62a4d9f
spotless
screret Aug 15, 2026
d54947c
vewy small wename
screret Aug 15, 2026
b565555
move lens tags back to common namespace
screret Aug 15, 2026
66d1dcb
Merge branch '1.20.1' into sc/clean-up-CustomTags
screret Aug 18, 2026
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
6 changes: 6 additions & 0 deletions injected_interfaces/interfaces.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,11 @@
"net/minecraft/world/entity/Entity": [
"com/gregtechceu/gtceu/core/IFireImmuneEntity",
"com/gregtechceu/gtceu/core/IBreathingEntity"
],
"net/minecraft/data/tags/TagsProvider$TagAppender": [
"com/gregtechceu/gtceu/core/util/extensions/TagAppenderExt<T>"
],
"net/minecraft/data/tags/IntrinsicHolderTagsProvider$IntrinsicTagAppender": [
"com/gregtechceu/gtceu/core/util/extensions/IntrinsicTagAppenderExt<T>"
]
}
2 changes: 1 addition & 1 deletion src/generated/resources/assets/gtceu/lang/en_ud.json
Original file line number Diff line number Diff line change
Expand Up @@ -4089,7 +4089,6 @@
"gui.gtceu.share_tank.desc.0": "¡ɹǝɟɟnq uıɥʇıʍ suɹǝʇʇɐd ןןɐ ɥʇıʍ ˙ɔʇǝ/sǝssɐb/spınןɟ pǝʇɹǝsuı sǝɹɐɥS",
"gui.gtceu.share_tank.title": "ʎɹoʇuǝʌuI ʞuɐ⟘ pǝɹɐɥS",
"gui.widget.incrementButton.default_tooltip": "ʇunoɯɐ ǝɥʇ ǝbuɐɥɔ oʇ ɥʇoq ɹo ןɹʇƆ 'ʇɟıɥS pןoH",
"item.glass_lens": ")ǝʇıɥM( suǝꞀ ssɐן⅁",
"item.gtceu.activity_detector_cover": "ɹoʇɔǝʇǝᗡ ʎʇıʌıʇɔⱯ",
"item.gtceu.activity_detector_cover.tooltip": "˙ㄥ§ɹǝʌoƆɟ§ sɐ ǝuoʇspǝᴚ sɐ ㄥ§snʇɐʇS ʎʇıʌıʇɔⱯɟ§ ʇno sǝʌı⅁ㄥ§",
"item.gtceu.advanced_activity_detector_cover": "ɹoʇɔǝʇǝᗡ ʎʇıʌıʇɔⱯ pǝɔuɐʌpⱯ",
Expand Down Expand Up @@ -4344,6 +4343,7 @@
"item.gtceu.gelled_toluene": "ǝuǝnןo⟘ pǝןןǝ⅁",
"item.gtceu.gelled_toluene.tooltip": "ǝʌısoןdxƎ ʍɐᴚㄥ§",
"item.gtceu.glass_gem": "ןɐʇsʎɹƆ ssɐן⅁",
"item.gtceu.glass_lens": ")ǝʇıɥM( suǝꞀ ssɐן⅁",
"item.gtceu.glass_plate": "ǝuɐԀ ssɐן⅁",
"item.gtceu.glass_tube": "ǝqn⟘ ssɐן⅁",
"item.gtceu.glass_vial": "ןɐıΛ ssɐן⅁ %s",
Expand Down
2 changes: 1 addition & 1 deletion src/generated/resources/assets/gtceu/lang/en_us.json
Original file line number Diff line number Diff line change
Expand Up @@ -4089,7 +4089,6 @@
"gui.gtceu.share_tank.desc.0": "Shares inserted fluids/gasses/etc. with all patterns within buffer!",
"gui.gtceu.share_tank.title": "Shared Tank Inventory",
"gui.widget.incrementButton.default_tooltip": "Hold Shift, Ctrl or both to change the amount",
"item.glass_lens": "Glass Lens (White)",
"item.gtceu.activity_detector_cover": "Activity Detector",
"item.gtceu.activity_detector_cover.tooltip": "§7Gives out §fActivity Status§7 as Redstone as §fCover§7.",
"item.gtceu.advanced_activity_detector_cover": "Advanced Activity Detector",
Expand Down Expand Up @@ -4344,6 +4343,7 @@
"item.gtceu.gelled_toluene": "Gelled Toluene",
"item.gtceu.gelled_toluene.tooltip": "§7Raw Explosive",
"item.gtceu.glass_gem": "Glass Crystal",
"item.gtceu.glass_lens": "Glass Lens (White)",
"item.gtceu.glass_plate": "Glass Pane",
"item.gtceu.glass_tube": "Glass Tube",
"item.gtceu.glass_vial": "%s Glass Vial",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
{
"values": [
"gtceu:lazurite_gem",
"gtceu:sodalite_gem"
{
"id": "gtceu:lazurite_gem",
"required": false
},
{
"id": "gtceu:sodalite_gem",
"required": false
}
]
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
{
"values": [
"gtceu:wheat_dust"
{
"id": "gtceu:wheat_dust",
"required": false
}
]
}

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
{
"values": [
"gtceu:treated_wood_rod"
{
"id": "gtceu:treated_wood_rod",
"required": false
}
]
}
23 changes: 23 additions & 0 deletions src/generated/resources/data/forge/tags/items/tools.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"values": [
"#forge:tools/butchery_knives",
"#forge:tools/buzzsaws",
"#forge:tools/chainsaws",
"#forge:tools/crowbars",
"#forge:tools/drills",
"#forge:tools/files",
"#forge:tools/hammers",
"#forge:tools/knives",
"#forge:tools/mallets",
"#forge:tools/mining_hammers",
"#forge:tools/mortars",
"#forge:tools/plungers",
"#forge:tools/saws",
"#forge:tools/screwdrivers",
"#forge:tools/scythes",
"#forge:tools/shears",
"#forge:tools/spades",
"#forge:tools/wire_cutters",
"#forge:tools/wrenches"
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"values": []
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"values": []
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"values": []
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"values": []
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"values": []
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"values": []
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"values": []
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"values": []
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"values": []
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"values": []
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"values": []
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"values": []
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"values": []
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"values": []
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"values": []
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"values": [
"#forge:shears"
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"values": []
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"values": []
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"values": [
"#forge:tools/wrenches"
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"values": []
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"values": [
"gtceu:rubber_log"
]
}
25 changes: 5 additions & 20 deletions src/generated/resources/data/gtceu/tags/items/circuits.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,25 +10,10 @@
"#gtceu:circuits/zpm",
"#gtceu:circuits/uv",
"#gtceu:circuits/uhv",
{
"id": "#gtceu:circuits/uev",
"required": false
},
{
"id": "#gtceu:circuits/uiv",
"required": false
},
{
"id": "#gtceu:circuits/uxv",
"required": false
},
{
"id": "#gtceu:circuits/opv",
"required": false
},
{
"id": "#gtceu:circuits/max",
"required": false
}
"#gtceu:circuits/uev",
"#gtceu:circuits/uiv",
"#gtceu:circuits/uxv",
"#gtceu:circuits/opv",
"#gtceu:circuits/max"
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"values": []
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"values": []
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"values": []
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"values": []
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"values": []
}
21 changes: 21 additions & 0 deletions src/generated/resources/data/gtceu/tags/items/lenses.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"values": [
"#gtceu:lenses/white",
"#gtceu:lenses/orange",
"#gtceu:lenses/magenta",
"#gtceu:lenses/light_blue",
"#gtceu:lenses/yellow",
"#gtceu:lenses/lime",
"#gtceu:lenses/pink",
"#gtceu:lenses/gray",
"#gtceu:lenses/light_gray",
"#gtceu:lenses/cyan",
"#gtceu:lenses/purple",
"#gtceu:lenses/blue",
"#gtceu:lenses/brown",
"#gtceu:lenses/green",
"#gtceu:lenses/red",
"#gtceu:lenses/black",
"#gtceu:lenses/glass"
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"values": [
"gtceu:black_glass_lens"
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"values": [
"gtceu:blue_glass_lens",
{
"id": "gtceu:sapphire_lens",
"required": false
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"values": [
"gtceu:brown_glass_lens"
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"values": [
"gtceu:cyan_glass_lens"
]
}
19 changes: 19 additions & 0 deletions src/generated/resources/data/gtceu/tags/items/lenses/glass.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"values": [
"gtceu:orange_glass_lens",
"gtceu:magenta_glass_lens",
"gtceu:light_blue_glass_lens",
"gtceu:yellow_glass_lens",
"gtceu:lime_glass_lens",
"gtceu:pink_glass_lens",
"gtceu:gray_glass_lens",
"gtceu:light_gray_glass_lens",
"gtceu:cyan_glass_lens",
"gtceu:purple_glass_lens",
"gtceu:blue_glass_lens",
"gtceu:brown_glass_lens",
"gtceu:green_glass_lens",
"gtceu:red_glass_lens",
"gtceu:black_glass_lens"
]
}
Loading
Loading