Skip to content

Commit 7d5db93

Browse files
committed
Merge branch 'dev/0.3.x' into dev/0.4.x
2 parents 5b3e4de + 04c5d03 commit 7d5db93

File tree

4 files changed

+109
-14
lines changed

4 files changed

+109
-14
lines changed
Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
name: Bug Report
2+
description: Is something now working as it should?
3+
labels: [bug]
4+
body:
5+
- type: checkboxes
6+
attributes:
7+
label: Is there an existing issue for this bug?
8+
description: Please [search here](https://github.com/Cubxity/UnifiedMetrics/issues?q=is%3Aissue) to see if someone else has already reported this.
9+
options:
10+
- label: I have searched the existing issues before opening this bug report.
11+
required: true
12+
13+
- type: textarea
14+
attributes:
15+
label: Current Behavior
16+
description: "Explain in detail what is the error or issue you are facing when using UnifiedMetrics in your server"
17+
validations:
18+
required: true
19+
20+
- type: textarea
21+
attributes:
22+
label: Expected Behavior
23+
description: "Explain how it should work or respond"
24+
validations:
25+
required: true
26+
27+
- type: dropdown
28+
attributes:
29+
label: Server type
30+
description: "What type of server software are you using?"
31+
multiple: false
32+
options:
33+
- Spigot (includes Spigot-based forks)
34+
- Fabric
35+
- Minestom
36+
- Velocity
37+
- Bungeecord / Waterfall
38+
validations:
39+
required: true
40+
41+
- type: textarea
42+
attributes:
43+
label: Server Version
44+
description: "What is the server version being used? Eg 1.18, 1.17.1"
45+
validations:
46+
required: true
47+
48+
- type: textarea
49+
attributes:
50+
label: Other Mods / Plugins in your server
51+
description: "Provide a list of other Plugins / Mods than UnifiedMetrics which was in your server when this issue happened. (If none, enter N/A)"
52+
validations:
53+
required: true
54+
55+
- type: textarea
56+
attributes:
57+
label: Error log
58+
description: "Paste the error log from your console to paste sites like https://paste.gg/ or http://hastebin.com/ (Do include complete log for better error checking and do hide sensitive informations)"
59+
validations:
60+
required: false
61+
62+
- type: textarea
63+
attributes:
64+
label: More information
65+
description: "Feel free to add in more details like screenshot, spark reports, etc"
66+
validations:
67+
required: false

.github/ISSUE_TEMPLATE/config.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
blank_issues_enabled: false
2+
contact_links:
3+
- name: Installation Help
4+
url: https://discord.gg/kDDhqJmPpA
5+
about: Please visit our Discord for help with your installation.
6+
- name: General Question
7+
url: https://discord.gg/kDDhqJmPpA
8+
about: Please visit our Discord for general questions about Unifiedmetrics.
Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
name: Enhancement
2+
description: Suggest a new feature or enhancement to the software.
3+
labels: [enhancement]
4+
body:
5+
- type: checkboxes
6+
attributes:
7+
label: Is there an existing feature request for this?
8+
description: Please [search here](https://github.com/Cubxity/UnifiedMetrics/issues?q=is%3Aissue) to see if someone else has already suggested this.
9+
options:
10+
- label: I have searched the existing issues before opening this feature request.
11+
required: true
12+
13+
- type: textarea
14+
attributes:
15+
label: Describe the feature you would like to see.
16+
description: "Explain in detail what is the feature/enhancement you would like to add and what issue it could solve."
17+
validations:
18+
required: true
19+
20+
- type: textarea
21+
attributes:
22+
label: How would you like to see this implemented?
23+
description: "Provide an explanation on how the feature should be implemented into UnifiedMetrics and how it would work with your server"
24+
validations:
25+
required: true
26+
27+
- type: textarea
28+
attributes:
29+
label: Additional information to this request.
30+
description: "You can provide more information like references and screenshots related to the feature request."
31+
validations:
32+
required: false

platforms/fabric/src/main/java/dev/cubxity/plugins/metrics/fabric/mixins/MinecraftServerMixin.java

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,9 @@
1919

2020
import dev.cubxity.plugins.metrics.fabric.events.TickEvent;
2121
import net.minecraft.server.MinecraftServer;
22-
import org.objectweb.asm.Opcodes;
2322
import org.spongepowered.asm.mixin.Mixin;
2423
import org.spongepowered.asm.mixin.injection.At;
2524
import org.spongepowered.asm.mixin.injection.Inject;
26-
import org.spongepowered.asm.mixin.injection.Slice;
2725
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
2826

2927
import static dev.cubxity.plugins.metrics.api.metric.collector.CollectorKt.NANOSECONDS_PER_MILLISECOND;
@@ -59,19 +57,9 @@ private void onTickStart(CallbackInfo ci) {
5957

6058
@Inject(
6159
method = "tick",
62-
slice = @Slice(
63-
from = @At(
64-
value = "INVOKE",
65-
target = "Lnet/minecraft/util/snooper/Snooper;update()V"
66-
),
67-
to = @At(
68-
value = "FIELD",
69-
target = "Lnet/minecraft/server/MinecraftServer;lastTickLengths:[J"
70-
)
71-
),
7260
at = @At(
73-
value = "INVOKE",
74-
target = "Lnet/minecraft/util/profiler/Profiler;pop()V"
61+
value = "CONSTANT",
62+
args = "stringValue=tallying"
7563
)
7664
)
7765
private void onTickEnd(CallbackInfo ci) {

0 commit comments

Comments
 (0)