Skip to content

Commit

Permalink
Backport all current features to 1.18.2.
Browse files Browse the repository at this point in the history
  • Loading branch information
enjarai committed Aug 25, 2022
1 parent 76489f9 commit 5123a0a
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 19 deletions.
2 changes: 0 additions & 2 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,6 @@ jobs:

game-versions: |
${{ steps.minecraft_version.outputs.value }}
1.19.1
1.19.2
java: |
17
18
Expand Down
20 changes: 10 additions & 10 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
org.gradle.jvmargs=-Xmx1G

minecraft_version=1.19
yarn_mappings=1.19+build.4
minecraft_version=1.18.2
yarn_mappings=1.18.2+build.4
loader_version=0.14.8

release_fancyname = 1.2.0 for 1.19.x
mod_version = 1.2.0+1.19
release_fancyname = 1.2.0 for 1.18.2
mod_version = 1.2.0+1.18
maven_group = nl.enjarai
archives_base_name = do-a-barrel-roll

fabric_version=0.58.0+1.19
modmenu_version=4.0.4
cloth_config_version=8.0.75
spruceui_version=4.0.0+1.19
midnightlib_version=0.5.2
midnightcontrols_version=1.5.0+1.19
fabric_version=0.58.0+1.18.2
modmenu_version=3.2.3
cloth_config_version=6.2.62
spruceui_version=3.3.3+1.18
midnightlib_version=0.4.4
midnightcontrols_version=1.5.0+1.18
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import com.mojang.blaze3d.platform.GlStateManager;
import com.mojang.blaze3d.systems.RenderSystem;
import net.minecraft.client.gui.DrawableHelper;
import net.minecraft.client.render.*;
import net.minecraft.client.util.math.MatrixStack;
import net.minecraft.util.math.Vec2f;
Expand Down Expand Up @@ -31,7 +32,8 @@ public static void render(MatrixStack matrices, int scaledWidth, int scaledHeigh
bufferBuilder.vertex(matrix, (float) x + 1, (float) y + 1, 0.0F).color(color).next();
bufferBuilder.vertex(matrix, (float) x + 1, (float) y, 0.0F).color(color).next();
bufferBuilder.vertex(matrix, (float) x, (float) y, 0.0F).color(color).next();
BufferRenderer.drawWithShader(bufferBuilder.end());
bufferBuilder.end();
BufferRenderer.draw(bufferBuilder);

});
RenderSystem.enableTexture();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,22 +7,20 @@
import net.minecraft.client.network.ClientPlayerEntity;
import net.minecraft.client.recipebook.ClientRecipeBook;
import net.minecraft.client.world.ClientWorld;
import net.minecraft.network.encryption.PlayerPublicKey;
import net.minecraft.stat.StatHandler;
import nl.enjarai.doabarrelroll.DoABarrelRollClient;
import nl.enjarai.doabarrelroll.ElytraMath;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;

@Mixin(ClientPlayerEntity.class)
public abstract class ClientPlayerEntityMixin extends AbstractClientPlayerEntity {

@Shadow public abstract float getYaw(float tickDelta);

public ClientPlayerEntityMixin(ClientWorld world, GameProfile profile, PlayerPublicKey publicKey) { super(world, profile, publicKey); }
public ClientPlayerEntityMixin(ClientWorld world, GameProfile profile) {
super(world, profile);
}

@Inject(
method = "<init>(Lnet/minecraft/client/MinecraftClient;Lnet/minecraft/client/world/ClientWorld;Lnet/minecraft/client/network/ClientPlayNetworkHandler;Lnet/minecraft/stat/StatHandler;Lnet/minecraft/client/recipebook/ClientRecipeBook;ZZ)V",
Expand Down
3 changes: 2 additions & 1 deletion src/main/resources/fabric.mod.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,8 @@
],

"depends": {
"cloth-config": "*"
"cloth-config": "*",
"minecraft": "1.18.x"
},

"custom": {
Expand Down

0 comments on commit 5123a0a

Please sign in to comment.