Skip to content

Commit

Permalink
Update
Browse files Browse the repository at this point in the history
  • Loading branch information
a3510377 committed Nov 6, 2023
1 parent 6ff2a96 commit 6547fa8
Show file tree
Hide file tree
Showing 19 changed files with 87 additions and 88 deletions.
1 change: 0 additions & 1 deletion README.md

This file was deleted.

6 changes: 3 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ repositories {
// Loom adds the essential maven repositories to download Minecraft and libraries from automatically.
// See https://docs.gradle.org/current/userguide/declaring_repositories.html
// for more information about repositories.
maven {
url 'https://masa.dy.fi/maven'
}
maven {
url 'https://masa.dy.fi/maven'
}
}

dependencies {
Expand Down
6 changes: 3 additions & 3 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ loader_version=0.14.24
# https://github.com/prometheus/client_java
prometheus_version=1.0.0
# Mod Properties
mod_version=1.1.0
maven_group=monkey.info.command
archives_base_name=info-command
mod_version=1.0.0
maven_group=com.carpet_prometheus
archives_base_name=carpet_prometheus
# Dependencies
## check available versions on maven (https://masa.dy.fi/maven/carpet/fabric-carpet/) for the given minecraft version you are using
carpet_core_version=1.4.57+v220119
16 changes: 8 additions & 8 deletions settings.gradle
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
pluginManagement {
repositories {
maven {
name = 'Fabric'
url = 'https://maven.fabricmc.net/'
}
mavenCentral()
gradlePluginPortal()
}
repositories {
maven {
name = 'Fabric'
url = 'https://maven.fabricmc.net/'
}
mavenCentral()
gradlePluginPortal()
}
}
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
package monkey.info.command;
package com.carpet_prometheus;


import carpet.CarpetExtension;
import carpet.CarpetServer;
import carpet.settings.ParsedRule;
import com.carpet_prometheus.metrics.Tick;
import com.carpet_prometheus.utils.CarpetExtraTranslations;
import com.mojang.brigadier.CommandDispatcher;
import monkey.info.command.metrics.Tick;
import monkey.info.command.utils.CarpetExtraTranslations;
import net.fabricmc.api.ModInitializer;
import net.minecraft.server.MinecraftServer;
import net.minecraft.server.command.ServerCommandSource;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package monkey.info.command;
package com.carpet_prometheus;

import carpet.settings.ParsedRule;
import carpet.settings.Rule;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package monkey.info.command;
package com.carpet_prometheus;

import com.carpet_prometheus.metrics.Metric;
import com.carpet_prometheus.metrics.Mobcaps;
import com.carpet_prometheus.metrics.Player;
import com.carpet_prometheus.metrics.Tick;
import io.prometheus.metrics.exporter.httpserver.HTTPServer;
import io.prometheus.metrics.instrumentation.jvm.JvmMetrics;
import io.prometheus.metrics.model.registry.PrometheusRegistry;
import monkey.info.command.metrics.Metric;
import monkey.info.command.metrics.Mobcaps;
import monkey.info.command.metrics.Player;
import monkey.info.command.metrics.Tick;
import org.jetbrains.annotations.Nullable;

import java.util.ArrayList;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package monkey.info.command.metrics;
package com.carpet_prometheus.metrics;

import io.prometheus.metrics.core.metrics.Gauge;
import net.minecraft.server.MinecraftServer;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package monkey.info.command.metrics;
package com.carpet_prometheus.metrics;

import carpet.utils.SpawnReporter;
import it.unimi.dsi.fastutil.objects.Object2IntMap;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package monkey.info.command.metrics;
package com.carpet_prometheus.metrics;

import carpet.patches.EntityPlayerMPFake;
import net.minecraft.server.MinecraftServer;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package monkey.info.command.metrics;
package com.carpet_prometheus.metrics;

import carpet.helpers.TickSpeed;
import carpet.utils.Messenger;
Expand Down
15 changes: 15 additions & 0 deletions src/main/java/com/carpet_prometheus/mixin/ExampleMixin.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
package com.carpet_prometheus.mixin;

import net.minecraft.server.MinecraftServer;
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.callback.CallbackInfo;

@Mixin(MinecraftServer.class)
public class ExampleMixin {
@Inject(at = @At("HEAD"), method = "loadWorld")
private void init(CallbackInfo info) {
// This code is injected into the start of MinecraftServer.loadWorld()V
}
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package monkey.info.command.utils;
package com.carpet_prometheus.utils;

import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
Expand Down
9 changes: 0 additions & 9 deletions src/main/resources/assets/info-command/lang/zh_cn.json

This file was deleted.

9 changes: 0 additions & 9 deletions src/main/resources/assets/info-command/lang/zh_tw.json

This file was deleted.

11 changes: 11 additions & 0 deletions src/main/resources/carpet_prometheus.mixins.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"required": true,
"package": "com.carpet_prometheus.mixin",
"compatibilityLevel": "JAVA_17",
"mixins": [
"ExampleMixin"
],
"injectors": {
"defaultRequire": 1
}
}
64 changes: 32 additions & 32 deletions src/main/resources/fabric.mod.json
Original file line number Diff line number Diff line change
@@ -1,34 +1,34 @@
{
"schemaVersion": 1,
"id": "info-command",
"version": "${version}",
"name": "InfoCommand",
"description": "An extension for data directives related to Info",
"authors": [
"a3510377"
],
"contact": {
"homepage": "https://github.com/mc-cloud-town/info-command",
"issues": "https://github.com/mc-cloud-town/info-command/issues",
"sources": "https://github.com/mc-cloud-town/info-command"
},
"license": "CC0-1.0",
"icon": "assets/info-command/icon.png",
"environment": "*",
"entrypoints": {
"main": [
"monkey.info.command.InfoCommand"
]
},
"mixins": [
"info-command.mixins.json"
],
"depends": {
"minecraft": "~1.17.x",
"fabric": "*",
"carpet": ">=1.4.0"
},
"suggests": {
"another-mod": "*"
}
"schemaVersion": 1,
"id": "carpet_prometheus",
"version": "${version}",
"name": "carpet_prometheus",
"description": "This is an example description! Tell everyone what your mod is about!",
"authors": [
"Me!"
],
"contact": {
"homepage": "https://fabricmc.net/",
"sources": "https://github.com/FabricMC/fabric-example-mod"
},
"license": "CC0-1.0",
"icon": "assets/carpet_prometheus/icon.png",
"environment": "*",
"entrypoints": {
"main": [
"com.carpet_prometheus.InfoCommand"
]
},
"mixins": [
"carpet_prometheus.mixins.json"
],
"depends": {
"fabricloader": ">=0.14.24",
"minecraft": "~1.17.1",
"java": ">=17",
"fabric": "*"
},
"suggests": {
"another-mod": "*"
}
}
9 changes: 0 additions & 9 deletions src/main/resources/info-command.mixins.json

This file was deleted.

0 comments on commit 6547fa8

Please sign in to comment.