Sulkta-Coop/dynmap-neoforge
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge Forge 1.11.2 into common 3.0 gradle build

Browse source
This commit is contained in:
Mike Primm 2018-08-23 07:52:46 -05:00
parent 706d53e31f
commit f4a99145cf
113 changed files with 22443 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

1
forge-1.12.2/bin/.gitignore vendored Normal file
View file

@ -0,0 +1 @@
/main/

2
forge-1.12.2/src/main/java/org/dynmap/forge/ChunkSnapshot.java → forge-1.12.2/src/main/java/org/dynmap/forge_1_12_2/ChunkSnapshot.java
View file

@ -1,4 +1,4 @@
package org.dynmap.forge;
package org.dynmap.forge_1_12_2;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;

2
forge-1.12.2/src/main/java/org/dynmap/forge/ClientProxy.java → forge-1.12.2/src/main/java/org/dynmap/forge_1_12_2/ClientProxy.java
View file

@ -1,4 +1,4 @@
package org.dynmap.forge;
package org.dynmap.forge_1_12_2;
public class ClientProxy extends Proxy {
public ClientProxy() {

6
forge-1.12.2/src/main/java/org/dynmap/forge/DynmapMod.java → forge-1.12.2/src/main/java/org/dynmap/forge_1_12_2/DynmapMod.java
View file

@ -1,4 +1,4 @@
package org.dynmap.forge;
package org.dynmap.forge_1_12_2;
import java.io.File;
import java.util.List;
@ -7,7 +7,7 @@ import java.util.Map;
import org.dynmap.DynmapCommonAPI;
import org.dynmap.DynmapCommonAPIListener;
import org.dynmap.Log;
import org.dynmap.forge.DynmapPlugin.OurLog;
import org.dynmap.forge_1_12_2.DynmapPlugin.OurLog;
import net.minecraft.server.MinecraftServer;
import net.minecraft.world.World;
@ -35,7 +35,7 @@ public class DynmapMod
public static DynmapMod instance;
// Says where the client and server 'proxy' code is loaded.
@SidedProxy(clientSide = "org.dynmap.forge.ClientProxy", serverSide = "org.dynmap.forge.Proxy")
@SidedProxy(clientSide = "org.dynmap.forge_1_12_2.ClientProxy", serverSide = "org.dynmap.forge_1_12_2.Proxy")
public static Proxy proxy;
public static DynmapPlugin plugin;

16
forge-1.12.2/src/main/java/org/dynmap/forge/DynmapPlugin.java → forge-1.12.2/src/main/java/org/dynmap/forge_1_12_2/DynmapPlugin.java
View file

@ -1,4 +1,4 @@
package org.dynmap.forge;
package org.dynmap.forge_1_12_2;
import java.io.File;
import java.io.InputStream;
@ -79,19 +79,19 @@ import org.dynmap.DynmapWorld;
import org.dynmap.Log;
import org.dynmap.MapManager;
import org.dynmap.PlayerList;
import org.dynmap.forge.DmapCommand;
import org.dynmap.forge.DmarkerCommand;
import org.dynmap.forge.DynmapCommand;
import org.dynmap.forge.DynmapMod;
import org.dynmap.forge.permissions.FilePermissions;
import org.dynmap.forge.permissions.OpPermissions;
import org.dynmap.forge.permissions.PermissionProvider;
import org.dynmap.common.BiomeMap;
import org.dynmap.common.DynmapCommandSender;
import org.dynmap.common.DynmapPlayer;
import org.dynmap.common.DynmapServerInterface;
import org.dynmap.common.DynmapListenerManager.EventType;
import org.dynmap.debug.Debug;
import org.dynmap.forge_1_12_2.DmapCommand;
import org.dynmap.forge_1_12_2.DmarkerCommand;
import org.dynmap.forge_1_12_2.DynmapCommand;
import org.dynmap.forge_1_12_2.DynmapMod;
import org.dynmap.forge_1_12_2.permissions.FilePermissions;
import org.dynmap.forge_1_12_2.permissions.OpPermissions;
import org.dynmap.forge_1_12_2.permissions.PermissionProvider;
import org.dynmap.permissions.PermissionsHandler;
import org.dynmap.renderer.DynmapBlockState;
import org.dynmap.utils.DynIntHashMap;

4
forge-1.12.2/src/main/java/org/dynmap/forge/ForgeMapChunkCache.java → forge-1.12.2/src/main/java/org/dynmap/forge_1_12_2/ForgeMapChunkCache.java
View file

@ -1,4 +1,4 @@
package org.dynmap.forge;
package org.dynmap.forge_1_12_2;
import java.io.DataInputStream;
import java.lang.reflect.Field;
@ -40,7 +40,7 @@ import org.dynmap.DynmapCore;
import org.dynmap.DynmapWorld;
import org.dynmap.Log;
import org.dynmap.common.BiomeMap;
import org.dynmap.forge.SnapshotCache.SnapshotRec;
import org.dynmap.forge_1_12_2.SnapshotCache.SnapshotRec;
import org.dynmap.hdmap.HDBlockModels;
import org.dynmap.renderer.DynmapBlockState;
import org.dynmap.renderer.RenderPatchFactory;

2
forge-1.12.2/src/main/java/org/dynmap/forge/ForgeWorld.java → forge-1.12.2/src/main/java/org/dynmap/forge_1_12_2/ForgeWorld.java
View file

@ -1,4 +1,4 @@
package org.dynmap.forge;
package org.dynmap.forge_1_12_2;
/**
* Forge specific implementation of DynmapWorld
*/

2
forge-1.12.2/src/main/java/org/dynmap/forge/Proxy.java → forge-1.12.2/src/main/java/org/dynmap/forge_1_12_2/Proxy.java
View file

@ -1,4 +1,4 @@
package org.dynmap.forge;
package org.dynmap.forge_1_12_2;
import net.minecraft.server.MinecraftServer;

2
forge-1.12.2/src/main/java/org/dynmap/forge/SnapshotCache.java → forge-1.12.2/src/main/java/org/dynmap/forge_1_12_2/SnapshotCache.java
View file

@ -1,4 +1,4 @@
package org.dynmap.forge;
package org.dynmap.forge_1_12_2;
import java.lang.ref.Reference;
import java.lang.ref.ReferenceQueue;

2
forge-1.12.2/src/main/java/org/dynmap/forge/Version.java → forge-1.12.2/src/main/java/org/dynmap/forge_1_12_2/Version.java
View file

@ -1,4 +1,4 @@
package org.dynmap.forge;
package org.dynmap.forge_1_12_2;
public class Version {
public static final String VER = "@VERSION@";

2
forge-1.12.2/src/main/java/org/dynmap/forge/VersionCheck.java → forge-1.12.2/src/main/java/org/dynmap/forge_1_12_2/VersionCheck.java
View file

@ -1,4 +1,4 @@
package org.dynmap.forge;
package org.dynmap.forge_1_12_2;
import java.io.BufferedReader;
import java.io.InputStreamReader;

4
forge-1.12.2/src/main/java/org/dynmap/forge/permissions/FilePermissions.java → forge-1.12.2/src/main/java/org/dynmap/forge_1_12_2/permissions/FilePermissions.java
View file

@ -1,4 +1,4 @@
package org.dynmap.forge.permissions;
package org.dynmap.forge_1_12_2.permissions;
import java.io.File;
import java.util.HashMap;
@ -11,7 +11,7 @@ import net.minecraft.entity.player.EntityPlayer;
import org.dynmap.ConfigurationNode;
import org.dynmap.Log;
import org.dynmap.forge.DynmapPlugin;
import org.dynmap.forge_1_12_2.DynmapPlugin;
public class FilePermissions implements PermissionProvider {
private HashMap<String, Set<String>> perms;

4
forge-1.12.2/src/main/java/org/dynmap/forge/permissions/OpPermissions.java → forge-1.12.2/src/main/java/org/dynmap/forge_1_12_2/permissions/OpPermissions.java
View file

@ -1,4 +1,4 @@
package org.dynmap.forge.permissions;
package org.dynmap.forge_1_12_2.permissions;
import java.util.HashSet;
import java.util.Set;
@ -7,7 +7,7 @@ import net.minecraft.command.ICommandSender;
import net.minecraft.entity.player.EntityPlayer;
import org.dynmap.Log;
import org.dynmap.forge.DynmapPlugin;
import org.dynmap.forge_1_12_2.DynmapPlugin;
public class OpPermissions implements PermissionProvider {
public HashSet<String> usrCommands = new HashSet<String>();

2
forge-1.12.2/src/main/java/org/dynmap/forge/permissions/PermissionProvider.java → forge-1.12.2/src/main/java/org/dynmap/forge_1_12_2/permissions/PermissionProvider.java
View file

@ -1,4 +1,4 @@
package org.dynmap.forge.permissions;
package org.dynmap.forge_1_12_2.permissions;
import java.util.Set;