djib/Controlify
1
0
Fork 0
forked from Clones/Controlify
Code Pull Requests Activity

✏️ Removed extra resource-pack.

Browse Source
This commit is contained in:
isXander
2023-05-17 17:29:28 +01:00
parent a0813d4d5f
commit 740252b490
8 changed files with 28 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
changelogs/1.3.0-beta.1+1.20.md
View File

@ -7,10 +7,15 @@ Updated for Minecraft 1.20
- Added a config setting `delegate_setup` so modpack authors can move the controller setup to when users
enter the config screen.
## Changes
- Removed extra mappings resource pack (merged into base resources)
## Beta 1
- Added a config setting `delegate_setup` so modpack authors can move the controller setup to when users
enter the config screen.
- Removed the immediately-fast compatibility temporarily.
- Removed extra mappings resource pack (merged into base resources)

7
src/main/java/dev/isxander/controlify/Controlify.java
View File

@ -191,13 +191,6 @@ public class Controlify implements ControlifyApi {
LOGGER.info("Pre-initializing Controlify...");
ResourceManagerHelper.registerBuiltinResourcePack(
Controlify.id("extra_mappings"),
FabricLoader.getInstance().getModContainer("controlify").orElseThrow(),
Component.translatable("controlify.resource_pack.extra_mappings"),
ResourcePackActivationType.DEFAULT_ENABLED
);
ControlifySounds.init();
this.inGameInputHandler = null;

24
src/main/resources/assets/controlify/lang/en_us.json
View File

@ -269,5 +269,27 @@
"controlify.joystick_mapping.unmapped.axis_direction.negative": "(Negative)",
"controlify.joystick_mapping.unmapped.axis_direction.positive": "(Positive)",
"controlify.resource_pack.extra_mappings": "Extra Mappings"
"controlify.joystick_mapping.tm_t16000.axis.roll": "Roll",
"controlify.joystick_mapping.tm_t16000.axis.pitch": "Pitch",
"controlify.joystick_mapping.tm_t16000.axis.yaw": "Yaw",
"controlify.joystick_mapping.tm_t16000.axis.throttle": "Throttle",
"controlify.joystick_mapping.tm_t16000.button.trigger": "Trigger",
"controlify.joystick_mapping.tm_t16000.button.a": "A",
"controlify.joystick_mapping.tm_t16000.button.x": "X",
"controlify.joystick_mapping.tm_t16000.button.b": "B",
"controlify.joystick_mapping.tm_t16000.left_1": "Left 1",
"controlify.joystick_mapping.tm_t16000.left_2": "Left 2",
"controlify.joystick_mapping.tm_t16000.left_3": "Left 3",
"controlify.joystick_mapping.tm_t16000.left_4": "Left 4",
"controlify.joystick_mapping.tm_t16000.left_5": "Left 5",
"controlify.joystick_mapping.tm_t16000.left_6": "Left 6",
"controlify.joystick_mapping.tm_t16000.right_1": "Right 1",
"controlify.joystick_mapping.tm_t16000.right_2": "Right 2",
"controlify.joystick_mapping.tm_t16000.right_3": "Right 3",
"controlify.joystick_mapping.tm_t16000.right_4": "Right 4",
"controlify.joystick_mapping.tm_t16000.right_5": "Right 5",
"controlify.joystick_mapping.tm_t16000.right_6": "Right 6",
"controlify.joystick_mapping.tm_t16000.hat": "Hat"
}

11
src/main/resources/resourcepacks/extra_mappings/assets/controlify/controllers/controller_identification.json5
View File

@ -1,11 +0,0 @@
[
{
"name": "Thrustmaster T16000M",
"theme": "thrustmaster",
"mapping": "tm_t16000m",
"hids": [
[0x044f, 0xb10a]
]
}
]

23
src/main/resources/resourcepacks/extra_mappings/assets/controlify/lang/en_us.json
View File

@ -1,23 +0,0 @@
{
"controlify.joystick_mapping.tm_t16000.axis.roll": "Roll",
"controlify.joystick_mapping.tm_t16000.axis.pitch": "Pitch",
"controlify.joystick_mapping.tm_t16000.axis.yaw": "Yaw",
"controlify.joystick_mapping.tm_t16000.axis.throttle": "Throttle",
"controlify.joystick_mapping.tm_t16000.button.trigger": "Trigger",
"controlify.joystick_mapping.tm_t16000.button.a": "A",
"controlify.joystick_mapping.tm_t16000.button.x": "X",
"controlify.joystick_mapping.tm_t16000.button.b": "B",
"controlify.joystick_mapping.tm_t16000.left_1": "Left 1",
"controlify.joystick_mapping.tm_t16000.left_2": "Left 2",
"controlify.joystick_mapping.tm_t16000.left_3": "Left 3",
"controlify.joystick_mapping.tm_t16000.left_4": "Left 4",
"controlify.joystick_mapping.tm_t16000.left_5": "Left 5",
"controlify.joystick_mapping.tm_t16000.left_6": "Left 6",
"controlify.joystick_mapping.tm_t16000.right_1": "Right 1",
"controlify.joystick_mapping.tm_t16000.right_2": "Right 2",
"controlify.joystick_mapping.tm_t16000.right_3": "Right 3",
"controlify.joystick_mapping.tm_t16000.right_4": "Right 4",
"controlify.joystick_mapping.tm_t16000.right_5": "Right 5",
"controlify.joystick_mapping.tm_t16000.right_6": "Right 6",
"controlify.joystick_mapping.tm_t16000.hat": "Hat"
}

113
src/main/resources/resourcepacks/extra_mappings/assets/controlify/mappings/tm_t16000.json
View File

@ -1,113 +0,0 @@
{
"axes": [
{
"ids": [0],
"identifier": "roll",
"deadzone": true,
"rest": 0.0,
"axis_names": [
["right", "left"]
]
},
{
"ids": [1],
"identifier": "pitch",
"deadzone": true,
"rest": 0.0,
"axis_names": [
["down", "up"]
]
},
{
"ids": [2],
"identifier": "yaw",
"deadzone": true,
"rest": 0.0,
"axis_names": [
["right", "left"]
]
},
{
"ids": [3],
"identifier": "throttle",
"rest": 0.0,
"deadzone": false,
"range": [0.0, 1.0],
"axis_names": [
["down", "up"]
]
}
],
"buttons": [
{
"button": 0,
"name": "trigger"
},
{
"button": 1,
"name": "a"
},
{
"button": 2,
"name": "x"
},
{
"button": 3,
"name": "b"
},
{
"button": 4,
"name": "left_1"
},
{
"button": 5,
"name": "left_2"
},
{
"button": 6,
"name": "left_3"
},
{
"button": 7,
"name": "left_4"
},
{
"button": 8,
"name": "left_5"
},
{
"button": 9,
"name": "left_6"
},
{
"button": 10,
"name": "right_1"
},
{
"button": 11,
"name": "right_2"
},
{
"button": 12,
"name": "right_3"
},
{
"button": 13,
"name": "right_4"
},
{
"button": 14,
"name": "right_5"
},
{
"button": 15,
"name": "right_6"
}
],
"hats": [
{
"name": "hat",
"hat": 0
}
]
}

6
src/main/resources/resourcepacks/extra_mappings/pack.mcmeta
View File

@ -1,6 +0,0 @@
{
"pack": {
"pack_format": 13,
"description": "Adds extra Controlify joystick mappings. §bMust restart."
}
}

BIN
src/main/resources/resourcepacks/extra_mappings/pack.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 32 KiB