Skip to content

Commit 963e82a

Browse files
committed
Made the version for 1.7.2
1 parent 633a2f1 commit 963e82a

18 files changed

Lines changed: 68 additions & 52 deletions

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,3 +36,4 @@ addon.local.gradle.kts
3636
addon.late.local.gradle
3737
addon.late.local.gradle.kts
3838
layout.json
39+
*.md~

README.md

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# MCPatcher's Custom Item Texture (CIT) as a 1.7.10 Forge mod using Mixins.
1+
# MCPatcher's Custom Item Texture (CIT) as a 1.7.2 Forge mod using Mixins.
22

33
Based on mist475's MCPatcher Forge port: https://github.com/mist475/MCPatcherForge. If you don't use OptiFine you can try that.
44

@@ -8,13 +8,17 @@ Based on mist475's MCPatcher Forge port: https://github.com/mist475/MCPatcherFor
88

99
Original source code is under MIT, changes by mist475 are lgpl 3.0
1010

11-
If you find issues feel free to report, but it might take a while before mist475 get around to it.
11+
This branch cannot runClient, only for build
1212

13-
## Known issues:
13+
# IMPORTANT
1414

15-
Incompatibility with https://github.com/quentin452/OptimizationsAndTweaks, it @Overwrites methods used by this mod.
15+
## You MUST edit your version.json like 1.7.2-Forge_10.12.2.1161.json and replace
16+
```"name": "org.ow2.asm:asm-all:4.1"```
17+
## to
18+
```"name": "org.ow2.asm:asm-all:5.0.3"```
19+
## in it to make the game launch !
1620

17-
You have to set B:enableMixinRenderItem=false and B:enableMixinItemRenderer=false if you have to use it.
21+
### Known issues:
1822

1923
Items with golden in its name like golden_horse_armor or golden_hoe didn't show with default name, you have to use the format below:
2024

