Skip to content

Commit fb1c496

Browse files
committed
fixed the block rotation for older babric loaders
1 parent 751ec70 commit fb1c496

5 files changed

Lines changed: 39 additions & 1 deletion

File tree

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ loom_version = 1.13.0-bta
1919
java_version = 8
2020
##########################################################################
2121
# Mod Properties
22-
mod_version = 1.1.3+7.3_04
22+
mod_version = 1.1.4+7.3_04
2323
mod_group = redart15
2424
mod_name = Commandly
2525
##########################################################################

src/main/java/redart15/commandly/CommandlyMod.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import net.fabricmc.api.ModInitializer;
44
import net.fabricmc.loader.api.FabricLoader;
55
import net.fabricmc.loader.api.entrypoint.EntrypointContainer;
6+
import net.fabricmc.loader.impl.FabricLoaderImpl;
67
import net.minecraft.core.data.gamerule.GameRuleBoolean;
78
import net.minecraft.core.data.gamerule.GameRules;
89
import org.slf4j.Logger;
@@ -21,6 +22,7 @@ public class CommandlyMod implements ModInitializer, RecipeEntrypoint, GameStart
2122
public static final GameRuleBoolean MOSS_SPREADING = GameRules.register(new GameRuleBoolean("doMossSpreading", true));
2223
public static final GameRuleBoolean GRASS_SPREADING = GameRules.register(new GameRuleBoolean("doGrassSpreading", true));
2324
public static final GameRuleBoolean VEINMINING = GameRules.register(new GameRuleBoolean("veinmining", false));
25+
public static final String loaderVersion = FabricLoaderImpl.VERSION;
2426

2527
@Override
2628
public void onInitialize() {

src/main/java/redart15/commandly/CommandlyPreLaunch.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@ public class CommandlyPreLaunch implements PreLaunchEntrypoint {
1111
public void onPreLaunch() {
1212
CommandlyConfig.init();
1313
// need to be present before any mixins are done
14+
if(!CommandlyMod.loaderVersion.equalsIgnoreCase("0.17.3-bta.8")){
15+
Mixins.addConfiguration("addon/oldfabric.mixin.json");
16+
LOGGER.info("Smart veinminer loaded.");
17+
}
1418
if(CommandlyConfig.SMART_VEINMINER){
1519
Mixins.addConfiguration("addon/veinminer.mixin.json");
1620
LOGGER.info("Smart veinminer loaded.");
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
package redart15.commandly.mixins.oldfabric;
2+
3+
import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
4+
import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
5+
import net.minecraft.client.render.block.model.BlockModelAxisAligned;
6+
import net.minecraft.core.world.WorldSource;
7+
import org.spongepowered.asm.mixin.Mixin;
8+
import org.spongepowered.asm.mixin.injection.At;
9+
10+
@Mixin(value = BlockModelAxisAligned.class, remap = false)
11+
public class BlockModelAxisAlignedMixinFixOldBabric {
12+
13+
@WrapOperation(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/core/world/WorldSource;getBlockMetadata(III)I"))
14+
public int fixedMetadata(WorldSource instance, int x, int y, int z, Operation<Integer> original){
15+
int metadata = original.call(instance, x, y, z);
16+
return metadata & 3;
17+
}
18+
}
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
{
2+
"required": true,
3+
"minVersion": "0.8",
4+
"package": "redart15.commandly.mixins.oldfabric",
5+
"compatibilityLevel": "JAVA_8",
6+
"mixins": [
7+
],
8+
"client": [
9+
"BlockModelAxisAlignedMixinFixOldBabric"
10+
],
11+
"injectors": {
12+
"defaultRequire": 1
13+
}
14+
}

0 commit comments

Comments
 (0)