Skip to content

Commit 3acaa17

Browse files
thecatcorethecatcore
committed
Port to 1.5.1
1 parent 774c329 commit 3acaa17

6 files changed

Lines changed: 12 additions & 57 deletions

File tree

‎gradle.properties‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ org.gradle.jvmargs=-Xmx1G
44

55
# More versions available at: https://skyrising.xyz/legacy-quilt/
66
# Fabric Properties
7-
minecraft_version = 1.5
8-
yarn_mappings = 1.5+build.202204251912
7+
minecraft_version = 1.5.1
8+
yarn_mappings = 1.5.1+build.202204251912
99
loader_version = 0.13.3
1010

1111
# Legacy Fabric API

‎src/main/java/fr/catcore/fabricatedmodloader/mixin/modloader/client/class_1528Mixin.java‎

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -2,44 +2,19 @@
22

33
import modloader.ModLoader;
44
import net.minecraft.client.class_1528;
5-
import net.minecraft.client.class_584;
65
import org.spongepowered.asm.mixin.Mixin;
7-
import org.spongepowered.asm.mixin.Shadow;
86
import org.spongepowered.asm.mixin.injection.At;
97
import org.spongepowered.asm.mixin.injection.Inject;
10-
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
118
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
129

13-
import java.util.List;
14-
1510
@Mixin(class_1528.class)
1611
public class class_1528Mixin {
1712

18-
@Shadow
19-
private float field_5970;
20-
21-
@Shadow
22-
private float field_5972;
23-
24-
@Shadow
25-
private float field_5971;
26-
27-
@Shadow
28-
private float field_5973;
29-
3013
@Inject(method = "method_5195", cancellable = true, at = @At("HEAD"))
3114
private static void modLoaderGetCustomAnimationLogic(String string, CallbackInfoReturnable<class_1528> cir) {
3215
class_1528 texture = ModLoader.getCustomAnimationLogic(string);
3316
if (texture != null) {
3417
cir.setReturnValue(texture);
3518
}
3619
}
37-
38-
@Inject(method = "method_5193", at = @At("RETURN"))
39-
private void modLoader$method_5193(class_584 list, List i, int j, int k, int l, int bl, boolean par7, CallbackInfo ci) {
40-
this.field_5970 = this.field_5970 + 1.0E-4F;
41-
this.field_5971 = this.field_5971 - 1.0E-4F;
42-
this.field_5972 = this.field_5972 + 1.0E-4F;
43-
this.field_5973 = this.field_5973 - 1.0E-4F;
44-
}
4520
}