@@ -24,4 +28,3 @@ texture=golden_hoe
2428
```
2529

2630
In the item's properties to make it working.
27-

build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,7 @@ try {
300300
}
301301
}
302302
catch (Exception ignored) {
303-
versionOverride = 'preview-1.7.10'
303+
versionOverride = 'preview-1.7.2'
304304
identifiedVersion = versionOverride
305305
}
306306
version = identifiedVersion
@@ -650,7 +650,7 @@ tasks.named("processResources", ProcessResources).configure {
650650
// replace stuff in mcmod.info, nothing else. replaces ${key} with value in text
651651
filesMatching("mcmod.info") {
652652
expand "minecraftVersion": project.minecraft.mcVersion,
653-
"modVersion": "preview-1.7.10",
653+
"modVersion": "preview-1.7.2",
654654
"modId": modId,
655655
"modName": modName
656656
}

dependencies.gradle

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,13 @@ dependencies {
3838
runtimeOnlyNonPublishable("com.github.GTNewHorizons:NotEnoughItems:2.4.13-GTNH:dev")
3939
//runtimeOnlyNonPublishable("com.github.GTNewHorizons:inventory-tweaks:1.6.0:dev")
4040
//runtimeOnlyNonPublishable deobf('https://github.com/Yoghurt4C/Audino/releases/download/1.0.1/Audino-1.0.1.jar')
41-
/*shadeCompile("org.spongepowered:mixin:0.7.11-SNAPSHOT") {
41+
shadeCompile("org.spongepowered:mixin:0.7.11-SNAPSHOT") {
4242
exclude module: 'launchwrapper'
4343
exclude module: 'guava'
4444
exclude module: 'gson'
4545
exclude module: 'commons-io'
4646
exclude module: 'log4j-core'
47-
}*/
47+
exclude module: 'LICENSE.txt'
48+
}
49+
compileOnly fileTree(dir: 'libs', include:'shadow.jar')
4850
}

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ apiPackage =
5959
# Specify the configuration file for Forge's access transformers here. It must be placed into /src/main/resources/META-INF/
6060
# There can be multiple files in a comma-separated list.
6161
# Example value: mymodid_at.cfg,nei_at.cfg
62-
accessTransformersFile = mcpatcherforge_at.cfg
62+
accessTransformersFile = cit_at.cfg
6363

6464
# Provides setup for Mixins if enabled. If you don't know what mixins are: Keep it disabled!
6565
usesMixins = true

libs/shadow.jar

2.57 KB
Binary file not shown.

src/main/java/com/prupe/mcpatcher/mal/resource/ResourceList.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import com.prupe.mcpatcher.MCLogger;
2424
import com.prupe.mcpatcher.MCPatcherUtils;
2525

26+
@SuppressWarnings("all")
2627
public class ResourceList {
2728

2829
private static final MCLogger logger = MCLogger.getLogger("Texture Pack");
@@ -110,7 +111,7 @@ private ResourceList(DefaultResourcePack resourcePack) {
110111
MCPatcherUtils.close(zipFile);
111112
}
112113
}
113-
Map<String, File> map = resourcePack.field_152781_b; // map
114+
Map<String, File> map = resourcePack.field_110606_b;
114115
if (map != null) {
115116
for (Map.Entry<String, File> entry : map.entrySet()) {
116117
String key = entry.getKey();
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
package mist475.mcpatcherforge.core;
2+
3+
import cpw.mods.fml.common.asm.transformers.AccessTransformer;
4+
import java.io.IOException;
5+
6+
public class CITAccessTransformer extends AccessTransformer {
7+
public CITAccessTransformer() throws IOException {
8+
super("cit_at.cfg");
9+
}
10+
}

src/main/java/mist475/mcpatcherforge/core/CITForgeCore.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
import java.util.Map;
1818

1919
@SuppressWarnings("all")
20-
@IFMLLoadingPlugin.TransformerExclusions("mist475.mcpatcherforge.core")
21-
@IFMLLoadingPlugin.SortingIndex(Integer.MIN_VALUE + 5)
20+
//@IFMLLoadingPlugin.TransformerExclusions("mist475.mcpatcherforge.core")
21+
//@IFMLLoadingPlugin.SortingIndex(Integer.MIN_VALUE + 5)
2222
public class CITForgeCore implements IFMLLoadingPlugin {
2323

2424
public static final Logger log = LogManager.getLogger("MCPatcher");
@@ -76,6 +76,6 @@ public void injectData(Map<String, Object> data) {}
7676

7777
@Override
7878
public String getAccessTransformerClass() {
79-
return null;
79+
return "mist475.mcpatcherforge.core.CITAccessTransformer";
8080
}
8181
}

src/main/java/mist475/mcpatcherforge/mixins/client/MixinMinecraft.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,9 @@
2020
public abstract class MixinMinecraft{
2121

2222
@Inject(
23-
method = "<init>(Lnet/minecraft/util/Session;IIZZLjava/io/File;Ljava/io/File;Ljava/io/File;Ljava/net/Proxy;Ljava/lang/String;Lcom/google/common/collect/Multimap;Ljava/lang/String;)V",
23+
method = "<init>(Lnet/minecraft/util/Session;IIZZLjava/io/File;Ljava/io/File;Ljava/io/File;Ljava/net/Proxy;Ljava/lang/String;)V",
2424
at = @At("RETURN"))
25-
private void modifyConstructor(Session sessionIn, int displayWidth, int displayHeight, boolean fullscreen,
26-
boolean isDemo, File dataDir, File assetsDir, File resourcePackDir, Proxy proxy, String version,
27-
Multimap<String, String> twitchDetails, String assetsJsonVersion, CallbackInfo ci) {
25+
private void modifyConstructor(Session sessionIn, int displayWidth, int displayHeight, boolean fullscreen, boolean isDemo, File dataDir, File assetsDir, File resourcePackDir, Proxy proxy, String version, CallbackInfo ci) {
2826
MCPatcherUtils.setMinecraft(dataDir);
2927
}
3028

0 commit comments

Comments
 (0)