aboutsummaryrefslogtreecommitdiff
path: root/src/main/resources
diff options
context:
space:
mode:
authorLinnea Gräf <nea@nea.moe>2024-11-03 01:24:24 +0100
committerLinnea Gräf <nea@nea.moe>2024-11-03 01:24:24 +0100
commite2677d6ee5c3f74d5f547ca48bf6641f047a2a1e (patch)
treefecc0322e48a399df7697da11adfb022d5641a6c /src/main/resources
parent646843ba3b960ac48f9866b3640438d3cc1dafc4 (diff)
downloadFirmament-e2677d6ee5c3f74d5f547ca48bf6641f047a2a1e.tar.gz
Firmament-e2677d6ee5c3f74d5f547ca48bf6641f047a2a1e.tar.bz2
Firmament-e2677d6ee5c3f74d5f547ca48bf6641f047a2a1e.zip
1.21.3 WIP
Diffstat (limited to 'src/main/resources')
-rw-r--r--src/main/resources/assets/firmament/shaders/code/rendertype_lines.fsh (renamed from src/main/resources/assets/minecraft/shaders/core/firmament_rendertype_lines.fsh)0
-rw-r--r--src/main/resources/assets/firmament/shaders/code/rendertype_lines.json (renamed from src/main/resources/assets/minecraft/shaders/core/firmament_rendertype_lines.json)4
-rw-r--r--src/main/resources/assets/firmament/shaders/code/rendertype_lines.vsh (renamed from src/main/resources/assets/minecraft/shaders/core/firmament_rendertype_lines.vsh)0
-rw-r--r--src/main/resources/firmament.accesswidener3
-rw-r--r--src/main/resources/firmament.mixins.json13
5 files changed, 12 insertions, 8 deletions
diff --git a/src/main/resources/assets/minecraft/shaders/core/firmament_rendertype_lines.fsh b/src/main/resources/assets/firmament/shaders/code/rendertype_lines.fsh
index 057f31f..057f31f 100644
--- a/src/main/resources/assets/minecraft/shaders/core/firmament_rendertype_lines.fsh
+++ b/src/main/resources/assets/firmament/shaders/code/rendertype_lines.fsh
diff --git a/src/main/resources/assets/minecraft/shaders/core/firmament_rendertype_lines.json b/src/main/resources/assets/firmament/shaders/code/rendertype_lines.json
index 0828480..f276639 100644
--- a/src/main/resources/assets/minecraft/shaders/core/firmament_rendertype_lines.json
+++ b/src/main/resources/assets/firmament/shaders/code/rendertype_lines.json
@@ -1,6 +1,6 @@
{
- "vertex": "firmament_rendertype_lines",
- "fragment": "firmament_rendertype_lines",
+ "vertex": "firmament:rendertype_lines",
+ "fragment": "firmament:rendertype_lines",
"samplers": [
],
"uniforms": [
diff --git a/src/main/resources/assets/minecraft/shaders/core/firmament_rendertype_lines.vsh b/src/main/resources/assets/firmament/shaders/code/rendertype_lines.vsh
index b2d0f99..b2d0f99 100644
--- a/src/main/resources/assets/minecraft/shaders/core/firmament_rendertype_lines.vsh
+++ b/src/main/resources/assets/firmament/shaders/code/rendertype_lines.vsh
diff --git a/src/main/resources/firmament.accesswidener b/src/main/resources/firmament.accesswidener
index 60b31e3..5d64acc 100644
--- a/src/main/resources/firmament.accesswidener
+++ b/src/main/resources/firmament.accesswidener
@@ -5,6 +5,7 @@ accessible class net/minecraft/client/font/TextRenderer$Drawer
accessible field net/minecraft/client/gui/hud/InGameHud SCOREBOARD_ENTRY_COMPARATOR Ljava/util/Comparator;
accessible field net/minecraft/client/render/item/HeldItemRenderer itemRenderer Lnet/minecraft/client/render/item/ItemRenderer;
+accessible field net/minecraft/client/render/item/ItemModels missingModelSupplier Ljava/util/function/Supplier;
accessible class net/minecraft/client/render/model/json/ModelOverride$Deserializer
accessible class net/minecraft/client/render/model/json/ModelOverrideList$BakedOverride
@@ -14,7 +15,7 @@ accessible field net/minecraft/entity/passive/AbstractHorseEntity items Lnet/min
accessible field net/minecraft/entity/passive/AbstractHorseEntity SADDLED_FLAG I
accessible field net/minecraft/entity/passive/AbstractHorseEntity HORSE_FLAGS Lnet/minecraft/entity/data/TrackedData;
accessible method net/minecraft/resource/NamespaceResourceManager loadMetadata (Lnet/minecraft/resource/InputSupplier;)Lnet/minecraft/resource/metadata/ResourceMetadata;
-accessible method net/minecraft/client/gui/DrawContext drawTexturedQuad (Lnet/minecraft/util/Identifier;IIIIIFFFFFFFF)V
+accessible method net/minecraft/client/gui/DrawContext drawTexturedQuad (Ljava/util/function/Function;Lnet/minecraft/util/Identifier;IIIIFFFFI)V
mutable field net/minecraft/screen/slot/Slot x I
mutable field net/minecraft/screen/slot/Slot y I
diff --git a/src/main/resources/firmament.mixins.json b/src/main/resources/firmament.mixins.json
index dbb8290..d78d124 100644
--- a/src/main/resources/firmament.mixins.json
+++ b/src/main/resources/firmament.mixins.json
@@ -1,7 +1,10 @@
{
- "required": true,
- "plugin": "moe.nea.firmament.init.MixinPlugin",
- "package": "moe.nea.firmament.mixins",
- "compatibilityLevel": "JAVA_21",
- "refmap": "Firmament-refmap.json"
+ "required": true,
+ "plugin": "moe.nea.firmament.init.MixinPlugin",
+ "package": "moe.nea.firmament.mixins",
+ "compatibilityLevel": "JAVA_21",
+ "refmap": "Firmament-refmap.json",
+ "injectors": {
+ "defaultRequire": 1
+ }
}