Skip to content

Commit 2c8c456

Browse files
Merge branch 'v3.0' of git@github-home:webbukkit/dynmap.git into v3.0
2 parents da377fd + 1ccd234 commit 2c8c456

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+3975
-4
lines changed

DynmapCore/src/main/resources/models_1.txt

+4-2
Original file line numberDiff line numberDiff line change
@@ -3451,8 +3451,10 @@ modellist:id=%dropper,state=facing:down,box=0.000000/0.000000/0.000000:16.000000
34513451
[1.20.3-]modellist:id=%polished_tuff_slab,state=type:bottom,box=0.000000/0.000000/0.000000:16.000000/8.000000/16.000000:n/0/0.000000/8.000000/16.000000/16.000000:w/0/0.000000/8.000000/16.000000/16.000000:e/0/0.000000/8.000000/16.000000/16.000000:s/0/0.000000/8.000000/16.000000/16.000000:u/0/0.000000/0.000000/16.000000/16.000000:d/0/0.000000/0.000000/16.000000/16.000000
34523452
[1.20.3-]customblock:id=%polished_tuff_stairs,class=org.dynmap.hdmap.renderer.StairStateRenderer
34533453
[1.20.3-]customblock:id=%polished_tuff_wall,class=org.dynmap.hdmap.renderer.FenceWallBlockStateRenderer,type=tallwall
3454-
[1.20.3-]customblock:id=%polished_tuff_stairs,class=org.dynmap.hdmap.renderer.StairStateRenderer
3455-
[1.20.3-]customblock:id=%polished_tuff_wall,class=org.dynmap.hdmap.renderer.FenceWallBlockStateRenderer,type=tallwall
3454+
[1.20.3-]customblock:id=%tuff_brick_stairs,class=org.dynmap.hdmap.renderer.StairStateRenderer
3455+
[1.20.3-]modellist:id=%tuff_brick_slab,state=type:top,box=0.000000/8.000000/0.000000:16.000000/16.000000/16.000000:n/0/0.000000/0.000000/16.000000/8.000000:w/0/0.000000/0.000000/16.000000/8.000000:e/0/0.000000/0.000000/16.000000/8.000000:s/0/0.000000/0.000000/16.000000/8.000000:u/0/0.000000/0.000000/16.000000/16.000000:d/0/0.000000/0.000000/16.000000/16.000000
3456+
[1.20.3-]modellist:id=%tuff_brick_slab,state=type:bottom,box=0.000000/0.000000/0.000000:16.000000/8.000000/16.000000:n/0/0.000000/8.000000/16.000000/16.000000:w/0/0.000000/8.000000/16.000000/16.000000:e/0/0.000000/8.000000/16.000000/16.000000:s/0/0.000000/8.000000/16.000000/16.000000:u/0/0.000000/0.000000/16.000000/16.000000:d/0/0.000000/0.000000/16.000000/16.000000
3457+
[1.20.3-]customblock:id=%tuff_brick_wall,class=org.dynmap.hdmap.renderer.FenceWallBlockStateRenderer,type=tallwall
34563458
[1.20.3-]customblock:id=%copper_door,id=%exposed_copper_door,id=%oxidized_copper_door,id=%weathered_copper_door,class=org.dynmap.hdmap.renderer.DoorStateRenderer
34573459
[1.20.3-]customblock:id=%waxed_copper_door,id=%waxed_exposed_copper_door,id=%waxed_oxidized_copper_door,id=%waxed_weathered_copper_door,class=org.dynmap.hdmap.renderer.DoorStateRenderer
34583460

bukkit-helper/.settings/org.eclipse.jdt.core.prefs

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1-
#
2-
#Sun Jun 16 01:19:02 CDT 2024
31
eclipse.preferences.version=1
2+
org.eclipse.jdt.core.classpath.outputOverlappingAnotherSource=ignore
3+
org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
44
org.eclipse.jdt.core.compiler.annotation.nonnull=javax.annotation.Nonnull
5+
org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=javax.annotation.ParametersAreNonnullByDefault
56
org.eclipse.jdt.core.compiler.annotation.nullable=javax.annotation.Nullable
67
org.eclipse.jdt.core.compiler.annotation.nullanalysis=enabled
78
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
@@ -12,5 +13,7 @@ org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
1213
org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=warning
1314
org.eclipse.jdt.core.compiler.problem.nullReference=warning
1415
org.eclipse.jdt.core.compiler.problem.nullSpecViolation=warning
16+
org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=ignore
1517
org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning
18+
org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=enabled
1619
org.eclipse.jdt.core.compiler.source=1.8

fabric-1.21.3/.gitignore

+32
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
# gradle
2+
3+
.gradle/
4+
build/
5+
out/
6+
classes/
7+
8+
# eclipse
9+
10+
*.launch
11+
12+
# idea
13+
14+
.idea/
15+
*.iml
16+
*.ipr
17+
*.iws
18+
19+
# vscode
20+
21+
.settings/
22+
.vscode/
23+
bin/
24+
.classpath
25+
.project
26+
27+
# fabric
28+
29+
run/
30+
31+
# other
32+
*.log

