Skip to content

Commit

Permalink
1.19.3 update :D
Browse files Browse the repository at this point in the history
  • Loading branch information
etianl authored Dec 16, 2022
1 parent 43cfd97 commit bdf875e
Show file tree
Hide file tree
Showing 10 changed files with 54 additions and 33 deletions.
5 changes: 3 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,8 @@ It can also retrieve arrows and items from a distance if you shoot in that direc
- AutoMountain can cause damage once in a while and I'm not sure why. Be prepared to die in the name of mountain building. (it is really rare though)
- TPFly can hurt you once in a while on disable. I tried to prevent this. You also rubberband if going toward a block because it attempts to teleport you through it.
- Adjusting TPFly antikick values while flying can be deadly
- Normal Mode antikick for the velocity flight mode that I added can cause damage once in a while for an unknown reason.

## Requirements:
- Latest full build of Meteor-Client
- Don't forget to update any other mods you are using if it's still crashing
- Latest dev build of Meteor-Client
- Don't forget to update any other mods you are using if it's still crashing
11 changes: 3 additions & 8 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,9 @@ version = project.mod_version
group = project.maven_group

repositories {
maven {
name = "meteor-maven"
url = "https://maven.meteordev.org/releases"
}
maven {
name = "meteor-maven-snapshots"
url = "https://maven.meteordev.org/snapshots"
}
mavenCentral()
maven { url "https://maven.meteordev.org/releases"}
maven { url "https://maven.meteordev.org/snapshots" }
}