‎src/main/java/fr/catcore/fabricatedmodloader/mixin/modloader/client/class_535Mixin.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ public abstract class class_535Mixin {
2424
@Shadow
2525
public static boolean field_2047;
2626
private static final List<Integer> RENDER_BLOCKS = Lists.newArrayList(
27-
0, 31, 39, 4, 13, 1, 19, 23, 6,
28-
2, 3, 5, 8, 7, 9, 10, 27, 11, 32, 12,
29-
29, 30, 14, 15, 36, 37, 16, 17, 18, 20, 21, 24,
30-
33, 35, 25, 26, 28, 34, 38
27+
-1, 0, 4, 31, 1, 2, 20, 11, 39,
28+
5, 13, 9, 19, 23, 6, 3, 8, 7, 10, 27,
29+
32, 12, 29, 30, 14, 15, 36, 37, 16, 17,
30+
18, 21, 24, 33, 35, 25, 26, 28, 34, 38
3131
);
3232

3333
@Inject(method = "method_1458", at = @At("RETURN"), cancellable = true)
@@ -48,7 +48,7 @@ private void modLoaderRenderWorldBlock(Block block, int i, int j, int k, Callbac
4848
)
4949
private void modLoaderRenderInvBlock(Block block, int i, float f, CallbackInfo ci) {
5050
int var6 = block.getBlockType();
51-
if (var6 != 0 && var6 != 31 && var6 != 16 && var6 != 26) {
51+
if (var6 != 0 && var6 != 31 && var6 != 39 && var6 != 16 && var6 != 26) {
5252
if (!RENDER_BLOCKS_INV.contains(var6)) {
5353
ModLoader.renderInvBlock((class_535) (Object) this, block, i, var6);
5454
ci.cancel();

‎src/main/java/modloader/ModLoader.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ public final class ModLoader {
9898
private static final Map<String, BaseMod> packetChannels = new HashMap<>();
9999
public static final Properties props = new Properties();
100100
private static Biome[] standardBiomes;
101-
public static final String VERSION = "ModLoader 1.5";
101+
public static final String VERSION = "ModLoader 1.5.1";
102102
private static class_469 clientHandler = null;
103103
private static final List<Command> commandList = new LinkedList<>();
104104
private static final Map<Integer, List<TradeEntry>> tradeItems = new HashMap<>();
@@ -534,8 +534,8 @@ private static void init() {
534534
logger.addHandler(logHandler);
535535
}
536536

537-
Log.debug(Constants.MODLOADER_LOG_CATEGORY, "ModLoader 1.5 Initializing...");
538-
Log.info(Constants.MODLOADER_LOG_CATEGORY, "ModLoader 1.5 Initializing...");
537+
Log.debug(Constants.MODLOADER_LOG_CATEGORY, "ModLoader 1.5.1 Initializing...");
538+
Log.info(Constants.MODLOADER_LOG_CATEGORY, "ModLoader 1.5.1 Initializing...");
539539
addModsToClassPath();
540540
sortModList();
541541

@@ -1481,7 +1481,7 @@ public static String getCrashReport() {
14811481
sb.append("Mods loaded: ");
14821482
sb.append(getLoadedMods().size() + 1);
14831483
sb.append('\n');
1484-
sb.append("ModLoader 1.5");
1484+
sb.append("ModLoader 1.5.1");
14851485
sb.append('\n');
14861486

14871487
for (BaseMod mod : (List<BaseMod>) getLoadedMods()) {

‎src/main/resources/fabric.mod.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,6 @@
2626
],
2727
"depends": {
2828
"fabricloader": ">=0.13.0",
29-
"minecraft": "1.5"
29+
"minecraft": "1.5.1"
3030
}
3131
}

‎src/main/resources/fabricated-modloader.accesswidener‎

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -22,22 +22,15 @@ accessible field net/minecraft/client/class_535 field_2056 I
2222
accessible field net/minecraft/client/class_535 field_2057 I
2323
accessible field net/minecraft/client/class_535 field_2058 Z
2424
accessible field net/minecraft/client/class_535 field_2066 F
25-
accessible field net/minecraft/client/class_535 field_22483 F
26-
accessible field net/minecraft/client/class_535 field_22484 F
2725
accessible field net/minecraft/client/class_535 field_2067 F
2826
accessible field net/minecraft/client/class_535 field_2068 F
29-
accessible field net/minecraft/client/class_535 field_22500 F
3027
accessible field net/minecraft/client/class_535 field_2069 F
3128
accessible field net/minecraft/client/class_535 field_2070 F
3229
accessible field net/minecraft/client/class_535 field_2071 F
3330
accessible field net/minecraft/client/class_535 field_1983 F
3431
accessible field net/minecraft/client/class_535 field_1984 F
35-
accessible field net/minecraft/client/class_535 field_22485 F
3632
accessible field net/minecraft/client/class_535 field_1985 F
37-
accessible field net/minecraft/client/class_535 field_22481 F
38-
accessible field net/minecraft/client/class_535 field_22482 F
3933
accessible field net/minecraft/client/class_535 field_1986 F
40-
accessible field net/minecraft/client/class_535 field_22486 F
4134
accessible field net/minecraft/client/class_535 field_1987 F
4235
accessible field net/minecraft/client/class_535 field_1988 F
4336
accessible field net/minecraft/client/class_535 field_1989 F
@@ -68,7 +61,6 @@ accessible field net/minecraft/client/class_535 field_2029 I
6861
accessible field net/minecraft/client/class_535 field_2030 I
6962
accessible field net/minecraft/client/class_535 field_2031 I
7063
accessible field net/minecraft/client/class_535 field_2032 I
71-
accessible field net/minecraft/client/class_535 field_22499 I
7264
accessible field net/minecraft/client/class_535 field_2034 I
7365
accessible field net/minecraft/client/class_535 field_2035 I
7466
accessible field net/minecraft/client/class_535 field_2036 I
@@ -85,18 +77,6 @@ accessible field net/minecraft/client/class_535 field_2046 F
8577
accessible field net/minecraft/client/class_535 field_2005 F
8678
accessible field net/minecraft/client/class_535 field_2006 F
8779
accessible field net/minecraft/client/class_535 field_2007 F
88-
accessible field net/minecraft/client/class_535 field_22487 Z
89-
accessible field net/minecraft/client/class_535 field_22488 Z
90-
accessible field net/minecraft/client/class_535 field_22489 Z
91-
accessible field net/minecraft/client/class_535 field_22490 Z
92-
accessible field net/minecraft/client/class_535 field_22491 Z
93-
accessible field net/minecraft/client/class_535 field_22492 Z
94-
accessible field net/minecraft/client/class_535 field_22493 Z
95-
accessible field net/minecraft/client/class_535 field_22494 Z
96-
accessible field net/minecraft/client/class_535 field_22495 Z
97-
accessible field net/minecraft/client/class_535 field_22496 Z
98-
accessible field net/minecraft/client/class_535 field_22497 Z
99-
accessible field net/minecraft/client/class_535 field_22498 Z
10080
accessible method net/minecraft/client/class_535 method_1488 (Lnet/minecraft/block/Block;III)Z
10181
accessible method net/minecraft/client/class_535 method_1435 (Lnet/minecraft/block/BrewingStandBlock;III)Z
10282
accessible method net/minecraft/client/class_535 method_1436 (Lnet/minecraft/block/CauldronBlock;III)Z

0 commit comments

Comments
 (0)