Clean up dependencies, Fix basic functionality

This commit is contained in:
MrLetsplay 2023-08-30 18:04:51 +02:00
parent a2357a4462
commit a94dedf0db
Signed by: mr
SSH Key Fingerprint: SHA256:92jBH80vpXyaZHjaIl47pjRq+Yt7XGTArqQg1V7hSqg
8 changed files with 77 additions and 146 deletions

134
LICENSE
View File

@ -1,121 +1,21 @@
Creative Commons Legal Code
MIT License
CC0 1.0 Universal
Copyright (c) 2023 Julian Köglmeier/MrLetsplay2003
CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE
LEGAL SERVICES. DISTRIBUTION OF THIS DOCUMENT DOES NOT CREATE AN
ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS
INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES
REGARDING THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS
PROVIDED HEREUNDER, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM
THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED
HEREUNDER.
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
Statement of Purpose
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
The laws of most jurisdictions throughout the world automatically confer
exclusive Copyright and Related Rights (defined below) upon the creator
and subsequent owner(s) (each and all, an "owner") of an original work of
authorship and/or a database (each, a "Work").
Certain owners wish to permanently relinquish those rights to a Work for
the purpose of contributing to a commons of creative, cultural and
scientific works ("Commons") that the public can reliably and without fear
of later claims of infringement build upon, modify, incorporate in other
works, reuse and redistribute as freely as possible in any form whatsoever
and for any purposes, including without limitation commercial purposes.
These owners may contribute to the Commons to promote the ideal of a free
culture and the further production of creative, cultural and scientific
works, or to gain reputation or greater distribution for their Work in
part through the use and efforts of others.
For these and/or other purposes and motivations, and without any
expectation of additional consideration or compensation, the person
associating CC0 with a Work (the "Affirmer"), to the extent that he or she
is an owner of Copyright and Related Rights in the Work, voluntarily
elects to apply CC0 to the Work and publicly distribute the Work under its
terms, with knowledge of his or her Copyright and Related Rights in the
Work and the meaning and intended legal effect of CC0 on those rights.
1. Copyright and Related Rights. A Work made available under CC0 may be
protected by copyright and related or neighboring rights ("Copyright and
Related Rights"). Copyright and Related Rights include, but are not
limited to, the following:
i. the right to reproduce, adapt, distribute, perform, display,
communicate, and translate a Work;
ii. moral rights retained by the original author(s) and/or performer(s);
iii. publicity and privacy rights pertaining to a person's image or
likeness depicted in a Work;
iv. rights protecting against unfair competition in regards to a Work,
subject to the limitations in paragraph 4(a), below;
v. rights protecting the extraction, dissemination, use and reuse of data
in a Work;
vi. database rights (such as those arising under Directive 96/9/EC of the
European Parliament and of the Council of 11 March 1996 on the legal
protection of databases, and under any national implementation
thereof, including any amended or successor version of such
directive); and
vii. other similar, equivalent or corresponding rights throughout the
world based on applicable law or treaty, and any national
implementations thereof.
2. Waiver. To the greatest extent permitted by, but not in contravention
of, applicable law, Affirmer hereby overtly, fully, permanently,
irrevocably and unconditionally waives, abandons, and surrenders all of
Affirmer's Copyright and Related Rights and associated claims and causes
of action, whether now known or unknown (including existing as well as
future claims and causes of action), in the Work (i) in all territories
worldwide, (ii) for the maximum duration provided by applicable law or
treaty (including future time extensions), (iii) in any current or future
medium and for any number of copies, and (iv) for any purpose whatsoever,
including without limitation commercial, advertising or promotional
purposes (the "Waiver"). Affirmer makes the Waiver for the benefit of each
member of the public at large and to the detriment of Affirmer's heirs and
successors, fully intending that such Waiver shall not be subject to
revocation, rescission, cancellation, termination, or any other legal or
equitable action to disrupt the quiet enjoyment of the Work by the public
as contemplated by Affirmer's express Statement of Purpose.
3. Public License Fallback. Should any part of the Waiver for any reason
be judged legally invalid or ineffective under applicable law, then the
Waiver shall be preserved to the maximum extent permitted taking into
account Affirmer's express Statement of Purpose. In addition, to the
extent the Waiver is so judged Affirmer hereby grants to each affected
person a royalty-free, non transferable, non sublicensable, non exclusive,
irrevocable and unconditional license to exercise Affirmer's Copyright and
Related Rights in the Work (i) in all territories worldwide, (ii) for the
maximum duration provided by applicable law or treaty (including future
time extensions), (iii) in any current or future medium and for any number
of copies, and (iv) for any purpose whatsoever, including without
limitation commercial, advertising or promotional purposes (the
"License"). The License shall be deemed effective as of the date CC0 was
applied by Affirmer to the Work. Should any part of the License for any
reason be judged legally invalid or ineffective under applicable law, such
partial invalidity or ineffectiveness shall not invalidate the remainder
of the License, and in such case Affirmer hereby affirms that he or she
will not (i) exercise any of his or her remaining Copyright and Related
Rights in the Work or (ii) assert any associated claims and causes of
action with respect to the Work, in either case contrary to Affirmer's
express Statement of Purpose.
4. Limitations and Disclaimers.
a. No trademark or patent rights held by Affirmer are waived, abandoned,
surrendered, licensed or otherwise affected by this document.
b. Affirmer offers the Work as-is and makes no representations or
warranties of any kind concerning the Work, express, implied,
statutory or otherwise, including without limitation warranties of
title, merchantability, fitness for a particular purpose, non
infringement, or the absence of latent or other defects, accuracy, or
the present or absence of errors, whether or not discoverable, all to
the greatest extent permissible under applicable law.
c. Affirmer disclaims responsibility for clearing rights of other persons
that may apply to the Work or any use thereof, including without
limitation any person's Copyright and Related Rights in the Work.
Further, Affirmer disclaims responsibility for obtaining any necessary
consents, permissions or other rights required for any use of the
Work.
d. Affirmer understands and acknowledges that Creative Commons is not a
party to this document and has no duty or obligation with respect to
this CC0 or use of the Work.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.

View File

@ -39,9 +39,9 @@ dependencies {
// These are included in the Fabric API production distribution and allow you to update your mod to the latest modules at a later more convenient time.
// modImplementation "net.fabricmc.fabric-api:fabric-api-deprecated:${project.fabric_version}"
include modImplementation("me.mrletsplay:MrCore-Fabric:1.0.1")
implementation "me.mrletsplay:MrCore:4.3-SNAPSHOT"
include "me.mrletsplay:MrCore:4.3-SNAPSHOT"
modImplementation "me.mrletsplay:MrCore-Fabric:1.1.0"
implementation "me.mrletsplay:MrCore:4.3"
implementation "us.dynmap:DynmapCoreAPI:3.6"
}

View File

@ -5,6 +5,8 @@ import java.util.List;
import java.util.Map;
import java.util.UUID;
import org.dynmap.DynmapCommonAPI;
import org.dynmap.DynmapCommonAPIListener;
import org.dynmap.markers.MarkerAPI;
import org.dynmap.markers.MarkerSet;
import org.slf4j.Logger;
@ -15,6 +17,8 @@ import me.mrletsplay.dynmapareas.command.area.AreaCommand;
import me.mrletsplay.dynmapareas.command.marker.MarkerCommand;
import net.fabricmc.api.ModInitializer;
import net.fabricmc.fabric.api.command.v2.CommandRegistrationCallback;
import net.minecraft.registry.RegistryKey;
import net.minecraft.world.World;
public class DynmapAreasMod implements ModInitializer {
@ -28,10 +32,37 @@ public class DynmapAreasMod implements ModInitializer {
public void onInitialize() {
LOGGER.info("HELLO");
DynmapCommonAPIListener.register(new DynmapCommonAPIListener() {
@Override
public void apiEnabled(DynmapCommonAPI api) {
markerAPI = api.getMarkerAPI();
areaMarkerSet = markerAPI.getMarkerSet("dynmapareas_areas");
if(areaMarkerSet == null) areaMarkerSet = markerAPI.createMarkerSet("dynmapareas_areas", "Player Areas", null, true);
markerMarkerSet = markerAPI.getMarkerSet("dynmapareas_markers");
if(markerMarkerSet == null) markerMarkerSet = markerAPI.createMarkerSet("dynmapareas_markers", "Player Markers", null, true);
}
});
CommandRegistrationCallback.EVENT.register((dispatcher, registryAccess, environment) -> {
dispatcher.register(new AreaCommand().create());
dispatcher.register(new MarkerCommand().create());
});
}
// Taken from https://github.com/webbukkit/dynmap/blob/b8b1e8bd4e91f86e8017db8531c1e4faf37ce070/fabric-1.20/src/main/java/org/dynmap/fabric_1_20/FabricWorld.java#L39C5-L50C6
public static String getWorldName(World w) {
RegistryKey<World> rk = w.getRegistryKey();
if (rk == World.OVERWORLD) { // Overworld?
return w.getServer().getSaveProperties().getLevelName();
} else if (rk == World.END) {
return "DIM1";
} else if (rk == World.NETHER) {
return "DIM-1";
} else {
return rk.getValue().getNamespace() + "_" + rk.getValue().getPath();
}
}
}

View File

@ -59,8 +59,7 @@ public class AreaAddCornerCommand extends FabricCommand {
List<Point> points = DynmapAreasMod.points.getOrDefault(p.getUuid(), new ArrayList<>());
points.add(new Point(p.getWorld(), x, z));
DynmapAreasMod.points.put(p.getUuid(), points);
// p.sendMessage(String.format("§aAdded corner at (§7%s§a/§7%s§a)", x, z));
p.sendMessage(Text.literal("OK"));
p.sendMessage(Text.literal(String.format("§aAdded corner at (§7%s§a/§7%s§a)", x, z)));
}
}

View File

@ -3,9 +3,11 @@ package me.mrletsplay.dynmapareas.command.area;
import me.mrletsplay.mrcore.command.event.CommandInvokedEvent;
import me.mrletsplay.mrcore.fabric.command.FabricCommand;
import net.minecraft.server.network.ServerPlayerEntity;
import net.minecraft.text.ClickEvent;
import net.minecraft.text.HoverEvent;
import net.minecraft.text.HoverEvent.Action;
import net.minecraft.text.Text;
import net.minecraft.util.Formatting;
public class AreaCreateCommand extends FabricCommand {
@ -32,20 +34,19 @@ public class AreaCreateCommand extends FabricCommand {
p.sendMessage(Text.literal("To create an area:"));
// List<BaseComponent> message = new ArrayList<>();
// message.addAll(Arrays.asList(new ComponentBuilder("1. ").color(ChatColor.GOLD).create()));
// message.addAll(Arrays.asList(new ComponentBuilder("[Add]").color(ChatColor.GREEN).event(CLICK_ME).event(new ClickEvent(ClickEvent.Action.RUN_COMMAND, "/area addcorner")).create()));
// message.addAll(Arrays.asList(new ComponentBuilder(" all corners of your area (or use ").color(ChatColor.WHITE).append("/area addcorner [offset]").color(ChatColor.GRAY).append(")").color(ChatColor.WHITE).create()));
// p.spigot().sendMessage(message.toArray(BaseComponent[]::new));
//
// // TODO: autofill command
// List<BaseComponent> message2 = new ArrayList<>();
// message2.addAll(Arrays.asList(new ComponentBuilder("2. ").color(ChatColor.GOLD).create()));
// message2.addAll(Arrays.asList(new ComponentBuilder("Use ").color(ChatColor.WHITE).append("/area done \"<name>\" [color (#000000)]").color(ChatColor.GRAY).append(" to create your area").color(ChatColor.WHITE).create()));
// p.spigot().sendMessage(message2.toArray(BaseComponent[]::new));
//
// p.sendMessage("");
// p.sendMessage("If you mess up, you can remove the last added corner using §7/area removecorner 1 §ror a specific corner using §7/area removecorner #index");
p.sendMessage(Text.literal("1. ").formatted(Formatting.GOLD)
.append(Text.literal("[Add]").formatted(Formatting.GREEN).styled(style -> style.withClickEvent(new ClickEvent(ClickEvent.Action.RUN_COMMAND, "/area addcorner")).withHoverEvent(CLICK_ME)))
.append(Text.literal(" all corners of your area (or use ").formatted(Formatting.WHITE))
.append(Text.literal("/area addcorner [offset]").formatted(Formatting.GRAY))
.append(Text.literal(")").formatted(Formatting.WHITE)));
p.sendMessage(Text.literal("2. ").formatted(Formatting.GOLD)
.append(Text.literal("Use ").formatted(Formatting.WHITE))
.append(Text.literal("/area done \"<name>\" [color (#000000)]").formatted(Formatting.GRAY))
.append(Text.literal(" to create your area").formatted(Formatting.WHITE)));
p.sendMessage(Text.literal(""));
p.sendMessage(Text.literal("If you mess up, you can remove the last added corner using §7/area removecorner 1 §ror a specific corner using §7/area removecorner #index"));
}
}

View File

@ -71,7 +71,7 @@ public class AreaDoneCommand extends FabricCommand {
z[i] = points.get(i).getZ();
}
AreaMarker a = DynmapAreasMod.areaMarkerSet.createAreaMarker(p.getUuid().toString() + "_" + Long.toHexString(System.nanoTime()), name, false, points.get(0).getWorld().getServer().getName(), x, z, true);
AreaMarker a = DynmapAreasMod.areaMarkerSet.createAreaMarker(p.getUuid().toString() + "_" + Long.toHexString(System.nanoTime()), name, false, DynmapAreasMod.getWorldName(points.get(0).getWorld()), x, z, true);
a.setFillStyle(a.getFillOpacity(), colorInt);
a.setLineStyle(a.getLineWeight(), a.getLineOpacity(), colorInt);
DynmapAreasMod.points.remove(p.getUuid());

View File

@ -42,6 +42,8 @@ public class MarkerAddCommand extends FabricCommand {
return;
}
p.sendMessage(Text.literal("WORLD: " + p.getWorld().getRegistryKey().toString()));
if(event.getArguments().length != 2) {
sendCommandInfo(event.getSender());
return;
@ -56,7 +58,7 @@ public class MarkerAddCommand extends FabricCommand {
}
BlockPos loc = p.getBlockPos();
DynmapAreasMod.markerMarkerSet.createMarker(p.getUuid().toString() + "_" + Long.toHexString(System.nanoTime()), name, p.getWorld().getServer().getName(), loc.getX() + 0.5, loc.getY(), loc.getZ() + 0.5, icon, true);
DynmapAreasMod.markerMarkerSet.createMarker(p.getUuid().toString() + "_" + Long.toHexString(System.nanoTime()), name, DynmapAreasMod.getWorldName(p.getWorld()), loc.getX() + 0.5, loc.getY(), loc.getZ() + 0.5, icon, true);
p.sendMessage(Text.literal("§aMarker created"));
}

View File

@ -3,15 +3,15 @@
"id": "dynmapareas",
"version": "${version}",
"name": "DynmapAreas",
"description": "This is an example description! Tell everyone what your mod is about!",
"description": "Mod for creating player areas and markers on DynMap",
"authors": [
"Me!"
"MrLetsplay2003"
],
"contact": {
"homepage": "https://fabricmc.net/",
"sources": "https://github.com/FabricMC/fabric-example-mod"
"homepage": "https://git.cringe-studios.com/mr/DynmapAreas-Fabric",
"sources": "https://git.cringe-studios.com/mr/DynmapAreas-Fabric"
},
"license": "CC0-1.0",
"license": "MIT",
"icon": "assets/dynmapareas/icon.png",
"environment": "*",
"entrypoints": {
@ -27,7 +27,5 @@
"fabric-api": "*",
"mrcore": "*"
},
"suggests": {
"another-mod": "*"
}
"suggests": {}
}