From 29ba1a249cde61d15ed15035a47c74d8045fd002 Mon Sep 17 00:00:00 2001 From: etianl <115842502+etianl@users.noreply.github.com> Date: Sun, 30 Oct 2022 14:20:28 -0700 Subject: [PATCH] Add files via upload --- README.md | 4 +- gradle.properties | 2 +- .../java/pwn/noobs/trouserstreak/Trouser.java | 1 + .../mixin/InventoryScreenMixin.java | 37 +++++++++++++++ .../trouserstreak/modules/DupeModule.java | 46 +++++++++++++++++++ src/main/resources/streak.mixins.json | 3 +- 6 files changed, 90 insertions(+), 3 deletions(-) create mode 100644 src/main/java/pwn/noobs/trouserstreak/mixin/InventoryScreenMixin.java create mode 100644 src/main/java/pwn/noobs/trouserstreak/modules/DupeModule.java diff --git a/README.md b/README.md index da298dfef..2dc427bdc 100644 --- a/README.md +++ b/README.md @@ -11,6 +11,7 @@ - [GriefWaffen](https://github.com/CuteNoobCodes/GriefWaffen-public) - [Frostburn Client](https://github.com/evaan/FrostBurn) - [Banana](https://github.com/Bennooo/banana-for-everyone) +- [1.17 Crafting Dupe](https://github.com/B2H990/NUMA-117-Crafting-Dupe/)

This modpack would not have been possible without you

@@ -24,7 +25,8 @@ - **ExplosionAura:** Spawns creepers at your position that explode as you move. Like a bigger, more laggy Nuker module for creative mode. The use of the module Velocity is recommended to avoid being thrown around. - **FireballClicker:** Shoots fireballs wherever you click (Credits to GriefWaffen) - **FireballRain+:** Rains whatever entities you desire from a list similar to Boom (Credits to Griefwaffen (Or Allah-Hack? I have reason to believe it came from there)) It used to only rain fireballs, but I didn't think that was fun enough so I added the things put in Boom. -- **HandOfGod:** Deletes the world around you as you fly. It deletes when you press forward, jump, or crouch. Operator status required. +- **HandOfGod:** Deletes the world around you as you fly, and as you click. It deletes when you press the directional keys, or when you click it fills with the specified block. Operator status required. +- **Inventory Dupe (1.17):** Duplicates things in your crafting slots when the module is enabled and the Dupe button is pressed in your inventory. (Credit to ItsVen and Da0neDatGotAway for original creation of the dupe, and to B2H990 for making the fabric mod.) - **Phase:** Allows you to phase through blocks vertically, and through thin blocks horizontally such as doors and world border (Credits to Meteor-Rejects) Please add this back it's not too terrible. - **ShulkerDupe:** Duplicates the contents of a shulker when opening. Only works on Vanilla, Forge, and Fabric servers 1.19 and below. Use multiconnect or viafabric (Credits to Allah-Hack) - **Voider:** Replaces the world from the top down (Credits to Allah-Hack) I only added options to set max and minimum height for voiding, and instead of just air it can do water and lava now too. diff --git a/gradle.properties b/gradle.properties index cfa3fce12..1522c9ec6 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,7 +6,7 @@ yarn_mappings=1.19.2+build.1 loader_version=0.14.9 # Mod Properties -mod_version=0.1.2 +mod_version=0.1.3 maven_group=pwn.noobs archives_base_name=trouser-streak diff --git a/src/main/java/pwn/noobs/trouserstreak/Trouser.java b/src/main/java/pwn/noobs/trouserstreak/Trouser.java index 597b825f8..0a4551422 100644 --- a/src/main/java/pwn/noobs/trouserstreak/Trouser.java +++ b/src/main/java/pwn/noobs/trouserstreak/Trouser.java @@ -31,6 +31,7 @@ public void onInitialize() { Modules.get().add(new Voider()); Modules.get().add(new HandOfGod()); Modules.get().add(new ExplosionAura()); + Modules.get().add(new DupeModule()); } @Override diff --git a/src/main/java/pwn/noobs/trouserstreak/mixin/InventoryScreenMixin.java b/src/main/java/pwn/noobs/trouserstreak/mixin/InventoryScreenMixin.java new file mode 100644 index 000000000..5d13348aa --- /dev/null +++ b/src/main/java/pwn/noobs/trouserstreak/mixin/InventoryScreenMixin.java @@ -0,0 +1,37 @@ +package pwn.noobs.trouserstreak.mixin; + +import meteordevelopment.meteorclient.systems.modules.Modules; +import pwn.noobs.trouserstreak.modules.*; +import net.minecraft.client.gui.screen.ingame.AbstractInventoryScreen; +import net.minecraft.client.gui.screen.ingame.InventoryScreen; +import net.minecraft.client.gui.screen.recipebook.RecipeBookProvider; +import net.minecraft.client.gui.widget.ButtonWidget; +import net.minecraft.entity.player.PlayerInventory; +import net.minecraft.screen.PlayerScreenHandler; +import net.minecraft.screen.slot.Slot; +import net.minecraft.screen.slot.SlotActionType; +import net.minecraft.text.Text; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + +@Mixin(InventoryScreen.class) +public abstract class InventoryScreenMixin extends AbstractInventoryScreen implements RecipeBookProvider { + public InventoryScreenMixin(PlayerScreenHandler container, PlayerInventory playerInventory, Text name) { + super(container, playerInventory, name); + } + + @Inject(method = {"init"}, at = { @At("TAIL") }) + protected void init(final CallbackInfo ci) { + if(Modules.get().isActive(DupeModule.class)) { + addDrawableChild(new ButtonWidget(x + 124, height / 2 - 24, 48, 20, Text.literal("1.17Dupe"), b -> dupe())); + } + } + + private void dupe() + { + Slot outputSlot = handler.slots.get(0); + onMouseClick(outputSlot, outputSlot.id, 0, SlotActionType.THROW); + } +} \ No newline at end of file diff --git a/src/main/java/pwn/noobs/trouserstreak/modules/DupeModule.java b/src/main/java/pwn/noobs/trouserstreak/modules/DupeModule.java new file mode 100644 index 000000000..6a5e07eb2 --- /dev/null +++ b/src/main/java/pwn/noobs/trouserstreak/modules/DupeModule.java @@ -0,0 +1,46 @@ +package pwn.noobs.trouserstreak.modules; + +import meteordevelopment.meteorclient.events.entity.DropItemsEvent; +import meteordevelopment.meteorclient.events.game.OpenScreenEvent; +import meteordevelopment.meteorclient.events.meteor.KeyEvent; +import meteordevelopment.meteorclient.events.meteor.MouseButtonEvent; +import meteordevelopment.meteorclient.events.packets.PacketEvent; +import meteordevelopment.meteorclient.events.world.TickEvent; +import meteordevelopment.meteorclient.mixin.CloseHandledScreenC2SPacketAccessor; +import meteordevelopment.meteorclient.mixin.HandledScreenAccessor; +import meteordevelopment.meteorclient.settings.*; +import meteordevelopment.meteorclient.systems.modules.Categories; +import meteordevelopment.meteorclient.systems.modules.Module; +import meteordevelopment.meteorclient.utils.Utils; +import meteordevelopment.meteorclient.utils.misc.Keybind; +import meteordevelopment.meteorclient.utils.misc.input.KeyAction; +import meteordevelopment.meteorclient.utils.network.MeteorExecutor; +import meteordevelopment.meteorclient.utils.player.*; +import meteordevelopment.orbit.EventHandler; +import net.minecraft.client.gui.screen.ingame.HandledScreen; +import net.minecraft.client.gui.screen.ingame.InventoryScreen; +import net.minecraft.entity.EquipmentSlot; +import net.minecraft.entity.LivingEntity; +import net.minecraft.item.ArmorItem; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.network.packet.c2s.play.CloseHandledScreenC2SPacket; +import net.minecraft.screen.GenericContainerScreenHandler; +import net.minecraft.screen.ScreenHandler; +import net.minecraft.screen.slot.Slot; +import net.minecraft.screen.slot.SlotActionType; +import org.lwjgl.glfw.GLFW; +import pwn.noobs.trouserstreak.Trouser; + +import java.util.List; +import java.util.concurrent.ThreadLocalRandom; + +public class DupeModule extends Module { + private final SettingGroup sgGeneral = settings.getDefaultGroup(); + + + public DupeModule() { + super(Trouser.Main, "1.17InventoryDupe", "Enable/Disable 1.17 InvDupe button."); + } + +} diff --git a/src/main/resources/streak.mixins.json b/src/main/resources/streak.mixins.json index 3a447c04a..1f5d09a8d 100644 --- a/src/main/resources/streak.mixins.json +++ b/src/main/resources/streak.mixins.json @@ -1,6 +1,6 @@ { "required": true, - "package": "pwn.noobs.trouserstreak.mixins", + "package": "pwn.noobs.trouserstreak.mixin", "compatibilityLevel": "JAVA_17", "client": [ ], @@ -8,5 +8,6 @@ "defaultRequire": 1 }, "mixins": [ + "InventoryScreenMixin" ] }