Skip to content

Commit f09012c

Browse files
1024-byteeeee1024-byteeeee
committed
🔥 停更1.20 - 1.20.5
1 parent 7f41561 commit f09012c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+71
-339
lines changed

‎.github/workflows/matrix_includes.json

-18
Original file line numberDiff line numberDiff line change
@@ -11,24 +11,6 @@
1111
{
1212
"subproject_dir": "1.19.4"
1313
},
14-
{
15-
"subproject_dir": "1.20"
16-
},
17-
{
18-
"subproject_dir": "1.20.1"
19-
},
20-
{
21-
"subproject_dir": "1.20.2"
22-
},
23-
{
24-
"subproject_dir": "1.20.3"
25-
},
26-
{
27-
"subproject_dir": "1.20.4"
28-
},
29-
{
30-
"subproject_dir": "1.20.5"
31-
},
3214
{
3315
"subproject_dir": "1.20.6"
3416
},

‎README.md

+17-21
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
[![License](https://img.shields.io/github/license/Minecraft-AMS/Carpet-AMS-Addition.svg?label=License&color=blue)](https://choosealicense.com/licenses/lgpl-3.0/)
44
[![Modrinth](https://img.shields.io/modrinth/dt/q4fx1eTg?label=Modrinth%20Downloads)](https://modrinth.com/mod/carpet-ams-addition)
55
[![CurseForge](https://img.shields.io/curseforge/dt/1002635?label=CurseForge%20Downloads&color=orange)](https://www.curseforge.com/minecraft/mc-mods/carpet-ams-addition)
6+
[![GitHub Downloads (all assets, all releases)](https://img.shields.io/github/downloads/Minecraft-AMS/Carpet-AMS-Addition/total?color=161616&label=Github%20downloads)](https://github.com/Minecraft-AMS/Carpet-AMS-Addition/releases)
67

78
**中文** | [**English**](README_en.md)
89

@@ -13,28 +14,23 @@ https://minecraft-ams.github.io/carpetamsaddition/
1314

1415
## 版本支持
1516

16-
| 游戏版本 | 开发状态 | 最后支持版本 |
17-
|:--------------------:| :------: | :----------------------------------------------------------: |
18-
| 1.21.4 | ✔ | --- |
19-
| 1.21.3 | ✔ | --- |
20-
| 1.21.2 | ✔ | --- |
21-
| 1.21.1 | ✔ | --- |
22-
| 1.21 | ✔ | --- |
23-
| 1.20.6 | ✔ | --- |
24-
| 1.20.5 | ✔ | --- |
25-
| 1.20.4 | ✔ | --- |
26-
| 1.20.3 | ✔ | --- |
27-
| 1.20.2 | ✔ | --- |
28-
| 1.20.1 | ✔ | --- |
29-
| 1.20 | ✔ | --- |
30-
| 1.19.4 | ✔ | --- |
31-
| 1.19.3 | ✖ | [Carpet-AMS-Addition-mc1.19.3-v1.5.3](https://github.com/Minecraft-AMS/Carpet-AMS-Addition/releases/tag/v1.11.2%26v1.5.3) |
32-
| 1.19.2 | ✖ | [Carpet-AMS-Addition-mc1.19.2-v1.5.3](https://github.com/Minecraft-AMS/Carpet-AMS-Addition/releases/tag/v1.11.2%26v1.5.3) |
17+
| 游戏版本 | 开发状态 | 最后支持版本 |
18+
| :-------------------: | :------: | :----------------------------------------------------------: |
19+
| 1.21.4 | ✔ | --- |
20+
| 1.21.3 | ✔ | --- |
21+
| 1.21.2 | ✔ | --- |
22+
| 1.21.1 | ✔ | --- |
23+
| 1.21 | ✔ | --- |
24+
| 1.20.6 | ✔ | --- |
25+
| 1.20 - 1.20.5 | ✖ | [Carpet-AMS-Addition-mc1.20-1.20.5-v2.54.0](https://github.com/Minecraft-AMS/Carpet-AMS-Addition/releases/tag/v2.54.0) |
26+
| 1.19.4 | ✔ | --- |
27+
| 1.19.3 | ✖ | [Carpet-AMS-Addition-mc1.19.3-v1.5.3](https://github.com/Minecraft-AMS/Carpet-AMS-Addition/releases/tag/v1.11.2%26v1.5.3) |
28+
| 1.19.2 | ✖ | [Carpet-AMS-Addition-mc1.19.2-v1.5.3](https://github.com/Minecraft-AMS/Carpet-AMS-Addition/releases/tag/v1.11.2%26v1.5.3) |
3329
| **<u>1.18.2(主)</u>** | ✔ | --- |
34-
| 1.17.1 | ✔ | --- |
35-
| 1.16.5 | ✔ | --- |
36-
| 1.15.2 | ❓ | [ Carpet-AMS-Addition-Legacy](https://github.com/1024-byteeeee/Carpet-AMS-Addition-Legacy) |
37-
| 1.14.4 | ❓ | [ Carpet-AMS-Addition-Legacy](https://github.com/1024-byteeeee/Carpet-AMS-Addition-Legacy) |
30+
| 1.17.1 | ✔ | --- |
31+
| 1.16.5 | ✔ | --- |
32+
| 1.15.2 | ❓ | [ Carpet-AMS-Addition-Legacy](https://github.com/1024-byteeeee/Carpet-AMS-Addition-Legacy) |
33+
| 1.14.4 | ❓ | [ Carpet-AMS-Addition-Legacy](https://github.com/1024-byteeeee/Carpet-AMS-Addition-Legacy) |
3834

3935
## 许可
4036
此项目在 [ LGPL-v3.0 ](https://choosealicense.com/licenses/lgpl-3.0/) 许可证下可用,您可以随意从中学习并将其纳入您自己的项目中。

‎README_en.md

+3-7
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
[![License](https://img.shields.io/github/license/Minecraft-AMS/Carpet-AMS-Addition.svg?label=License&color=blue)](https://choosealicense.com/licenses/lgpl-3.0/)
44
[![Modrinth](https://img.shields.io/modrinth/dt/q4fx1eTg?label=Modrinth%20Downloads)](https://modrinth.com/mod/carpet-ams-addition)
55
[![CurseForge](https://img.shields.io/curseforge/dt/1002635?label=CurseForge%20Downloads&color=orange)](https://www.curseforge.com/minecraft/mc-mods/carpet-ams-addition)
6+
[![GitHub Downloads (all assets, all releases)](https://img.shields.io/github/downloads/Minecraft-AMS/Carpet-AMS-Addition/total?color=161616&label=Github%20downloads)](https://github.com/Minecraft-AMS/Carpet-AMS-Addition/releases)
67

78
[**中文**](README.md) | [**English**]
89

@@ -14,19 +15,14 @@ https://minecraft-ams.github.io/carpetamsaddition/
1415
## Support Version
1516

1617
| Game Version | Development Status | Last Supported Version |
17-
|:-------------------------:| :----------------: | :----------------------------------------------------------: |
18+
| :-----------------------: | :----------------: | :----------------------------------------------------------: |
1819
| 1.21.4 | ✔ | --- |
1920
| 1.21.3 | ✔ | --- |
2021
| 1.21.2 | ✔ | --- |
2122
| 1.21.1 | ✔ | --- |
2223
| 1.21 | ✔ | --- |
2324
| 1.20.6 | ✔ | --- |
24-
| 1.20.5 | ✔ | --- |
25-
| 1.20.4 | ✔ | --- |
26-
| 1.20.3 | ✔ | --- |
27-
| 1.20.2 | ✔ | --- |
28-
| 1.20.1 | ✔ | --- |
29-
| 1.20 | ✔ | --- |
25+
| 1.20 - 1.20.5 | ✖ | [Carpet-AMS-Addition-mc1.20-1.20.5-v2.54.0](https://github.com/Minecraft-AMS/Carpet-AMS-Addition/releases/tag/v2.54.0) |
3026
| 1.19.4 | ✔ | --- |
3127
| 1.19.3 | ✖ | [Carpet-AMS-Addition-mc1.19.3-v1.5.3](https://github.com/Minecraft-AMS/Carpet-AMS-Addition/releases/tag/v1.11.2%26v1.5.3) |
3228
| 1.19.2 | ✖ | [Carpet-AMS-Addition-mc1.19.2-v1.5.3](https://github.com/Minecraft-AMS/Carpet-AMS-Addition/releases/tag/v1.11.2%26v1.5.3) |

‎build.gradle

+1-13
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,6 @@ preprocess {
1212
def mc117 = createNode('1.17.1', 1_17_01, 'yarn')
1313
def mc118 = createNode('1.18.2', 1_18_02, 'yarn')
1414
def mc119 = createNode('1.19.4', 1_19_04, 'yarn')
15-
def mc120 = createNode('1.20', 1_20_00, 'yarn')
16-
def mc1201 = createNode('1.20.1', 1_20_01, 'yarn')
17-
def mc1202 = createNode('1.20.2', 1_20_02, 'yarn')
18-
def mc1203 = createNode('1.20.3', 1_20_03, 'yarn')
19-
def mc1204 = createNode('1.20.4', 1_20_04, 'yarn')
20-
def mc1205 = createNode('1.20.5', 1_20_05, 'yarn')
2115
def mc1206 = createNode('1.20.6', 1_20_06, 'yarn')
2216
def mc121 = createNode('1.21', 1_21_00, 'yarn')
2317
def mc1211 = createNode('1.21.1', 1_21_01, 'yarn')
@@ -29,13 +23,7 @@ preprocess {
2923
mc117.link(mc116, file('versions/mapping-1.17-1.16.txt'))
3024
mc118.link(mc117, file('versions/mapping-1.18-1.17.txt'))
3125
mc118.link(mc119, file('versions/mapping-1.18-1.19.txt'))
32-
mc119.link(mc120, file('versions/mapping-1.19-1.20.txt'))
33-
mc120.link(mc1201, file('versions/mapping-1.20-1.20.1.txt'))
34-
mc1201.link(mc1202, file('versions/mapping-1.20.1-1.20.2.txt'))
35-
mc1202.link(mc1203, file('versions/mapping-1.20.2-1.20.3.txt'))
36-
mc1203.link(mc1204, file('versions/mapping-1.20.3-1.20.4.txt'))
37-
mc1204.link(mc1205, file('versions/mapping-1.20.4-1.20.5.txt'))
38-
mc1205.link(mc1206, file('versions/mapping-1.20.5-1.20.6.txt'))
26+
mc119.link(mc1206, file('versions/mapping-1.19-1.20.6.txt'))
3927
mc1206.link(mc121, file('versions/mapping-1.20.6-1.21.txt'))
4028
mc121.link(mc1211, file('versions/mapping-1.21-1.21.1.txt'))
4129
mc1211.link(mc1212, file('versions/mapping-1.21.1-1.21.2.txt'))

‎minecraftVersions.json

-6
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,6 @@
44
"1.17.1",
55
"1.18.2",
66
"1.19.4",
7-
"1.20",
8-
"1.20.1",
9-
"1.20.2",
10-
"1.20.3",
11-
"1.20.4",
12-
"1.20.5",
137
"1.20.6",
148
"1.21",
159
"1.21.1",

‎run/options.txt

+36-83
Original file line numberDiff line numberDiff line change
@@ -1,51 +1,60 @@
1-
version:3700
1+
version:4310
2+
ao:true
3+
biomeBlendRadius:4
4+
enableVsync:false
5+
entityDistanceScaling:1.0
6+
entityShadows:false
7+
forceUnicodeFont:false
8+
japaneseGlyphVariants:false
9+
fov:0.0
10+
fovEffectScale:1.0
11+
darknessEffectScale:1.0
12+
glintSpeed:0.5
13+
glintStrength:0.75
14+
prioritizeChunkUpdates:0
15+
fullscreen:false
16+
gamma:0.5
17+
graphicsMode:0
18+
guiScale:4
19+
maxFps:260
20+
inactivityFpsLimit:"afk"
21+
mipmapLevels:4
22+
narrator:0
23+
particles:1
24+
reducedDebugInfo:false
25+
renderClouds:"false"
26+
renderDistance:12
27+
simulationDistance:12
28+
screenEffectScale:0.0
29+
soundDevice:"OpenAL"
230
autoJump:false
31+
rotateWithMinecart:false
332
operatorItemsTab:false
433
autoSuggestions:true
534
chatColors:true
635
chatLinks:true
736
chatLinksPrompt:true
8-
enableVsync:false
9-
entityShadows:false
10-
forceUnicodeFont:false
1137
discrete_mouse_scroll:false
1238
invertYMouse:false
1339
realmsNotifications:false
14-
reducedDebugInfo:false
1540
showSubtitles:false
1641
directionalAudio:false
1742
touchscreen:false
18-
fullscreen:false
1943
bobView:false
2044
toggleCrouch:false
2145
toggleSprint:false
2246
darkMojangStudiosBackground:true
2347
hideLightningFlashes:false
2448
hideSplashTexts:false
2549
mouseSensitivity:0.3767605633802817
26-
fov:0.0
27-
screenEffectScale:0.0
28-
fovEffectScale:1.0
29-
darknessEffectScale:1.0
30-
glintSpeed:0.5
31-
glintStrength:0.75
3250
damageTiltStrength:1.0
3351
highContrast:false
52+
highContrastBlockOutline:false
3453
narratorHotkey:true
35-
gamma:0.5
36-
renderDistance:12
37-
simulationDistance:12
38-
entityDistanceScaling:1.0
39-
guiScale:4
40-
particles:1
41-
maxFps:260
42-
graphicsMode:0
43-
ao:true
44-
prioritizeChunkUpdates:0
45-
biomeBlendRadius:4
46-
renderClouds:"false"
54+
resourcePacks:[]
55+
incompatibleResourcePacks:[]
56+
lastServer:
4757
lang:zh_cn
48-
soundDevice:"OpenAL"
4958
chatVisibility:0
5059
chatOpacity:1.0
5160
chatLineSpacing:0.01936619718309859
@@ -62,27 +71,25 @@ chatHeightUnfocused:0.44366195797920227
6271
chatScale:0.5264084507042254
6372
chatWidth:1.0
6473
notificationDisplayTime:1.0
65-
mipmapLevels:4
6674
useNativeTransport:true
6775
mainHand:"right"
6876
attackIndicator:1
69-
narrator:0
7077
tutorialStep:none
7178
mouseWheelSensitivity:1.0
7279
rawMouseInput:true
7380
glDebugVerbosity:1
7481
skipMultiplayerWarning:true
75-
skipRealms32bitWarning:false
7682
hideMatchedNames:true
7783
joinedFirstServer:true
78-
hideBundleTutorial:true
7984
syncChunkWrites:true
8085
showAutosaveIndicator:true
8186
allowServerListing:true
8287
onlyShowSecureChat:false
8388
panoramaScrollSpeed:1.0
8489
telemetryOptInExtra:false
8590
onboardAccessibility:false
91+
menuBackgroundBlurriness:5
92+
startedCleanly:true
8693
key_key.attack:key.mouse.left
8794
key_key.use:key.mouse.right
8895
key_key.forward:key.keyboard.w
@@ -117,60 +124,6 @@ key_key.hotbar.6:key.keyboard.6
117124
key_key.hotbar.7:key.keyboard.7
118125
key_key.hotbar.8:key.keyboard.8
119126
key_key.hotbar.9:key.keyboard.9
120-
key_keybind.custom_crosshair_mod.open_edit_crosshair_gui:key.keyboard.grave.accent
121-
key_key.fabrishot.screenshot:key.keyboard.f9
122-
key_key.worldeditcui.toggle:key.keyboard.unknown
123-
key_key.worldeditcui.clear:key.keyboard.o
124-
key_key.worldeditcui.chunk:key.keyboard.unknown
125-
key_key.antighost.reveal:key.keyboard.g
126-
key_bedrodium.toggle:key.keyboard.r
127-
key_key.entityculling.toggle:key.keyboard.unknown
128-
key_key.fpsdisplay.toggleOverlay:key.keyboard.unknown
129-
key_key.inventoryhud.toggle:key.keyboard.i
130-
key_key.inventoryhud.openconfig:key.keyboard.unknown
131-
key_key.inventoryhud.togglepot:key.keyboard.unknown
132-
key_key.inventoryhud.togglearm:key.keyboard.unknown
133-
key_key.inventoryhud.toggleall:key.keyboard.unknown
134-
key_key.memoryusagescreen.show:key.keyboard.unknown
135-
key_key.modmenu.open_menu:key.keyboard.unknown
136-
key_gui.xaero_pac_key_open_menu:key.keyboard.apostrophe
137-
key_key.trade_cycling.cycle_trades:key.keyboard.c
138-
key_key.waila.config:key.keyboard.keypad.0
139-
key_key.waila.show_overlay:key.keyboard.keypad.1
140-
key_key.waila.toggle_liquid:key.keyboard.keypad.2
141-
key_key.waila.show_recipe_input:key.keyboard.keypad.3
142-
key_key.waila.show_recipe_output:key.keyboard.keypad.4
143-
key_gui.xaero_switch_waypoint_set:key.keyboard.unknown
144-
key_gui.xaero_instant_waypoint:key.keyboard.keypad.add
145-
key_gui.xaero_toggle_slime:key.keyboard.unknown
146-
key_gui.xaero_toggle_grid:key.keyboard.unknown
147-
key_gui.xaero_toggle_waypoints:key.keyboard.unknown
148-
key_gui.xaero_toggle_map_waypoints:key.keyboard.unknown
149-
key_gui.xaero_toggle_map:key.keyboard.unknown
150-
key_gui.xaero_enlarge_map:key.keyboard.z
151-
key_gui.xaero_waypoints_key:key.keyboard.u
152-
key_gui.xaero_zoom_in:key.keyboard.unknown
153-
key_gui.xaero_zoom_out:key.keyboard.unknown
154-
key_gui.xaero_new_waypoint:key.keyboard.unknown
155-
key_gui.xaero_display_all_sets:key.keyboard.unknown
156-
key_gui.xaero_toggle_light_overlay:key.keyboard.unknown
157-
key_gui.xaero_toggle_entity_radar:key.keyboard.unknown
158-
key_gui.xaero_reverse_entity_radar:key.keyboard.unknown
159-
key_gui.xaero_toggle_manual_cave_mode:key.keyboard.unknown
160-
key_gui.xaero_alternative_list_players:key.keyboard.unknown
161-
key_gui.xaero_toggle_tracked_players:key.keyboard.unknown
162-
key_gui.xaero_toggle_pac_chunk_claims:key.keyboard.unknown
163-
key_gui.xaero_minimap_settings:key.keyboard.y
164-
key_gui.xaero_open_map:key.keyboard.v
165-
key_gui.xaero_open_settings:key.keyboard.right.bracket
166-
key_gui.xaero_map_zoom_in:key.keyboard.unknown
167-
key_gui.xaero_map_zoom_out:key.keyboard.unknown
168-
key_gui.xaero_quick_confirm:key.keyboard.right.shift
169-
key_gui.xaero_toggle_dimension:key.keyboard.unknown
170-
key_iris.keybind.reload:key.keyboard.unknown
171-
key_iris.keybind.toggleShaders:key.keyboard.k
172-
key_iris.keybind.shaderPackSelection:key.keyboard.unknown
173-
key_pistorder.clear_display:key.keyboard.page.up
174127
soundCategory_master:0.028145695
175128
soundCategory_music:0.0
176129
soundCategory_record:0.02640845

‎src/main/java/club/mcams/carpet/AmsServer.java

+5-8
Original file line numberDiff line numberDiff line change
@@ -139,20 +139,15 @@ public void registerCustomRecipes(
139139

140140
@Override
141141
public void onPlayerLoggedIn(ServerPlayerEntity player) {
142-
//#if MC==12005
143-
//$$ ServerNetworkHandler.onHello(player, "carpet ams addition");
144-
//#endif
145142
if (AmsServerSettings.welcomeMessage) {
146143
CustomWelcomeMessageConfig.handleMessage(player, AmsServer.minecraftServer);
147144
}
148-
149145
if (
150-
player.getActiveStatusEffects().equals(LeaderCommandRegistry.HIGH_LIGHT.getEffectType()) &&
146+
player.getActiveStatusEffects().containsValue(LeaderCommandRegistry.HIGH_LIGHT) &&
151147
!LeaderCommandRegistry.LEADER_LIST.containsValue(player.getUuidAsString())
152148
) {
153149
player.removeStatusEffect(LeaderCommandRegistry.HIGH_LIGHT.getEffectType());
154150
}
155-
156151
if (LeaderCommandRegistry.LEADER_LIST.containsValue(player.getUuidAsString())) {
157152
player.addStatusEffect(
158153
LeaderCommandRegistry.HIGH_LIGHT
@@ -162,7 +157,9 @@ public void onPlayerLoggedIn(ServerPlayerEntity player) {
162157
);
163158
}
164159
RecipeRuleHelper.onPlayerLoggedIn(AmsServer.minecraftServer, player);
165-
CustomBlockHardnessS2CPacket.sendToPlayer(player);
160+
if (!Objects.equals(AmsServerSettings.commandCustomBlockHardness, "false")) {
161+
CustomBlockHardnessS2CPacket.sendToPlayer(player);
162+
}
166163
}
167164

168165
@Override
@@ -186,7 +183,7 @@ public void onServerLoadedWorlds(MinecraftServer server) {
186183
AutoCleaner.removeAmsDataFolder(server);
187184
}
188185

189-
public void afterServerLoadWorld(MinecraftServer server) {
186+
public void afterServerLoadWorlds(MinecraftServer server) {
190187
RecipeRuleHelper.needReloadServerResources(server);
191188
}
192189

‎versions/1.20.1/carpetamsaddition.accesswidener

-1
This file was deleted.

‎versions/1.20.1/gradle.properties

-25
This file was deleted.

‎versions/1.20.2/carpetamsaddition.accesswidener

-1
This file was deleted.

0 commit comments

Comments
 (0)