Merge branch 'master' into light
# Conflicts: # src/main/resources/carpet.accesswidener # src/main/resources/fabric.mod.json
This commit is contained in:
gnembon committed
commit
7067e59a21
66 files changed
+1898
-495
No files matched your search
@@ -47,7 +47,8 @@
|
||||
"ui.tags": "Tags",
|
||||
"ui.change_permanently": "Change permanently",
|
||||
"ui.click_to_keep_the_settings_in_%(conf)s_to_save_across_restarts": "click to keep the settings in %s to save across restarts",
|
||||
"ui.rule_%(rule)s_will_now_default_to_%(value)s": "rule %s will now default to %s",
|
||||
"ui.rule_%(rule)s_will_now_default_to_%(value)s": "Rule %s will now default to %s",
|
||||
"ui.rule_%(rule)s_not_set_restart": "Rule %s will now not be set on restart",
|
||||
"ui.current_value": "current value"
|
||||
|
||||
}
|
||||
@@ -1,8 +1,8 @@
|
||||
{
|
||||
"rule.antiCheatDisabled.name": "移动检测通杀",
|
||||
"rule.antiCheatDisabled.name": "禁用反作弊移动监测",
|
||||
"rule.antiCheatDisabled.desc": "防止玩家因为“本服务器未启用飞行”，“移动过快”等原因被踢出",
|
||||
|
||||
"rule.carpets.name": "放置地毯执行功能",
|
||||
"rule.carpets.name": "多功能地毯",
|
||||
"rule.carpets.desc": "通过放置地毯方块快捷执行部分功能",
|
||||
|
||||
"rule.combineXPOrbs.name": "经验球合并",
|
||||
@@ -135,7 +135,7 @@
|
||||
"rule.pushLimit.desc": "自定义活塞推动上限",
|
||||
"rule.pushLimit.extra.0": "你必须在1-1024中选取一个值",
|
||||
|
||||
"rule.quasiConnectivity.name": "qC激活开关",
|
||||
"rule.quasiConnectivity.name": "半连接激活开关",
|
||||
"rule.quasiConnectivity.desc": "活塞，发射器和投掷器在他们上方方块激活时是否响应",
|
||||
"rule.quasiConnectivity.extra.0": "设置为true为开启 设置为false为禁用",
|
||||
|
||||
@@ -228,7 +228,8 @@
|
||||
"ui.tags": "分类",
|
||||
"ui.change_permanently": "永久更改",
|
||||
"ui.click_to_keep_the_settings_in_%(conf)s_to_save_across_restarts": "点击此按钮以使此选项保存于%s，重启后依旧生效",
|
||||
"ui.rule_%(rule)s_will_now_default_to_%(value)s": "规则%s将会被默认设置为%s",
|
||||
"ui.rule_%(rule)s_will_now_default_to_%(value)s": "规则“%s”将会被默认设置为%s",
|
||||
"ui.rule_%(rule)s_not_set_restart": "规则“%s”将在重启后恢复默认值",
|
||||
"ui.current_value": "当前的值"
|
||||
|
||||
}
|
||||
@@ -331,7 +331,7 @@ select(num) ->
|
||||
);
|
||||
global_selected_point = if (global_selected_point == selected_point, null, selected_point);
|
||||
global_needs_updating = true;
|
||||
// no need to _update since path is still valid
|
||||
|
||||
);
|
||||
|
||||
// player can also punch the mannequin to select/deselect it
|
||||
@@ -501,7 +501,7 @@ play() ->
|
||||
task( _() -> (
|
||||
if (global_playing_path, // we don't want to join_task not to lock it just in case. No need to panic here
|
||||
global_playing_path = false; // cancel current path rendering
|
||||
sleep(1500); // in case we interrupt previous playbacks
|
||||
sleep(1500);
|
||||
);
|
||||
showing_path = global_showing_path;
|
||||
hide();
|
||||
|
||||
@@ -244,3 +244,23 @@ __on_player_disconnects(player, reason) ->
|
||||
print('__on_player_disconnects(player)');
|
||||
print('Player '+player+' disconnects because: '+reason)
|
||||
);
|
||||
|
||||
__on_player_chooses_recipe(player, recipe, full_stack) ->
|
||||
(
|
||||
print('');
|
||||
print('__on_player_chooses_recipe(player, recipe, full_stack)');
|
||||
print('player chooses recipe:');
|
||||
print(' - player: '+player);
|
||||
print(' - recipe: '+recipe);
|
||||
print(' - full stack: '+ full_stack);
|
||||
);
|
||||
|
||||
__on_player_switches_slot(player, from, to) ->
|
||||
(
|
||||
print('');
|
||||
print('__on_player_switches_slot(player, from, to)');
|
||||
print('player switches inventory slot:');
|
||||
print(' - player: '+player);
|
||||
print(' - from: '+ from);
|
||||
print(' - to: '+ to);
|
||||
);
|
||||
@@ -94,7 +94,7 @@ __structure_renderer(player_name) ->
|
||||
l(from, to) = structure_data;
|
||||
total_size = _euclidean(from, to);
|
||||
density = max(10, total_size/10);
|
||||
draw_shape('box', 15, 'from', from, 'to', to+1, 'color', 0x00FFFFFF, 'line', 3, 'fill', 0x00FFFF22);
|
||||
draw_shape('box', 15, 'from', from, 'to', to+1, 'color', 0x00FFFFFF, 'line', 3, 'fill', 0x00FFFF12);
|
||||
structure_pieces = slice(sort_key(structure_pieces, _euclidean_sq((_:2+_:3)/2,ppos)), 0, config:'max_pieces');
|
||||
for (structure_pieces, l(piece, direction, from, to) = _;
|
||||
r = 255 - floor(128 * _i/config:'max_pieces');
|
||||
|
||||
@@ -2,3 +2,4 @@ accessWidener v1 named
|
||||
|
||||
accessible class net/minecraft/server/world/ThreadedAnvilChunkStorage$TicketManager
|
||||
accessible class net/minecraft/server/world/ServerLightingProvider$Stage
|
||||
accessible class net/minecraft/recipe/Ingredient$Entry
|
||||
@@ -169,6 +169,9 @@
|
||||
"ServerWorld_scarpetEventMixin",
|
||||
"HungerManagerMixin_scarpetEventsMixin",
|
||||
|
||||
"RecipeManager_scarpetMixin",
|
||||
"Ingredient_scarpetMixin",
|
||||
|
||||
"PistonBlock_movableTEMixin",
|
||||
"PistonBlockEntity_movableTEMixin",
|
||||
"World_movableTEMixin",
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"schemaVersion": 1,
|
||||
"id": "carpet",
|
||||
"version": "1.3.29",
|
||||
"version": "1.4.0",
|
||||
|
||||
"name": "Carpet Mod in Fabric",
|
||||
"description": "Carpet made out of fabric",
|
||||
@@ -13,7 +13,7 @@
|
||||
"sources": "https://github.com/gnembon/fabric-carpet"
|
||||
},
|
||||
|
||||
"license": "GNU LGPL V3",
|
||||
"license": "MIT",
|
||||
"icon": "assets/carpet/icon.png",
|
||||
|
||||
"environment": "*",
|
||||
@@ -24,7 +24,8 @@
|
||||
"mixins": [
|
||||
"carpet.mixins.json"
|
||||
],
|
||||
"accesswidener": "carpet.accesswidener",
|
||||
"accessWidener" : "carpet.accesswidener",
|
||||
|
||||
"depends": {
|
||||
"minecraft": "1.15.x",
|
||||
"fabricloader": ">=0.7.1"
|
||||
|
||||
Reference in new issue
Block a user