fabric-1.21.3/build.gradle

+76
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
1+
plugins {
2+
id 'fabric-loom' version '1.8.11'
3+
}
4+
5+
archivesBaseName = "Dynmap"
6+
version = parent.version
7+
group = parent.group
8+
9+
eclipse {
10+
project {
11+
name = "Dynmap(Fabric-1.21.3)"
12+
}
13+
}
14+
15+
sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = JavaLanguageVersion.of(21) // Need this here so eclipse task generates correctly.
16+
17+
configurations {
18+
shadow
19+
implementation.extendsFrom(shadow)
20+
}
21+
22+
repositories {
23+
mavenCentral()
24+
maven { url 'https://oss.sonatype.org/content/repositories/snapshots' }
25+
}
26+
27+
dependencies {
28+
minecraft "com.mojang:minecraft:${project.minecraft_version}"
29+
mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
30+
modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
31+
modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
32+
33+
compileOnly group: 'com.google.code.findbugs', name: 'jsr305', version: '3.0.2'
34+
35+
shadow project(path: ':DynmapCore', configuration: 'shadow')
36+
37+
modCompileOnly "me.lucko:fabric-permissions-api:0.1-SNAPSHOT"
38+
compileOnly 'net.luckperms:api:5.4'
39+
40+
//implementation 'org.xerial:sqlite-jdbc:3.30.1'
41+
shadow group: 'org.xerial', name: 'sqlite-jdbc', version: '3.30.1'
42+
}
43+
44+
loom {
45+
accessWidenerPath = file("src/main/resources/dynmap.accesswidener")
46+
}
47+
48+
processResources {
49+
filesMatching('fabric.mod.json') {
50+
expand "version": project.version
51+
}
52+
}
53+
54+
java {
55+
// Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
56+
// if it is present.
57+
// If you remove this line, sources will not be generated.
58+
withSourcesJar()
59+
}
60+
61+
jar {
62+
from "LICENSE"
63+
from {
64+
configurations.shadow.collect { it.toString().contains("guava") ? null : it.isDirectory() ? it : zipTree(it) }
65+
}
66+
}
67+
68+
remapJar {
69+
archiveFileName = "${archivesBaseName}-${project.version}-fabric-${project.minecraft_version}.jar"
70+
destinationDirectory = file '../target'
71+
}
72+
73+
remapJar.doLast {
74+
task ->
75+
ant.checksum file: task.archivePath
76+
}

fabric-1.21.3/gradle.properties

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
minecraft_version=1.21.3
2+
yarn_mappings=1.21.3+build.1
3+
loader_version=0.16.9
4+
fabric_version=0.108.0+1.21.3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
package org.dynmap.fabric_1_21_3;
2+
3+
import net.fabricmc.api.ModInitializer;
4+
import net.fabricmc.loader.api.FabricLoader;
5+
import net.fabricmc.loader.api.ModContainer;
6+
import org.dynmap.DynmapCore;
7+
import org.dynmap.Log;
8+
9+
import java.io.File;
10+
import java.net.URISyntaxException;
11+
import java.nio.file.Path;
12+
import java.nio.file.Paths;
13+
14+
public class DynmapMod implements ModInitializer {
15+
private static final String MODID = "dynmap";
16+
private static final ModContainer MOD_CONTAINER = FabricLoader.getInstance().getModContainer(MODID)
17+
.orElseThrow(() -> new RuntimeException("Failed to get mod container: " + MODID));
18+
// The instance of your mod that Fabric uses.
19+
public static DynmapMod instance;
20+
21+
public static DynmapPlugin plugin;
22+
public static File jarfile;
23+
public static String ver;
24+
public static boolean useforcedchunks;
25+
26+
@Override
27+
public void onInitialize() {
28+
instance = this;
29+
30+
Path path = MOD_CONTAINER.getRootPath();
31+
try {
32+
jarfile = new File(DynmapCore.class.getProtectionDomain().getCodeSource().getLocation().toURI());
33+
} catch (URISyntaxException e) {
34+
Log.severe("Unable to get DynmapCore jar path", e);
35+
}
36+
37+
if (path.getFileSystem().provider().getScheme().equals("jar")) {
38+
path = Paths.get(path.getFileSystem().toString());
39+
jarfile = path.toFile();
40+
}
41+
42+
ver = MOD_CONTAINER.getMetadata().getVersion().getFriendlyString();
43+
44+
Log.setLogger(new FabricLogger());
45+
org.dynmap.modsupport.ModSupportImpl.init();
46+
47+
// Initialize the plugin, we will enable it fully when the server starts.
48+
plugin = new DynmapPlugin();
49+
}
50+
}

0 commit comments

Comments
 (0)