Merge branch '1.12.1-dev' into 1.12.2-dev

src/main/resources/META-INF/replaymod_at.cfg

@@ -128,5 +128,8 @@ public net.minecraft.entity.EntityLivingBase field_184628_bn # activeItemStackUs
 # EntityLivingBase
 public net.minecraft.client.particle.Particle *
 
+# ScreenShotHelper
+public net.minecraft.util.ScreenShotHelper func_74290_a(Ljava/io/File;)Ljava/io/File; # getTimestampedPNGFileForDirectory
+
 # Example
 # public net.minecraft.package.ClassName func_some_id(Ljava/lang/Class;IZS)V # methodName

src/main/resources/mcmod.info

@@ -134,6 +134,22 @@
     "screenshots": [],
     "dependencies": []
   },
+  {
+    "modid": "replaymod-restrictions",
+    "name": "Replay Mod - Restrictions",
+    "description": "Server-side Restrictions Module of the ReplayMod - Restrict what clients can do in replays",
+    "version": "${version}",
+    "mcversion": "${mcversion}",
+    "url": "https://replaymod.com",
+    "updateUrl": "https://replaymod.com/download",
+    "authorList": [
+      "CrushedPixel",
+      "johni0702"
+    ],
+    "logoFile": "replaymod_logo.png",
+    "screenshots": [],
+    "dependencies": []
+  },
   {
       "modid": "replaymod-compat",
       "name": "Replay Mod - Compatibility",

src/main/resources/mixins.render.replaymod.json

@@ -1,7 +1,9 @@
 {
   "required": true,
   "package": "com.replaymod.render.mixin",
-  "mixins": [
+  "mixins": [],
+  "server": [],
+  "client": [
     "MixinEntityRenderer",
     "MixinFrustum",
     "MixinParticleManager",
@@ -9,8 +11,6 @@
     "MixinRenderGlobal",
     "MixinRenderManager"
   ],
-  "server": [],
-  "client": [],
   "compatibilityLevel": "JAVA_8",
   "minVersion": "0.6.11",
   "refmap": "mixins.replaymod.refmap.json"

src/main/resources/mixins.replay.replaymod.json

@@ -1,7 +1,9 @@
 {
   "required": true,
   "package": "com.replaymod.replay.mixin",
-  "mixins": [
+  "mixins": [],
+  "server": [],
+  "client": [
     "MixinGuiSpectator",
     "MixinParticleManager",
     "MixinPlayerControllerMP",
@@ -13,8 +15,6 @@
     "MixinViewFrustum",
     "MixinWorldClient"
   ],
-  "server": [],
-  "client": [],
   "compatibilityLevel": "JAVA_8",
   "minVersion": "0.6.11",
   "refmap": "mixins.replaymod.refmap.json"