Merge pull request #22 from Pokemonplatin/1.7.10

Added Protected Frequencies to Teleporter and QuantumEntangloporter
Thorfusion · Jul 20, 2021 · 7b047b5 · 7b047b5
2 parents 9b7aa15 + 1ff4039
commit 7b047b5
Show file tree

Hide file tree

Showing 16 changed files with 881 additions and 670 deletions.
diff --git a/build.gradle b/build.gradle
@@ -2,40 +2,67 @@ defaultTasks 'fullBuild'
 
 buildscript {
     repositories {
-    maven { url = "https://repo1.maven.org/maven2/" }
-    maven {
-      name = "forge"
-        url = "https://files.minecraftforge.net/maven"
+
+        // [HTTPS FIX] Replace mavenCentral() with the code block below
+        maven {
+            url "https://repo1.maven.org/maven2"
+        }
+
+        maven {
+            name = "forge"
+            url = "https://files.minecraftforge.net/maven"
+        }
+        maven {
+            name = "forge2"
+            url = "https://maven.minecraftforge.net/"
+        }
+        maven {
+            name = "sonatype"
+            url = "https://oss.sonatype.org/content/repositories/snapshots/"
+        }
+
+        flatDir {
+            dirs 'libs'
+        }
     }
-    maven {
-      name = "sonatype"
-        url = "https://oss.sonatype.org/content/repositories/snapshots/"
+    dependencies {
+        classpath 'net.minecraftforge.gradle:ForgeGradle:1.2-SNAPSHOT'
     }
-  }
-  dependencies {
-    classpath 'net.minecraftforge.gradle:ForgeGradle:1.2-SNAPSHOT'
-  }
 }
 
 repositories {
     maven {
         name 'CB Maven FS'
         url "http://chickenbones.net/maven/"
     }
+	maven {
+            name = "forge2"
+            url = "https://maven.minecraftforge.net/"
+        }
     maven {
         name 'ForgeFS'
         url 'http://files.minecraftforge.net/maven'
      }
 }
 
-apply plugin: 'idea'
+allprojects {
+    repositories {
+        all { ArtifactRepository repo ->
+            if (repo instanceof MavenArtifactRepository) {
+                if (repo.url.toString().startsWith("http://repo1.maven.org/maven2")) {
+                    repo.url = repo.url.toString().replace("http://", "https://")
+                }
+            }
+        }
+    }
+}
 
-idea {
+/*idea {
     module {
         // For some reason this is necessary for IDEA 2014 workspaces to recognize assets
         inheritOutputDirs = true
     }
-}
+}*/
 
 apply plugin: 'forge'
 
@@ -60,11 +87,12 @@ version = "${config.minecraft_version}-${config.mod_version}." + (System.env.BUI
 archivesBaseName = "MekanismAll"
 libsDirName = "../output"
 distsDirName = "../output"
-sourceCompatibility = '1.7'
-targetCompatibility = '1.7'
+sourceCompatibility = '1.8'
+targetCompatibility = '1.8'
 
 minecraft {
-    version = config.minecraft_version + "-" + config.forge_version
+    version = "1.7.10-10.13.4.1558-1.7.10"
+    runDir = "eclipse"
 }
 
 processResources

diff --git a/build.properties b/build.properties
@@ -4,4 +4,4 @@ FMP_version=1.2.0.347
 CCLIB_version=1.1.3.141
 NEI_version=1.0.4.101
 CCC_version=1.0.6.39
-mod_version=9.10.6
+mod_version=9.10.7
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Sep 14 12:28:28 PDT 2015
+#Wed Jul 02 15:54:47 CDT 2014
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.0-bin.zip
diff --git a/src/main/java/mekanism/client/ClientProxy.java b/src/main/java/mekanism/client/ClientProxy.java
@@ -540,6 +540,7 @@ public void handleTeleporterUpdate(PortableTeleporterMessage message)
 			teleporter.clientFreq = message.frequency;
 			teleporter.clientPublicCache = message.publicCache;
 			teleporter.clientPrivateCache = message.privateCache;
+			teleporter.clientProtectedCache = message.protectedCache;
 
 			teleporter.updateButtons();
 		}