dependencies {
Expand Down
10 changes: 5 additions & 5 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
org.gradle.jvmargs=-Xmx2G

# Fabric (https://fabricmc.net/versions.html)
minecraft_version=1.19.2
yarn_mappings=1.19.2+build.9
loader_version=0.14.9
minecraft_version=1.19.3
yarn_mappings=1.19.3+build.3
loader_version=0.14.11

# Mod Properties
mod_version=0.2.6
mod_version=0.2.6-1.19.3
maven_group=pwn.noobs
archives_base_name=trouser-streak

# Dependency Versionsz

# Meteor (https://maven.meteordev.org/)
meteor_version=0.5.1
meteor_version=0.5.2-SNAPSHOT
1 change: 0 additions & 1 deletion settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ pluginManagement {
name = 'Fabric'
url = 'https://maven.fabricmc.net/'
}
mavenCentral()
gradlePluginPortal()
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,11 @@ public InventoryScreenMixin(PlayerScreenHandler container, PlayerInventory playe
@Inject(method = {"init"}, at = { @At("TAIL") })
protected void init(final CallbackInfo ci) {
if(Modules.get().isActive(InvDupeModule.class)) {
addDrawableChild(new ButtonWidget(x + 124, height / 2 - 24, 48, 20, Text.literal("1.17Dupe"), b -> dupe()));
addDrawableChild(new ButtonWidget.Builder(Text.literal("1.17Dupe"), button -> dupe())
.position(x + 124, height / 2 - 24)
.size( 48, 20)
.build()
);
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,38 +21,53 @@ protected InventoryScreenMixinBow(Text title){
@Inject(method = "init", at = @At("HEAD"))
public void onInit(CallbackInfo ci){
if(Modules.get().isActive(InstantKill.class)) {
ButtonWidget toggle = new ButtonWidget(1, 1, 90, 12, Text.of("MovePackets: " + (InstantKill.shouldAddVelocity0 ? "50" : "OFF")), b -> {
ButtonWidget toggle = new ButtonWidget.Builder(Text.of("MovePackets: " + (InstantKill.shouldAddVelocity0 ? "50" : "OFF")), b -> {
InstantKill.shouldAddVelocity0 = !InstantKill.shouldAddVelocity0;
InstantKill.mc.setScreen(new InventoryScreen(InstantKill.mc.player));
});
})
.position(1, 1)
.size(90, 12)
.build();
this.addDrawableChild(toggle);
}
if(Modules.get().isActive(InstantKill.class)) {
ButtonWidget toggle = new ButtonWidget(1, 13, 90, 12, Text.of("MovePackets: " + (InstantKill.shouldAddVelocity ? "100" : "OFF")), b -> {
ButtonWidget toggle = new ButtonWidget.Builder(Text.of("MovePackets: " + (InstantKill.shouldAddVelocity ? "100" : "OFF")), b -> {
InstantKill.shouldAddVelocity = !InstantKill.shouldAddVelocity;
InstantKill.mc.setScreen(new InventoryScreen(InstantKill.mc.player));
});
})
.position(1, 13)
.size(90, 12)
.build();
this.addDrawableChild(toggle);
}
if(Modules.get().isActive(InstantKill.class)) {
ButtonWidget toggle = new ButtonWidget(1, 25, 90, 12, Text.of("MovePackets: " + (InstantKill.shouldAddVelocity1 ? "150" : "OFF")), b -> {
ButtonWidget toggle = new ButtonWidget.Builder(Text.of("MovePackets: " + (InstantKill.shouldAddVelocity1 ? "150" : "OFF")), b -> {
InstantKill.shouldAddVelocity1 = !InstantKill.shouldAddVelocity1;
InstantKill.mc.setScreen(new InventoryScreen(InstantKill.mc.player));
});
})
.position(1, 25)
.size(90, 12)
.build();
this.addDrawableChild(toggle);
}
if(Modules.get().isActive(InstantKill.class)) {
ButtonWidget toggle = new ButtonWidget(1, 37, 90, 12, Text.of("MovePackets: " + (InstantKill.shouldAddVelocity2 ? "200" : "OFF")), b -> {
ButtonWidget toggle = new ButtonWidget.Builder(Text.of("MovePackets: " + (InstantKill.shouldAddVelocity2 ? "200" : "OFF")), b -> {
InstantKill.shouldAddVelocity2 = !InstantKill.shouldAddVelocity2;
InstantKill.mc.setScreen(new InventoryScreen(InstantKill.mc.player));
});
})
.position(1, 37)
.size(90, 12)
.build();
this.addDrawableChild(toggle);
}
if(Modules.get().isActive(InstantKill.class)) {
ButtonWidget toggle = new ButtonWidget(1, 49, 90, 12, Text.of("MovePackets: " + (InstantKill.shouldAddVelocity3 ? "300" : "OFF")), b -> {
ButtonWidget toggle = new ButtonWidget.Builder(Text.of("MovePackets: " + (InstantKill.shouldAddVelocity3 ? "300" : "OFF")), b -> {
InstantKill.shouldAddVelocity3 = !InstantKill.shouldAddVelocity3;
InstantKill.mc.setScreen(new InventoryScreen(InstantKill.mc.player));
});
})
.position(1, 49)
.size(90, 12)
.build();
this.addDrawableChild(toggle);
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ protected LecternScreenMixin(Text title) {
@Inject(at = @At("TAIL"), method = "init")
public void init(CallbackInfo ci) {
if(Modules.get().isActive(LecternCrash.class)){
this.addDrawableChild(new ButtonWidget(5, 25, 100, 20, Text.of("CrashServer"), (button) -> {
this.addDrawableChild(new ButtonWidget.Builder(Text.of("CrashServer"), (button) -> {
ScreenHandler screenHandler = client.player.currentScreenHandler;
DefaultedList<Slot> defaultedList = screenHandler.slots;
int i = defaultedList.size();
Expand All @@ -55,7 +55,15 @@ public void init(CallbackInfo ci) {
((ClientConnectionAccessor) client.getNetworkHandler().getConnection()).getChannel().writeAndFlush(new ClickSlotC2SPacket(client.player.currentScreenHandler.syncId, client.player.currentScreenHandler.getRevision(), 0, 0, SlotActionType.QUICK_MOVE, client.player.currentScreenHandler.getCursorStack().copy(), int2ObjectMap));
client.player.sendMessage(Text.of("Crashing Server..."), false);
button.active = false;
}));
})
.position(5, 25)
.size(100, 20)
.build()
);




}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -592,7 +592,7 @@ private boolean isRedstoneBlock(Block block) {
block instanceof RedstoneWireBlock ||
block instanceof ComparatorBlock ||
block instanceof RepeaterBlock ||
block instanceof AbstractButtonBlock ||
block instanceof ButtonBlock ||
block instanceof DetectorRailBlock ||
block instanceof LeverBlock ||
block instanceof SculkSensorBlock ||
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
import net.minecraft.item.Item;
import net.minecraft.item.Items;
import net.minecraft.network.packet.s2c.play.EntityStatusS2CPacket;
import net.minecraft.tag.FluidTags;
import net.minecraft.util.hit.BlockHitResult;
import net.minecraft.util.hit.HitResult;
import net.minecraft.util.math.BlockPos;
Expand Down Expand Up @@ -100,7 +99,7 @@ public static int getBlockBreakingSpeed(BlockState block, BlockPos pos, int slot
f *= k;
}

if (player.isSubmergedIn(FluidTags.WATER) && !EnchantmentHelper.hasAquaAffinity(player)) {
if (player.isSubmergedInWater() && !EnchantmentHelper.hasAquaAffinity(player)) {
f /= 5.0F;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ public static Direction getPlaceSide(BlockPos blockPos) {
public static boolean isClickable(Block block) {
return block instanceof CraftingTableBlock
|| block instanceof AnvilBlock
|| block instanceof AbstractButtonBlock
|| block instanceof ButtonBlock
|| block instanceof AbstractPressurePlateBlock
|| block instanceof BlockWithEntity
|| block instanceof BedBlock
Expand Down

0 comments on commit bdf875e

Please sign in to comment.