Skip to content

Commit

Permalink
drop support for mc1.19.2 and mc1.19.3
Browse files Browse the repository at this point in the history
  • Loading branch information
Fallen-Breath committed Jun 26, 2024
1 parent 61281bd commit ace065d
Show file tree
Hide file tree
Showing 19 changed files with 11 additions and 108 deletions.
8 changes: 2 additions & 6 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@ preprocess {
def mc116 = createNode('1.16.5', 1_16_05, '')
def mc117 = createNode('1.17.1', 1_17_01, '')
def mc118 = createNode('1.18.2', 1_18_02, '')
def mc1192 = createNode('1.19.2', 1_19_02, '') // TODO: drop support when mc1.21 is out
def mc1193 = createNode('1.19.3', 1_19_03, '') // TODO: drop support when mc1.21 is out
def mc1194 = createNode('1.19.4', 1_19_04, '')
def mc1201 = createNode('1.20.1', 1_20_01, '')
def mc1202 = createNode('1.20.2', 1_20_02, '')
Expand All @@ -30,10 +28,8 @@ preprocess {
mc115.link(mc116, file('versions/mapping-1.15-1.16.txt'))
mc116.link(mc117, file('versions/mapping-1.16-1.17.txt'))
mc117.link(mc118, file('versions/mapping-1.17-1.18.txt'))
mc118.link(mc1192, file('versions/mapping-1.18-1.19.txt'))
mc1192.link(mc1193, file('versions/mapping-1.19.2-1.19.3.txt'))
mc1193.link(mc1194, file('versions/mapping-1.19.3-1.19.4.txt'))
mc1194.link(mc1201, file('versions/mapping-1.19.4-1.20.1.txt'))
mc118.link(mc1194, file('versions/mapping-1.18-1.19.txt'))
mc1194.link(mc1201, file('versions/mapping-1.19-1.20.1.txt'))
mc1201.link(mc1202, file('versions/mapping-1.20.1-1.20.2.txt'))
mc1202.link(mc1204, file('versions/mapping-1.20.2-1.20.4.txt'))
mc1204.link(mc1206, file('versions/mapping-1.20.4-1.20.6.txt'))
Expand Down
2 changes: 0 additions & 2 deletions settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@
"1.16.5",
"1.17.1",
"1.18.2",
"1.19.2",
"1.19.3",
"1.19.4",
"1.20.1",
"1.20.2",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,6 @@ private void legacyF3NLogic(CallbackInfoReturnable<Boolean> cir)
Consumer<String> commandSender =
//#if MC >= 11903
//$$ this.client.player.networkHandler::sendCommand;
//#elseif MC >= 11900
//$$ this.client.player::sendCommand;
//#else
cmd -> this.client.player.sendChatMessage("/" + cmd);
//#endif
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -229,8 +229,6 @@ public DamageCalculator applyArmorAndResistanceAndEnchantment()
if (amount > 0.0F && !(
//#if MC >= 11904
//$$ this.damageSource.isIn(DamageTypeTags.BYPASSES_ENCHANTMENTS)
//#elseif MC >= 11902
//$$ this.damageSource.bypassesProtection()
//#else
false
//#endif
Expand Down
37 changes: 0 additions & 37 deletions versions/1.19.2/gradle.properties

This file was deleted.

3 changes: 0 additions & 3 deletions versions/1.19.2/tweakermore.accesswidener

This file was deleted.

37 changes: 0 additions & 37 deletions versions/1.19.3/gradle.properties

This file was deleted.

4 changes: 0 additions & 4 deletions versions/1.19.3/tweakermore.accesswidener

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.item.FireworkRocketItem;
import net.minecraft.item.ItemStack;
import net.minecraft.network.Packet;
import net.minecraft.network.packet.Packet;
import net.minecraft.util.ActionResult;
import net.minecraft.util.Hand;
import org.apache.commons.lang3.mutable.MutableObject;
Expand Down Expand Up @@ -116,7 +116,7 @@ private boolean checkCooldown(PlayerEntity player, Hand hand)
method = "sendSequencedPacket",
at = @At(
value = "INVOKE",
target = "Lnet/minecraft/client/network/SequencedPacketCreator;predict(I)Lnet/minecraft/network/Packet;",
target = "Lnet/minecraft/client/network/SequencedPacketCreator;predict(I)Lnet/minecraft/network/packet/Packet;",
shift = At.Shift.AFTER
),
cancellable = true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,7 @@
public abstract class WorldRendererMixin
{
@ModifyExpressionValue(
//#if MC >= 11904
//$$ method = "hasBlindnessOrDarkness",
//#else
method = "method_43788",
//#endif
method = "hasBlindnessOrDarkness",
at = @At(
value = "INVOKE",
//#if MC >= 12006
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -133,11 +133,9 @@ private TooltipPositioner fixHoverTextScale_modifyPositioner(TooltipPositioner p
int screenHeight = screen.height;
//#endif

//#if MC >= 11904
//$$ // see vanilla: net.minecraft.client.gui.tooltip.HoveredTooltipPositioner#getPosition
//$$ x += 12;
//$$ y -= 12;
//#endif
// see vanilla: net.minecraft.client.gui.tooltip.HoveredTooltipPositioner#getPosition
x += 12;
y -= 12;

if (x + width * scale > screenWidth)
{
Expand Down
3 changes: 3 additions & 0 deletions versions/mapping-1.18-1.19.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
net.minecraft.text.BaseText net.minecraft.text.MutableText
net.minecraft.util.math.Matrix4f org.joml.Matrix4f
net.minecraft.util.math.Vec3f org.joml.Vector3f
net.minecraft.util.registry.Registry net.minecraft.registry.Registries

net.fabricmc.fabric.api.client.command.v1.ClientCommandManager net.fabricmc.fabric.api.client.command.v2.ClientCommandManager
net.fabricmc.fabric.api.client.command.v1.FabricClientCommandSource net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource
File renamed without changes.
3 changes: 0 additions & 3 deletions versions/mapping-1.19.2-1.19.3.txt

This file was deleted.

Empty file removed versions/mapping-1.19.4-1.20.1.txt
Empty file.

0 comments on commit ace065d

Please sign in to comment.