Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
## **3.1.0**

`Trans Rights` :3 - truffle
`Trans Rights` :3 - truffle
i am in turkmenistan right now - jamils
8 changes: 7 additions & 1 deletion build.fabric.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,13 @@ val ploceus = if (ornithe) {

dependencies {
minecraft("com.mojang:minecraft:${sc.current.version}")
if (ornithe) mappings(ploceus!!.mcpMappings("stable", "1.8.9", "22"))
if (ornithe) {
mappings(ploceus!!.layeredMappings {
mappings("net.ornithemc:feather-gen2:${sc.current.version}+build.${sc.properties["versions.feather"]}:v2") {
containsUnpick()
}
})
}
implementation("net.fabricmc:fabric-loader:$fabricLoaderVersion")
implementation("org.polyfrost.oneconfig:${sc.current.version}-$environment:$oneconfigVersion")

Expand Down
1 change: 0 additions & 1 deletion src/main/java/at/yedel/yedelmod/YedelMod.java
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@ private void initialize() {
HudManager.register(new BountyHuntingHud(), new CustomTextHud());

Threading.scheduleRepeat(() -> {
//~ if modern 'Minecraft.getMinecraft().thePlayer' -> 'Minecraft.getInstance().player'
if (Minecraft.getInstance().player != null) {
YedelConfig.getInstance().playtimeMinutes++;
YedelConfig.getInstance().save();
Expand Down
13 changes: 5 additions & 8 deletions src/main/java/at/yedel/yedelmod/config/YedelConfig.java
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,6 @@
import at.yedel.yedelmod.features.major.EasyAtlasVerdicts;
import at.yedel.yedelmod.features.major.TNTTagFeatures;
import at.yedel.yedelmod.utils.Constants;
//? if legacy {
//import org.polyfrost.oneconfig.internal.legacy.InputConstants;
//?} else {
import com.mojang.blaze3d.platform.InputConstants;
//?}
import org.polyfrost.compose.render.PolyColor;
import org.polyfrost.oneconfig.api.config.v1.Config;
import org.polyfrost.oneconfig.api.config.v1.Node;
Expand All @@ -23,10 +18,12 @@
import org.polyfrost.oneconfig.utils.v1.dsl.ScreensKt;
import net.fabricmc.loader.api.FabricLoader;
//? if legacy {
//import net.minecraft.util.EnumParticleTypes;
//?} else {
/*import net.minecraft.entity.particle.ParticleType;
import org.polyfrost.oneconfig.internal.legacy.InputConstants;
*///?} else {
import net.minecraft.core.registries.BuiltInRegistries;
import net.minecraft.core.particles.ParticleTypes;
import com.mojang.blaze3d.platform.InputConstants;
//?}


Expand Down Expand Up @@ -148,7 +145,7 @@ public void open() {
*///?}
)
//? if legacy {
//public int customParticleTypeLegacy = EnumParticleTypes.NOTE.getParticleID();
//public int customParticleTypeLegacy = ParticleType.NOTE.getId();
//?} else {
public int customParticleTypeModern = BuiltInRegistries.PARTICLE_TYPE.getId(ParticleTypes.NOTE);
//?}
Expand Down
21 changes: 11 additions & 10 deletions src/main/java/at/yedel/yedelmod/features/CustomHitParticles.java
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,14 @@
//? if legacy {
/*import at.yedel.yedelmod.utils.NumberUtils;
import net.minecraft.block.Block;
import net.minecraft.block.Blocks;
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Blocks;
import net.minecraft.init.Items;
import net.minecraft.entity.living.player.PlayerEntity;
import net.minecraft.entity.particle.ParticleType;
import net.minecraft.item.Item;
import net.minecraft.util.EnumParticleTypes;
*///?} else {
import net.minecraft.item.Items;

*///?} else {

import net.fabricmc.fabric.api.event.player.AttackEntityCallback;
import net.minecraft.core.BlockPos;
Expand Down Expand Up @@ -84,15 +85,15 @@ public void handleAttack(Entity entity) {
if (entity.isInvisible()) {
return;
}
//~ if modern 'instanceof EntityPlayer' -> 'instanceof Player'
//~ if modern 'instanceof PlayerEntity' -> 'instanceof Player'
if (YedelConfig.getInstance().onlySpawnCustomParticlesOnPlayers && !(entity instanceof Player)) {
return;
}
//? if legacy {
/*
int particleId =
YedelConfig.getInstance().randomParticleType ? (int) NumberUtils.randomRange(0, 41) : YedelConfig.getInstance().customParticleTypeLegacy;
EnumParticleTypes particle = EnumParticleTypes.getParticleFromId(particleId);
ParticleType particle = ParticleType.byId(particleId);
int parameters;
/^
Some particles take required parameters.
Expand All @@ -107,16 +108,16 @@ public void handleAttack(Entity entity) {

switch (particle) {
case ITEM_CRACK:
parameters = Item.getIdFromItem(Items.redstone);
parameters = Item.getId(Items.REDSTONE);
break;
case BLOCK_CRACK:
case BLOCK_DUST:
parameters = Block.getStateId(Blocks.redstone_ore.getDefaultState());
parameters = Block.serialize(Blocks.REDSTONE_ORE.defaultState());
break;
default:
parameters = 0;
}
Minecraft.getInstance().theWorld.spawnParticle(particle, true, entity.posX, entity.posY + YedelConfig.getInstance().particleYOffset, entity.posZ, 0, 0, 0, parameters);
Minecraft.getInstance().world.addParticle(particle, true, entity.x, entity.y + YedelConfig.getInstance().particleYOffset, entity.z, 0, 0, 0, parameters);

*///?} else {
position = entity.position();
Expand Down
7 changes: 5 additions & 2 deletions src/main/java/at/yedel/yedelmod/features/LimboCreative.java
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@


import at.yedel.yedelmod.config.YedelConfig;
import org.polyfrost.oneconfig.api.event.v1.EventManager;
import org.polyfrost.oneconfig.api.event.v1.events.WorldEvent;
import org.polyfrost.oneconfig.api.platform.v1.Platform;
import net.hypixel.modapi.HypixelModAPI;
import net.hypixel.modapi.packet.impl.clientbound.event.ClientboundLocationPacket;
Expand Down Expand Up @@ -35,6 +37,7 @@ private boolean isInLimbo() {

private LimboCreative() {
HypixelModAPI.getInstance().registerHandler(ClientboundLocationPacket.class, this::handleLocationPacket);
EventManager.register(WorldEvent.Unload.class, (event) -> inLimboServer = false);
}

private void handleLocationPacket(ClientboundLocationPacket packet) {
Expand All @@ -60,15 +63,15 @@ public void awardLimboCreative() {

private void giveCreative() {
//? if legacy {
//Minecraft.getInstance().playerController.setGameType(WorldSettings.GameType.CREATIVE);
//Minecraft.getInstance().interactionManager.setGameMode(WorldSettings.GameMode.CREATIVE);
//?} else
Minecraft.getInstance().gameMode.setLocalMode(GameType.CREATIVE);
Platform.compatibility().displayChatMessage(yedelogo + " §eSet gamemode to creative!");
}

private boolean isAlreadyInCreative() {
//? if legacy {
//return Minecraft.getInstance().playerController.isInCreativeMode();
//return Minecraft.getInstance().interactionManager.hasCreativeInventory();
//?} else
return Minecraft.getInstance().player.isCreative();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@

import at.yedel.yedelmod.config.YedelConfig;




import org.polyfrost.oneconfig.api.event.v1.events.ChatEvent;
import org.polyfrost.oneconfig.api.event.v1.events.PacketEvent;
import org.polyfrost.oneconfig.api.event.v1.events.WorldEvent;
Expand All @@ -16,10 +13,11 @@
import org.polyfrost.oneconfig.utils.v1.Multithreading;
import net.minecraft.client.Minecraft;
//? if legacy {
/*import net.minecraft.client.entity.EntityPlayerSP;
import net.minecraft.client.gui.inventory.GuiContainer;
/*import net.minecraft.client.entity.living.player.LocalClientPlayerEntity;
import net.minecraft.client.gui.screen.game.inventory.InventoryMenuScreen;
import net.minecraft.item.ItemStack;
import net.minecraft.network.play.server.S2FPacketSetSlot;
import net.minecraft.network.packet.s2c.play.InventoryMenuSlotContentS2CPacket;
import net.minecraft.network.packet.s2c.play.SelectSlotS2CPacket;
import at.yedel.yedelmod.mixins.legacy.InvokerMinecraft;
*///?} else {

Expand Down Expand Up @@ -80,17 +78,18 @@ public void submitEvidentWithoutDoubtVerdict() {
}
}
private void submitVerdict(String name) {
//~ if modern 'EntityPlayerSP player = Minecraft.getMinecraft().thePlayer' -> 'LocalPlayer player = Minecraft.getInstance().player'
//~ if modern 'LocalClientPlayerEntity' -> 'LocalPlayer'
LocalPlayer player = Minecraft.getInstance().player;
if (inAtlas && player != null) {
Platform.compatibility().displayChatMessage(yedelogo + " §eSubmitting an Atlas verdict for \"" + name + "\"...");
//~ if modern 'player.inventory.currentItem = 7' -> 'player.getInventory().setSelectedSlot(7)'
// damn this would be easy with kotlin
//~ if modern 'player.inventory.selectedSlot = 7' -> 'player.getInventory().setSelectedSlot(7)'
player.getInventory().setSelectedSlot(7);
Multithreading.schedule(() -> {
if (Platform.screen().current() == null) {
verdict = name;
//? if legacy
//((InvokerMinecraft) Minecraft.getInstance()).yedelmod$rightClickMouse();
//((InvokerMinecraft) Minecraft.getInstance()).yedelmod$doUse();
//? else
Minecraft.getInstance().gameMode.useItem(Minecraft.getInstance().player, InteractionHand.MAIN_HAND);
}
Expand All @@ -100,11 +99,11 @@ private void submitVerdict(String name) {

@Subscribe
public void reallyClickAtlasVerdict(PacketEvent.Receive event) {
//~ if modern 'S2FPacketSetSlot' -> 'ClientboundContainerSetSlotPacket'
//~ if modern 'InventoryMenuSlotContentS2CPacket' -> 'ClientboundContainerSetSlotPacket'
if (inAtlas && event.getPacket() instanceof ClientboundContainerSetSlotPacket) {
//? if legacy {
/*S2FPacketSetSlot packet = (S2FPacketSetSlot) event.getPacket();
ItemStack item = packet.m_64707080();
/*InventoryMenuSlotContentS2CPacket packet = (InventoryMenuSlotContentS2CPacket) event.getPacket();
ItemStack item = packet.getItem();
if (item == null) return;
String itemName = Platform.i18n().getUnformattedText(item.getDisplayName());
*///?} else {
Expand All @@ -119,9 +118,9 @@ public void reallyClickAtlasVerdict(PacketEvent.Receive event) {
Multithreading.schedule(() -> {
Minecraft.getInstance().schedule(() -> {
//? if legacy {
/*if (Minecraft.getInstance().currentScreen instanceof GuiContainer) {
int windowId = ((GuiContainer) Minecraft.getInstance().currentScreen).inventorySlots.windowId;
Minecraft.getInstance().playerController.windowClick(windowId, packet.m_40505239(), 0, 0, Minecraft.getInstance().thePlayer);
/*if (Minecraft.getInstance().screen instanceof InventoryMenuScreen) {
int windowId = ((InventoryMenuScreen) Minecraft.getInstance().screen).menu.networkId;
Minecraft.getInstance().interactionManager.clickSlot(windowId, packet.getSlotId(), 0, 0, Minecraft.getInstance().player);
verdict = "";
}
*///?} else {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import at.yedel.yedelmod.utils.NameLineEvent;
import at.yedel.yedelmod.utils.NumberUtils;


import org.polyfrost.oneconfig.api.event.v1.events.TickEvent;
import com.google.common.collect.ImmutableMap;
import org.polyfrost.oneconfig.api.event.v1.events.ChatEvent;
Expand All @@ -14,7 +15,7 @@
import net.hypixel.modapi.HypixelModAPI;
import net.hypixel.modapi.packet.impl.clientbound.event.ClientboundLocationPacket;
//? if legacy {
//import net.minecraft.client.entity.AbstractClientPlayer;
//import net.minecraft.client.entity.living.player.ClientPlayerEntity;
//?} else {
import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
import net.minecraft.network.chat.Component;
Expand Down Expand Up @@ -125,10 +126,10 @@ public void renderStrengthIndicators(NameLineEvent event) {
&& event.isPlayer()
) {
//? if legacy
//AbstractClientPlayer player = event.getPlayer();
//ClientPlayerEntity player = event.getPlayer();
//? else
Player player = (Player) event.getEntity();
//~ if modern 'isUser' -> 'isLocalPlayer'
//~ if modern 'isLocal' -> 'isLocalPlayer'
if (!YedelConfig.getInstance().showSelfStrength && player.isLocalPlayer()) {
return;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
import at.yedel.yedelmod.utils.Constants;
import at.yedel.yedelmod.utils.NameLineEvent;


import org.polyfrost.oneconfig.api.event.v1.events.ChatEvent;
import org.polyfrost.oneconfig.api.event.v1.invoke.impl.Subscribe;

Expand All @@ -17,9 +16,7 @@
import net.hypixel.modapi.packet.impl.clientbound.event.ClientboundLocationPacket;
import net.minecraft.client.Minecraft;
//? if legacy {
/*
import net.minecraft.client.entity.AbstractClientPlayer;
import net.minecraft.client.network.NetworkPlayerInfo;
/*import net.minecraft.client.network.PlayerInfo;
import net.minecraft.entity.Entity;
*///?} else {
import net.minecraft.client.player.AbstractClientPlayer;
Expand Down Expand Up @@ -82,7 +79,7 @@ private void handleLocationPacket(ClientboundLocationPacket packet) {

public void onTNTTagJoin() {
if (YedelConfig.getInstance().enabled && YedelConfig.getInstance().bountyHunting) {
//~ if modern 'thePlayer' -> 'getUser()'
//~ if modern '.player' -> '.getUser()'
playerName = Minecraft.getInstance().getUser().getName();
dead = false;
target = null;
Expand All @@ -103,8 +100,9 @@ public void handleRoundStarted(ChatEvent.Receive event) {
if (inTNTTag && event.getFullyUnformattedMessage().endsWith("has started!")) {
players.clear();
//? if legacy {
/*for (NetworkPlayerInfo playerInfo : Minecraft.getInstance().getNetHandler().getPlayerInfoMap()) {
players.add(playerInfo.getGameProfile().getName());
/*// look at me using the name 'playerInfo' before switching to feather
for (PlayerInfo playerInfo : Minecraft.getInstance().getNetworkHandler().getOnlinePlayers()) {
players.add(playerInfo.getProfile().getName());
}
*///?} else {
for (AbstractClientPlayer player : Minecraft.getInstance().level.players()) {
Expand Down
11 changes: 6 additions & 5 deletions src/main/java/at/yedel/yedelmod/features/ping/PingMethod.java
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,14 @@

import at.yedel.yedelmod.utils.TextUtils;
import net.minecraft.client.Minecraft;

import org.polyfrost.oneconfig.api.hypixel.v1.HypixelUtils;
import net.hypixel.modapi.HypixelModAPI;
import net.hypixel.modapi.packet.impl.serverbound.ServerboundPingPacket;

//? if legacy {
/*import net.minecraft.network.play.client.C14PacketTabComplete;
import net.minecraft.network.play.client.C16PacketClientStatus;
/*import net.minecraft.network.packet.c2s.play.ClientStatusC2SPacket;
import net.minecraft.network.packet.c2s.play.CommandSuggestionsC2SPacket;
*///?} else {
import net.minecraft.network.protocol.game.ServerboundClientCommandPacket;
import net.minecraft.network.protocol.game.ServerboundCommandSuggestionPacket;
Expand All @@ -24,8 +25,8 @@
public enum PingMethod {
//? if legacy {
/*COMMAND_RESPONSE("Command", () -> TextUtils.sendChat("/" + TextUtils.randomUuid(8))),
TAB_PACKET("Tab", () -> Minecraft.getInstance().getNetHandler().addToSendQueue(new C14PacketTabComplete("#"))),
STATS_PACKET("Stats", () -> Minecraft.getInstance().getNetHandler().addToSendQueue(new C16PacketClientStatus(C16PacketClientStatus.EnumState.REQUEST_STATS))),
TAB_PACKET("Tab", () -> Minecraft.getInstance().getNetworkHandler().sendPacket(new CommandSuggestionsC2SPacket("#"))),
STATS_PACKET("Stats", () -> Minecraft.getInstance().getNetworkHandler().sendPacket(new ClientStatusC2SPacket(ClientStatusC2SPacket.Status.REQUEST_STATS))),
HYPIXEL_PING("Hypixel", () -> {
if (HypixelUtils.isHypixel()) {
HypixelModAPI.getInstance().sendPacket(new ServerboundPingPacket());
Expand All @@ -38,7 +39,7 @@ public enum PingMethod {
if (Minecraft.getInstance().isSingleplayer()) {
throw new PingException("This method does not work in singleplayer!");
}
long ping = Minecraft.getInstance().getCurrentServerData().pingToServer;
long ping = Minecraft.getInstance().getCurrentServerEntry().ping;
if (ping == 0) {
throw new PingException("Ping is 0! This might have occured if you used Direct Connect.");
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,14 @@




import org.polyfrost.oneconfig.api.event.v1.events.PacketEvent;
import net.hypixel.modapi.HypixelModAPI;
import net.hypixel.modapi.error.ErrorReason;
import net.hypixel.modapi.packet.impl.clientbound.ClientboundPingPacket;
//? if legacy {
/*import net.minecraft.network.play.server.S37PacketStatistics;
import net.minecraft.network.play.server.S3APacketTabComplete;
/*import net.minecraft.network.packet.s2c.play.CommandSuggestionsS2CPacket;
import net.minecraft.network.packet.s2c.play.StatsS2CPacket;
*///?} else {
import net.minecraft.network.protocol.game.ClientboundAwardStatsPacket;
import net.minecraft.network.protocol.game.ClientboundCommandSuggestionsPacket;
Expand Down Expand Up @@ -44,15 +45,15 @@ public void handleCommandPingResponse(ChatEvent.Receive event) {

@Subscribe
public void handleStatsPingResponse(PacketEvent.Receive event) {
//~ if modern 'S37PacketStatistics' -> 'ClientboundAwardStatsPacket'
//~ if modern 'StatsS2CPacket' -> 'ClientboundAwardStatsPacket'
if (event.getPacket() instanceof ClientboundAwardStatsPacket) {
PingQueue.getInstance().post(PingMethod.STATS_PACKET);
}
}

@Subscribe
public void handleTabPingResponse(PacketEvent.Receive event) {
//~ if modern 'S3APacketTabComplete' -> 'ClientboundCommandSuggestionsPacket'
//~ if modern 'CommandSuggestionsS2CPacket' -> 'ClientboundCommandSuggestionsPacket'
if (event.getPacket() instanceof ClientboundCommandSuggestionsPacket) {
PingQueue.getInstance().post(PingMethod.TAB_PACKET);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@

@Mixin(Minecraft.class)
public interface InvokerMinecraft {
@Invoker("rightClickMouse")
void yedelmod$rightClickMouse();
@Invoker("doUse")
void yedelmod$doUse();
}*//*?}*/
Loading
Loading