From c3c547c6f950ebbc047cd31672f6a794483a9d0e Mon Sep 17 00:00:00 2001 From: SHsuperCM Date: Fri, 21 Jan 2022 10:33:11 +0200 Subject: Added separate project for defaults & set up building --- .../resources/assets/citresewn-defaults/logo.png | Bin 0 -> 99334 bytes .../resources/citresewn-defaults.accesswidener | 1 + .../main/resources/citresewn-defaults.mixins.json | 11 ++++++++ defaults/src/main/resources/fabric.mod.json | 30 +++++++++++++++++++++ 4 files changed, 42 insertions(+) create mode 100644 defaults/src/main/resources/assets/citresewn-defaults/logo.png create mode 100644 defaults/src/main/resources/citresewn-defaults.accesswidener create mode 100644 defaults/src/main/resources/citresewn-defaults.mixins.json create mode 100644 defaults/src/main/resources/fabric.mod.json (limited to 'defaults/src/main/resources') diff --git a/defaults/src/main/resources/assets/citresewn-defaults/logo.png b/defaults/src/main/resources/assets/citresewn-defaults/logo.png new file mode 100644 index 0000000..35859ac Binary files /dev/null and b/defaults/src/main/resources/assets/citresewn-defaults/logo.png differ diff --git a/defaults/src/main/resources/citresewn-defaults.accesswidener b/defaults/src/main/resources/citresewn-defaults.accesswidener new file mode 100644 index 0000000..3fde517 --- /dev/null +++ b/defaults/src/main/resources/citresewn-defaults.accesswidener @@ -0,0 +1 @@ +accessWidener v1 named diff --git a/defaults/src/main/resources/citresewn-defaults.mixins.json b/defaults/src/main/resources/citresewn-defaults.mixins.json new file mode 100644 index 0000000..b5c307d --- /dev/null +++ b/defaults/src/main/resources/citresewn-defaults.mixins.json @@ -0,0 +1,11 @@ +{ + "required": true, + "minVersion": "0.8", + "package": "shcm.shsupercm.fabric.citresewn.defaults.mixin", + "compatibilityLevel": "JAVA_17", + "mixins": [ + ], + "injectors": { + "defaultRequire": 1 + } +} diff --git a/defaults/src/main/resources/fabric.mod.json b/defaults/src/main/resources/fabric.mod.json new file mode 100644 index 0000000..004b7a8 --- /dev/null +++ b/defaults/src/main/resources/fabric.mod.json @@ -0,0 +1,30 @@ +{ + "schemaVersion": 1, + "id": "citresewn-defaults", + "version": "${version}", + "name": "CIT Resewn - Defaults", + "description": "Default types and conditions for CIT Resewn", + "authors": [ + "SHsuperCM" + ], + "license": "MIT", + "icon": "assets/citresewn-defaults/logo.png", + + "environment": "client", + "entrypoints": { + }, + "accessWidener" : "citresewn-defaults.accesswidener", + "mixins": [ + "citresewn-defaults.mixins.json" + ], + "custom": { + "modmenu": { + "parent": { + "id": "citresewn" + } + } + }, + "depends": { + "citresewn": "${version}" + } +} -- cgit From c48e23a8949eaa89d06908201357b53fa7eaedbe Mon Sep 17 00:00:00 2001 From: SHsuperCM Date: Fri, 21 Jan 2022 15:50:24 +0200 Subject: Added config/screen for defaults --- .../src/main/resources/assets/citresewn-defaults/lang/en_us.json | 4 ++++ defaults/src/main/resources/fabric.mod.json | 8 +++++++- 2 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 defaults/src/main/resources/assets/citresewn-defaults/lang/en_us.json (limited to 'defaults/src/main/resources') diff --git a/defaults/src/main/resources/assets/citresewn-defaults/lang/en_us.json b/defaults/src/main/resources/assets/citresewn-defaults/lang/en_us.json new file mode 100644 index 0000000..72784ed --- /dev/null +++ b/defaults/src/main/resources/assets/citresewn-defaults/lang/en_us.json @@ -0,0 +1,4 @@ +{ + "config.citresewn.defaults.title": "CIT Resewn: Defaults", + "config.citresewn.defaults.tooltip": "Go to the defaults' config menu" +} \ No newline at end of file diff --git a/defaults/src/main/resources/fabric.mod.json b/defaults/src/main/resources/fabric.mod.json index 004b7a8..0f8e566 100644 --- a/defaults/src/main/resources/fabric.mod.json +++ b/defaults/src/main/resources/fabric.mod.json @@ -2,7 +2,7 @@ "schemaVersion": 1, "id": "citresewn-defaults", "version": "${version}", - "name": "CIT Resewn - Defaults", + "name": "CIT Resewn: Defaults", "description": "Default types and conditions for CIT Resewn", "authors": [ "SHsuperCM" @@ -12,6 +12,12 @@ "environment": "client", "entrypoints": { + "modmenu": [ + "shcm.shsupercm.fabric.citresewn.defaults.config.CITResewnDefaultsModMenu" + ], + "citresewn-defaults:config_screen": [ + "shcm.shsupercm.fabric.citresewn.defaults.config.CITResewnDefaultsConfigScreenFactory::create" + ] }, "accessWidener" : "citresewn-defaults.accesswidener", "mixins": [ -- cgit From 818f912fc038b84a3dd855892d619af3325bc163 Mon Sep 17 00:00:00 2001 From: SHsuperCM Date: Fri, 21 Jan 2022 18:22:27 +0200 Subject: Improved mod metadata --- defaults/src/main/resources/fabric.mod.json | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'defaults/src/main/resources') diff --git a/defaults/src/main/resources/fabric.mod.json b/defaults/src/main/resources/fabric.mod.json index 0f8e566..c140556 100644 --- a/defaults/src/main/resources/fabric.mod.json +++ b/defaults/src/main/resources/fabric.mod.json @@ -9,6 +9,11 @@ ], "license": "MIT", "icon": "assets/citresewn-defaults/logo.png", + "contact": { + "homepage": "https://citresewn.shcm.io/", + "sources": "https://github.com/SHsuperCM/CITResewn", + "issues": "https://github.com/SHsuperCM/CITResewn/issues" + }, "environment": "client", "entrypoints": { @@ -32,5 +37,8 @@ }, "depends": { "citresewn": "${version}" + }, + "conflicts": { + "eatinganimationid": "*" } } -- cgit From 1a9e72178881ca41321c730eb69ce28f0b6ad171 Mon Sep 17 00:00:00 2001 From: SHsuperCM Date: Sat, 5 Feb 2022 07:46:52 +0200 Subject: Migrated to using Fletching Table --- defaults/src/main/resources/citresewn-defaults.mixins.json | 2 -- defaults/src/main/resources/fabric.mod.json | 8 -------- 2 files changed, 10 deletions(-) (limited to 'defaults/src/main/resources') diff --git a/defaults/src/main/resources/citresewn-defaults.mixins.json b/defaults/src/main/resources/citresewn-defaults.mixins.json index b5c307d..536380b 100644 --- a/defaults/src/main/resources/citresewn-defaults.mixins.json +++ b/defaults/src/main/resources/citresewn-defaults.mixins.json @@ -3,8 +3,6 @@ "minVersion": "0.8", "package": "shcm.shsupercm.fabric.citresewn.defaults.mixin", "compatibilityLevel": "JAVA_17", - "mixins": [ - ], "injectors": { "defaultRequire": 1 } diff --git a/defaults/src/main/resources/fabric.mod.json b/defaults/src/main/resources/fabric.mod.json index c140556..f35e7bb 100644 --- a/defaults/src/main/resources/fabric.mod.json +++ b/defaults/src/main/resources/fabric.mod.json @@ -16,14 +16,6 @@ }, "environment": "client", - "entrypoints": { - "modmenu": [ - "shcm.shsupercm.fabric.citresewn.defaults.config.CITResewnDefaultsModMenu" - ], - "citresewn-defaults:config_screen": [ - "shcm.shsupercm.fabric.citresewn.defaults.config.CITResewnDefaultsConfigScreenFactory::create" - ] - }, "accessWidener" : "citresewn-defaults.accesswidener", "mixins": [ "citresewn-defaults.mixins.json" -- cgit From 972e6c330d03f205ab738ed28c4e47496f30e92d Mon Sep 17 00:00:00 2001 From: SHsuperCM Date: Tue, 15 Feb 2022 12:21:57 +0200 Subject: Ported item type (missing asset resolution) --- .../resources/citresewn-defaults.accesswidener | 26 ++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'defaults/src/main/resources') diff --git a/defaults/src/main/resources/citresewn-defaults.accesswidener b/defaults/src/main/resources/citresewn-defaults.accesswidener index 3fde517..22b4947 100644 --- a/defaults/src/main/resources/citresewn-defaults.accesswidener +++ b/defaults/src/main/resources/citresewn-defaults.accesswidener @@ -1 +1,27 @@ accessWidener v1 named + +# TypeItem +accessible class net/minecraft/client/render/model/json/ModelOverrideList$BakedOverride +accessible class net/minecraft/client/render/model/json/ModelOverrideList$InlinedCondition +accessible method net/minecraft/client/render/model/json/ModelOverrideList ()V +accessible method net/minecraft/client/render/model/json/ModelOverrideList$BakedOverride ([Lnet/minecraft/client/render/model/json/ModelOverrideList$InlinedCondition;Lnet/minecraft/client/render/model/BakedModel;)V +accessible method net/minecraft/client/render/model/json/ModelOverrideList$InlinedCondition (IF)V +accessible field net/minecraft/client/render/model/json/ModelOverrideList overrides [Lnet/minecraft/client/render/model/json/ModelOverrideList$BakedOverride; +mutable field net/minecraft/client/render/model/json/ModelOverrideList overrides [Lnet/minecraft/client/render/model/json/ModelOverrideList$BakedOverride; +accessible field net/minecraft/client/render/model/json/ModelOverrideList conditionTypes [Lnet/minecraft/util/Identifier; +mutable field net/minecraft/client/render/model/json/ModelOverrideList conditionTypes [Lnet/minecraft/util/Identifier; + +# TypeEnchantment +accessible class net/minecraft/client/render/RenderLayer$MultiPhaseParameters +accessible method net/minecraft/client/render/RenderLayer of (Ljava/lang/String;Lnet/minecraft/client/render/VertexFormat;Lnet/minecraft/client/render/VertexFormat$DrawMode;ILnet/minecraft/client/render/RenderLayer$MultiPhaseParameters;)Lnet/minecraft/client/render/RenderLayer$MultiPhase; +accessible class net/minecraft/client/render/RenderPhase$Shader +accessible class net/minecraft/client/render/RenderPhase$Texturing +accessible class net/minecraft/client/render/RenderPhase$Transparency +accessible class net/minecraft/client/render/RenderPhase$Texture +accessible class net/minecraft/client/render/RenderPhase$Lightmap +accessible class net/minecraft/client/render/RenderPhase$Overlay +accessible class net/minecraft/client/render/RenderPhase$Cull +accessible class net/minecraft/client/render/RenderPhase$DepthTest +accessible class net/minecraft/client/render/RenderPhase$WriteMaskState +accessible class net/minecraft/client/render/RenderPhase$Layering +accessible class net/minecraft/client/render/RenderPhase$Target \ No newline at end of file -- cgit From 540fc9187ca1d1b1b986d27add982d2026735a3a Mon Sep 17 00:00:00 2001 From: SHsuperCM Date: Fri, 18 Feb 2022 08:15:27 +0200 Subject: Implemented nbt condition --- defaults/src/main/resources/citresewn-defaults.accesswidener | 3 +++ 1 file changed, 3 insertions(+) (limited to 'defaults/src/main/resources') diff --git a/defaults/src/main/resources/citresewn-defaults.accesswidener b/defaults/src/main/resources/citresewn-defaults.accesswidener index 22b4947..739fc5e 100644 --- a/defaults/src/main/resources/citresewn-defaults.accesswidener +++ b/defaults/src/main/resources/citresewn-defaults.accesswidener @@ -1,5 +1,8 @@ accessWidener v1 named +# ConditionNBT +accessible field net/minecraft/nbt/NbtCompound entries Ljava/util/Map; + # TypeItem accessible class net/minecraft/client/render/model/json/ModelOverrideList$BakedOverride accessible class net/minecraft/client/render/model/json/ModelOverrideList$InlinedCondition -- cgit From d2a7a6b219ff2b229774dba336417822ec019b7b Mon Sep 17 00:00:00 2001 From: SHsuperCM Date: Fri, 4 Mar 2022 09:55:50 +0200 Subject: Added back enchantment scroll multiplier config --- .../src/main/resources/assets/citresewn-defaults/lang/en_us.json | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'defaults/src/main/resources') diff --git a/defaults/src/main/resources/assets/citresewn-defaults/lang/en_us.json b/defaults/src/main/resources/assets/citresewn-defaults/lang/en_us.json index 72784ed..5f68e45 100644 --- a/defaults/src/main/resources/assets/citresewn-defaults/lang/en_us.json +++ b/defaults/src/main/resources/assets/citresewn-defaults/lang/en_us.json @@ -1,4 +1,7 @@ { - "config.citresewn.defaults.title": "CIT Resewn: Defaults", - "config.citresewn.defaults.tooltip": "Go to the defaults' config menu" + "config.citresewn-defaults.title": "CIT Resewn: Defaults", + "config.citresewn-defaults.tooltip": "Go to the defaults' config menu", + + "config.citresewn-defaults.type_enchantment_scroll_multiplier.title": "Type Enchantment: Scroll multiplier", + "config.citresewn-defaults.type_enchantment_scroll_multiplier.tooltip": "A general multiplier for how fast cit enchantment glints scroll" } \ No newline at end of file -- cgit