Merge branch 'dev/0.3.x' into dev/0.4.x

.github/ISSUE_TEMPLATE/bug-report.yml

@@ -0,0 +1,67 @@
+name: Bug Report
+description: Is something now working as it should?
+labels: [bug]
+body:
+- type: checkboxes
+ attributes:
+ label: Is there an existing issue for this bug?
+ description: Please [search here](https://github.com/Cubxity/UnifiedMetrics/issues?q=is%3Aissue) to see if someone else has already reported this.
+ options:
+ - label: I have searched the existing issues before opening this bug report.
+ required: true
+
+- type: textarea
+ attributes:
+ label: Current Behavior 
+ description: "Explain in detail what is the error or issue you are facing when using UnifiedMetrics in your server"
+ validations:
+ required: true
+
+- type: textarea
+ attributes:
+ label: Expected Behavior 
+ description: "Explain how it should work or respond"
+ validations:
+ required: true
+
+- type: dropdown
+ attributes:
+ label: Server type
+ description: "What type of server software are you using?"
+ multiple: false
+ options:
+ - Spigot (includes Spigot-based forks)
+ - Fabric
+ - Minestom
+ - Velocity
+ - Bungeecord / Waterfall
+ validations:
+ required: true
+
+- type: textarea
+ attributes:
+ label: Server Version
+ description: "What is the server version being used? Eg 1.18, 1.17.1"
+ validations:
+ required: true
+
+- type: textarea
+ attributes:
+ label: Other Mods / Plugins in your server
+ description: "Provide a list of other Plugins / Mods than UnifiedMetrics which was in your server when this issue happened. (If none, enter N/A)"
+ validations:
+ required: true
+
+- type: textarea
+ attributes:
+ label: Error log
+ 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)"
+ validations:
+ required: false
+
+- type: textarea
+ attributes:
+ label: More information
+ description: "Feel free to add in more details like screenshot, spark reports, etc"
+ validations:
+ required: false

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,8 @@
+blank_issues_enabled: false
+contact_links:
+ - name: Installation Help
+ url: https://discord.gg/kDDhqJmPpA
+ about: Please visit our Discord for help with your installation.
+ - name: General Question
+ url: https://discord.gg/kDDhqJmPpA
+ about: Please visit our Discord for general questions about Unifiedmetrics.

.github/ISSUE_TEMPLATE/enhancement.yml

@@ -0,0 +1,32 @@
+name: Enhancement
+description: Suggest a new feature or enhancement to the software.
+labels: [enhancement]
+body:
+- type: checkboxes
+ attributes:
+ label: Is there an existing feature request for this?
+ description: Please [search here](https://github.com/Cubxity/UnifiedMetrics/issues?q=is%3Aissue) to see if someone else has already suggested this.
+ options:
+ - label: I have searched the existing issues before opening this feature request.
+ required: true
+
+- type: textarea
+ attributes:
+ label: Describe the feature you would like to see.
+ description: "Explain in detail what is the feature/enhancement you would like to add and what issue it could solve."
+ validations:
+ required: true
+
+- type: textarea
+ attributes:
+ label: How would you like to see this implemented?
+ description: "Provide an explanation on how the feature should be implemented into UnifiedMetrics and how it would work with your server"
+ validations:
+ required: true
+
+- type: textarea
+ attributes:
+ label: Additional information to this request.
+ description: "You can provide more information like references and screenshots related to the feature request."
+ validations:
+ required: false

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

@@ -19,11 +19,9 @@
 
 import dev.cubxity.plugins.metrics.fabric.events.TickEvent;
 import net.minecraft.server.MinecraftServer;
-import org.objectweb.asm.Opcodes;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.Slice;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 import static dev.cubxity.plugins.metrics.api.metric.collector.CollectorKt.NANOSECONDS_PER_MILLISECOND;
@@ -59,19 +57,9 @@ private void onTickStart(CallbackInfo ci) {
 
  @Inject(
  method = "tick",
- slice = @Slice(
- from = @At(
- value = "INVOKE",
- target = "Lnet/minecraft/util/snooper/Snooper;update()V"
- ),
- to = @At(
- value = "FIELD",
- target = "Lnet/minecraft/server/MinecraftServer;lastTickLengths:[J"
- )
- ),
  at = @At(
- value = "INVOKE",
- target = "Lnet/minecraft/util/profiler/Profiler;pop()V"
+ value = "CONSTANT",
+ args = "stringValue=tallying"
  )
  )
  private void onTickEnd(CallbackInfo ci) {