Skip to content

Commit 0a3eaad

Browse files
terrainwaxterrainwax
committed
fix Chunk dupe && unloaded hopper chunk dupe && fix installer
1 parent 282ff94 commit 0a3eaad

File tree

8 files changed

+729
-183
lines changed

8 files changed

+729
-183
lines changed

‎build.gradle

+9-5
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ apply plugin: MohistDevPlugin
1818
repositories {
1919
mavenLocal()
2020
mavenCentral()
21-
maven { url 'http://repo.uraniummc.cc/content/groups/public/' }
21+
maven { url 'https://repo.uraniummc.cc/repository/maven-public/' }
2222
maven { url 'http://oss.sonatype.org/content/repositories/snapshots/' }
2323
maven { url 'https://files.minecraftforge.net/maven' }
2424
maven { url 'https://libraries.minecraft.net/' }
@@ -37,7 +37,7 @@ minecraft {
3737
}
3838

3939
group = 'red.mohist'
40-
version = '1.7.10'
40+
version = '1.7.10-1.1'
4141

4242
configurations {
4343
compile.extendsFrom exported
@@ -85,6 +85,12 @@ packageUniversal {
8585
from { configurations.exported.collect { it.isDirectory() ? it : zipTree(it) } }
8686
}
8787

88+
packageInstaller {
89+
classifier = 'installer'
90+
from "mohist_logo.png"
91+
rename "mohist_logo\\.png", "big_logo.png"
92+
}
93+
8894
def generateClasspath() {
8995
def classpath = ''
9096
configurations.libraries.resolvedConfiguration.resolvedArtifacts.collect { it.moduleVersion.id }.each {
@@ -113,14 +119,12 @@ task jar(type: Jar, dependsOn: packageUniversal) {
113119
from zipTree(tasks.packageUniversal.archivePath)
114120
}
115121

116-
tasks.packageInstaller.onlyIf { false }
117-
118122
tasks.generateProjectCauldron << {
119123
def file = new File('eclipse/cauldron/build.gradle')
120124
file.append('''
121125
repositories {
122126
clear()
123-
maven { url 'http://repo.uraniummc.cc/content/groups/public/' }
127+
maven { url 'https://repo.uraniummc.cc/repository/maven-public/' }
124128
maven { url 'https://files.minecraftforge.net/maven/' }
125129
maven { url 'https://libraries.minecraft.net/' }
126130
maven { url 'https://raw.githubusercontent.com/Mohist-Community/Mohist-Maven/master/maven/' }

‎buildSrc/src/main/java/red/mohist/gradle/dev/MohistDevPlugin.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -367,7 +367,7 @@ public Object call() {
367367
task.setOutputFile(delayedFile(INSTALL_PROFILE));
368368
task.addReplacement("@minecraft_version@", delayedString("{MC_VERSION}"));
369369
task.addReplacement("@version@", delayedString("{VERSION}"));
370-
task.addReplacement("@project@", delayedString("cauldron"));
370+
task.addReplacement("@project@", delayedString("Mohist"));
371371
task.addReplacement("@artifact@", delayedString("net.minecraftforge:forge:{MC_VERSION}-{VERSION}"));
372372
task.addReplacement("@universal_jar@", new Closure<String>(project) {
373373
public String call() {

‎jsons/1.7.10-rel.json

+52-156
Original file line numberDiff line numberDiff line change
@@ -20,16 +20,13 @@
2020
"assets": "1.7.10",
2121
"libraries": [
2222
{
23-
"name": "@artifact@",
24-
"url": "http://files.minecraftforge.net/maven/"
25-
},
26-
{
27-
"name": "net.minecraft:launchwrapper:1.11",
28-
"serverreq":true
23+
"name": "net.minecraft:server:1.7.10",
24+
"url": "https://raw.githubusercontent.com/Mohist-Community/Mohist-Maven/master/maven",
25+
"serverreq": true
2926
},
3027
{
3128
"name": "org.ow2.asm:asm-all:5.0.3",
32-
"serverreq":true
29+
"serverreq": true
3330
},
3431
{
3532
"name": "com.typesafe.akka:akka-actor_2.11:2.3.3",
@@ -39,11 +36,9 @@
3936
"clientreq":true
4037
},
4138
{
42-
"name": "com.typesafe:config:1.2.1",
43-
"url" : "http://files.minecraftforge.net/maven/",
44-
"checksums" : [ "f771f71fdae3df231bcd54d5ca2d57f0bf93f467", "7d7bc36df0989d72f2d5d057309675777acc528b" ],
45-
"serverreq":true,
46-
"clientreq":true
39+
"name": "com.typesafe:config:1.3.1",
40+
"url" : "http://repo.maven.apache.org/maven2",
41+
"serverreq":true
4742
},
4843
{
4944
"name": "org.scala-lang:scala-actors-migration_2.11:1.1.0",
@@ -109,87 +104,46 @@
109104
"clientreq":true
110105
},
111106
{
112-
"name": "net.sf.jopt-simple:jopt-simple:4.5",
107+
"name": "net.sf.jopt-simple:jopt-simple:5.0.1",
108+
"url" : "http://repo.maven.apache.org/maven2",
113109
"serverreq":true
114110
},
115111
{
116112
"name": "lzma:lzma:0.0.1",
117113
"serverreq":true
118114
},
119115
{
120-
"name": "com.mojang:realms:1.3.5"
121-
},
122-
{
123-
"name": "org.apache.commons:commons-compress:1.8.1"
124-
},
125-
{
126-
"name": "org.apache.httpcomponents:httpclient:4.3.3"
127-
},
128-
{
129-
"name": "commons-logging:commons-logging:1.1.3"
130-
},
131-
{
132-
"name": "org.apache.httpcomponents:httpcore:4.3.2"
133-
},
134-
{
135-
"name": "java3d:vecmath:1.3.1"
136-
},
137-
{
138-
"name": "net.sf.trove4j:trove4j:3.0.3"
139-
},
140-
{
141-
"name": "com.ibm.icu:icu4j-core-mojang:51.2"
142-
},
143-
{
144-
"name": "com.paulscode:codecjorbis:20101023"
145-
},
146-
{
147-
"name": "com.paulscode:codecwav:20101023"
148-
},
149-
{
150-
"name": "com.paulscode:libraryjavasound:20101123"
151-
},
152-
{
153-
"name": "com.paulscode:librarylwjglopenal:20100824"
154-
},
155-
{
156-
"name": "com.paulscode:soundsystem:20120107"
157-
},
158-
{
159-
"name": "io.netty:netty-all:4.0.10.Final"
160-
},
161-
{
162-
"name": "com.google.guava:guava:16.0"
163-
},
164-
{
165-
"name": "org.apache.commons:commons-lang3:3.2.1"
166-
},
167-
{
168-
"name": "commons-io:commons-io:2.4"
169-
},
170-
{
171-
"name": "commons-codec:commons-codec:1.9"
172-
},
173-
{
174-
"name": "net.java.jinput:jinput:2.0.5"
116+
"name": "org.apache.httpcomponents:httpclient:4.4.1",
117+
"url" : "http://repo.maven.apache.org/maven2",
118+
"serverreq":true
175119
},
176120
{
177-
"name": "net.java.jutils:jutils:1.0.0"
121+
"name": "commons-logging:commons-logging:1.2",
122+
"url" : "http://repo.maven.apache.org/maven2",
123+
"serverreq":true
178124
},
179125
{
180-
"name": "com.google.code.gson:gson:2.2.4"
126+
"name": "org.apache.httpcomponents:httpcore:4.4.1",
127+
"url" : "http://repo.maven.apache.org/maven2",
128+
"serverreq":true
181129
},
182130
{
183-
"name": "com.mojang:authlib:1.5.16"
131+
"name": "java3d:vecmath:1.3.1",
132+
"url" : "http://repo.maven.apache.org/maven2",
133+
"serverreq":true
184134
},
185135
{
186-
"name": "org.apache.logging.log4j:log4j-api:2.0-beta9"
136+
"name": "com.google.guava:guava:18.0",
137+
"url" : "http://repo.maven.apache.org/maven2",
138+
"serverreq":true
187139
},
188140
{
189-
"name": "org.apache.logging.log4j:log4j-core:2.0-beta9"
141+
"name": "commons-codec:commons-codec:1.9",
142+
"url" : "http://repo.maven.apache.org/maven2",
143+
"serverreq":true
190144
},
191145
{
192-
"name": "org.yaml:snakeyaml:1.9",
146+
"name": "org.yaml:snakeyaml:1.15",
193147
"url" : "http://repo.maven.apache.org/maven2",
194148
"serverreq":true
195149
},
@@ -199,22 +153,22 @@
199153
"serverreq":true
200154
},
201155
{
202-
"name": "org.avaje:ebean:2.7.3",
156+
"name": "org.avaje:ebean:2.8.1",
203157
"url" : "http://repo.maven.apache.org/maven2",
204158
"serverreq":true
205159
},
206160
{
207-
"name": "jline:jline:2.6",
161+
"name": "jline:jline:2.13",
208162
"url" : "http://repo.maven.apache.org/maven2",
209163
"serverreq":true
210164
},
211165
{
212-
"name": "net.md-5:SpecialSource:1.7-SNAPSHOT",
213-
"url" : "https://raw.github.com/MinecraftPortCentral/mcpc-mvn-repo/master/snapshots",
166+
"name": "net.md-5:SpecialSource:1.7.4",
167+
"url" : "https://hub.spigotmc.org/nexus/content/repositories/public",
214168
"serverreq":true
215169
},
216170
{
217-
"name": "org.fusesource.jansi:jansi:1.8",
171+
"name": "org.fusesource.jansi:jansi:1.11",
218172
"url" : "http://repo.maven.apache.org/maven2",
219173
"serverreq":true
220174
},
@@ -232,9 +186,24 @@
232186
"name": "org.xerial:sqlite-jdbc:3.7.2",
233187
"url" : "http://repo.maven.apache.org/maven2",
234188
"serverreq":true
189+
},
190+
{
191+
"name": "colt:colt:1.2.0",
192+
"url" : "http://repo.maven.apache.org/maven2",
193+
"serverreq":true
194+
},
195+
{
196+
"name": "net.openhft:affinity:3.0.1",
197+
"url" : "http://repo.maven.apache.org/maven2",
198+
"serverreq":true
199+
},
200+
{
201+
"name": "org.jetbrains.kotlin:kotlin-runtime:1.1.4-2",
202+
"url" : "http://repo.maven.apache.org/maven2",
203+
"serverreq":true
235204
},
236205
{
237-
"name": "mysql:mysql-connector-java:5.1.14",
206+
"name": "mysql:mysql-connector-java:5.1.46",
238207
"url" : "http://repo.maven.apache.org/maven2",
239208
"serverreq":true
240209
},
@@ -244,82 +213,9 @@
244213
"serverreq":true
245214
},
246215
{
247-
"name": "org.lwjgl.lwjgl:lwjgl:2.9.1"
248-
},
249-
{
250-
"name": "org.lwjgl.lwjgl:lwjgl_util:2.9.1"
251-
},
252-
{
253-
"name": "org.lwjgl.lwjgl:lwjgl-platform:2.9.1",
254-
"natives": {
255-
"linux": "natives-linux",
256-
"windows": "natives-windows",
257-
"osx": "natives-osx"
258-
},
259-
"extract": {
260-
"exclude": [
261-
"META-INF/"
262-
]
263-
}
264-
},
265-
{
266-
"name": "net.java.jinput:jinput-platform:2.0.5",
267-
"natives": {
268-
"linux": "natives-linux",
269-
"windows": "natives-windows",
270-
"osx": "natives-osx"
271-
},
272-
"extract": {
273-
"exclude": [
274-
"META-INF/"
275-
]
276-
}
277-
},
278-
{
279-
"name": "tv.twitch:twitch:5.16"
280-
},
281-
{
282-
"name": "tv.twitch:twitch-platform:5.16",
283-
"rules": [
284-
{
285-
"action": "allow"
286-
},
287-
{
288-
"action": "disallow",
289-
"os": {
290-
"name": "linux"
291-
}
292-
}
293-
],
294-
"natives": {
295-
"linux": "natives-linux",
296-
"windows": "natives-windows-${arch}",
297-
"osx": "natives-osx"
298-
},
299-
"extract": {
300-
"exclude": [
301-
"META-INF/"
302-
]
303-
}
304-
},
305-
{
306-
"name": "tv.twitch:twitch-external-platform:4.5",
307-
"rules": [
308-
{
309-
"action": "allow",
310-
"os": {
311-
"name": "windows"
312-
}
313-
}
314-
],
315-
"natives": {
316-
"windows": "natives-windows-${arch}"
317-
},
318-
"extract": {
319-
"exclude": [
320-
"META-INF/"
321-
]
322-
}
216+
"name": "pw.prok:KImagine:0.2.0@jar",
217+
"url" : "https://raw.githubusercontent.com/Mohist-Community/Mohist-Maven/master/maven",
218+
"serverreq": true
323219
}
324220
],
325221
"mainClass": "net.minecraft.launchwrapper.Launch"

‎mohist_logo.png

61.1 KB
Loading

0 commit comments

Comments
 (0)