refactoring/SLC-1.8.9
1
0
Fork 0
mirror of https://github.com/refactorinqq/SLC-1.8.9.git synced 2024-11-13 02:41:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Bridges 0.0.1

Browse Source
This commit is contained in:
kirillsaint 2023-11-09 00:23:43 +06:00
parent 991963b674
commit c1eab8a9fb
415 changed files with 1915 additions and 1772 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/main/java/net/silentclient/client/Wrapper.java Normal file
View File

@ -0,0 +1,31 @@
package net.silentclient.client;
import net.silentclient.client.bridges.MinecraftBridge;
import net.silentclient.clientcommon.types.McVersion;
import net.silentclient.clientcommon.types.interfaces.IWrapper;
import net.silentclient.clientcommon.types.interfaces.bridges.IMinecraft;
public class Wrapper implements IWrapper {
private static final Wrapper INSTANCE = new Wrapper();
public static Wrapper getInstance() {
return INSTANCE;
}
private IMinecraft minecraft;
private final McVersion mcVersion = McVersion.v1_8_9;
@Override
public void init() {
this.minecraft = new MinecraftBridge();
}
@Override
public McVersion getMcVersion() {
return mcVersion;
}
@Override
public IMinecraft getMinecraft() {
return minecraft;
}
}

46
src/main/java/net/silentclient/client/bridges/MinecraftBridge.java Normal file
View File

@ -0,0 +1,46 @@
package net.silentclient.client.bridges;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.GuiScreen;
import net.silentclient.clientcommon.types.interfaces.bridges.IMinecraft;
import net.silentclient.clientcommon.types.interfaces.bridges.ITextureManager;
import java.io.File;
public class MinecraftBridge implements IMinecraft {
private ITextureManager textureManager;
public MinecraftBridge() {
this.textureManager = new TextureManagerBridge();
}
@Override
public int getDisplayWidth() {
return Minecraft.getMinecraft().displayWidth;
}
@Override
public int getDisplayHeight() {
return Minecraft.getMinecraft().displayHeight;
}
@Override
public boolean isFullScreen() {
return Minecraft.getMinecraft().isFullScreen();
}
@Override
public File getMcDataDir() {
return Minecraft.getMinecraft().mcDataDir;
}
@Override
public void displayGuiScreen(GuiScreen guiScreen) {
Minecraft.getMinecraft().displayGuiScreen(guiScreen);
}
@Override
public ITextureManager getTextureManager() {
return textureManager;
}
}

13
src/main/java/net/silentclient/client/bridges/TextureManagerBridge.java Normal file
View File

@ -0,0 +1,13 @@
package net.silentclient.client.bridges;
import net.minecraft.client.Minecraft;
import net.minecraft.util.ResourceLocation;
import net.silentclient.clientcommon.types.interfaces.bridges.ITextureManager;
import net.silentclient.clientcommon.types.interfaces.classwrappers.ResourceLocationWrapper;
public class TextureManagerBridge implements ITextureManager {
@Override
public void bindTexture(ResourceLocationWrapper resourceLocation) {
Minecraft.getMinecraft().getTextureManager().bindTexture(new ResourceLocation(resourceLocation.getResourcePath()));
}
}

5
src/main/java/net/silentclient/client/cosmetics/model/Material.java
View File

@ -1,5 +0,0 @@
package net.silentclient.client.cosmetics.model;
public class Material {
}

7
src/main/java/net/silentclient/client/event/impl/ClientTickEvent.java
View File

@ -1,7 +0,0 @@
package net.silentclient.client.event.impl;
import net.silentclient.client.event.Event;
public class ClientTickEvent extends Event {
}

7
src/main/java/net/silentclient/client/event/impl/EventRenderCrosshair.java
View File

@ -1,7 +0,0 @@
package net.silentclient.client.event.impl;
import net.silentclient.client.event.EventCancelable;
public class EventRenderCrosshair extends EventCancelable {
}

7
src/main/java/net/silentclient/client/event/impl/EventRenderDamageTint.java
View File

@ -1,7 +0,0 @@
package net.silentclient.client.event.impl;
import net.silentclient.client.event.Event;
public class EventRenderDamageTint extends Event {
}

7
src/main/java/net/silentclient/client/event/impl/RenderEvent.java
View File

@ -1,7 +0,0 @@
package net.silentclient.client.event.impl;
import net.silentclient.client.event.Event;
public class RenderEvent extends Event {
}

7
src/main/java/net/silentclient/client/event/impl/RenderTickEvent.java
View File

@ -1,7 +0,0 @@
package net.silentclient.client.event.impl;
import net.silentclient.client.event.EventCancelable;
public class RenderTickEvent extends EventCancelable {
}

6
src/main/java/net/silentclient/client/event/impl/ServerLeaveEvent.java
View File

@ -1,6 +0,0 @@
package net.silentclient.client.event.impl;
import net.silentclient.client.event.Event;
public class ServerLeaveEvent extends Event {
}

6
src/main/java/net/silentclient/client/event/impl/SingleplayerJoinEvent.java
View File

@ -1,6 +0,0 @@
package net.silentclient.client.event.impl;
import net.silentclient.client.event.Event;
public class SingleplayerJoinEvent extends Event {
}

2
src/main/java/net/silentclient/client/mixin/SilentClientTransformer.java
View File

@ -1,7 +1,7 @@
package net.silentclient.client.mixin; package net.silentclient.client.mixin;
import net.minecraft.launchwrapper.IClassTransformer; import net.minecraft.launchwrapper.IClassTransformer;
import net.silentclient.client.Client; import net.silentclient.clientcommon.Client;
import org.objectweb.asm.ClassReader; import org.objectweb.asm.ClassReader;
import org.objectweb.asm.ClassVisitor; import org.objectweb.asm.ClassVisitor;
import org.objectweb.asm.ClassWriter; import org.objectweb.asm.ClassWriter;

5
src/main/java/net/silentclient/client/mixin/SilentClientTweaker.java
View File

@ -1,18 +1,15 @@
package net.silentclient.client.mixin; package net.silentclient.client.mixin;
import net.minecraft.launchwrapper.ITweaker; import net.minecraft.launchwrapper.ITweaker;
import net.minecraft.launchwrapper.Launch;
import net.minecraft.launchwrapper.LaunchClassLoader; import net.minecraft.launchwrapper.LaunchClassLoader;
import net.silentclient.client.Client; import net.silentclient.clientcommon.Client;
import org.spongepowered.asm.launch.MixinBootstrap; import org.spongepowered.asm.launch.MixinBootstrap;
import org.spongepowered.asm.mixin.MixinEnvironment; import org.spongepowered.asm.mixin.MixinEnvironment;
import org.spongepowered.asm.mixin.Mixins; import org.spongepowered.asm.mixin.Mixins;
import java.io.File; import java.io.File;
import java.lang.reflect.Field;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Set;
public class SilentClientTweaker implements ITweaker { public class SilentClientTweaker implements ITweaker {
private List<String> launchArgs = new ArrayList<>(); private List<String> launchArgs = new ArrayList<>();

6
src/main/java/net/silentclient/client/mixin/ducks/AbstractClientPlayerExt.java
View File

@ -1,8 +1,8 @@
package net.silentclient.client.mixin.ducks; package net.silentclient.client.mixin.ducks;
import net.silentclient.client.cosmetics.*; import net.silentclient.clientcommon.cosmetics.*;
import net.silentclient.client.cosmetics.dynamiccurved.DynamicCape; import net.silentclient.clientcommon.cosmetics.dynamiccurved.DynamicCape;
import net.silentclient.client.utils.types.PlayerResponse; import net.silentclient.clientcommon.types.PlayerResponse;
public interface AbstractClientPlayerExt { public interface AbstractClientPlayerExt {
void silent$setShield(ShieldData a); void silent$setShield(ShieldData a);

2
src/main/java/net/silentclient/client/mixin/ducks/EntityRendererExt.java
View File

@ -1,6 +1,6 @@
package net.silentclient.client.mixin.ducks; package net.silentclient.client.mixin.ducks;
import net.silentclient.client.cosmetics.StaticResourceLocation; import net.silentclient.clientcommon.cosmetics.StaticResourceLocation;
public interface EntityRendererExt { public interface EntityRendererExt {
void silent$loadShader(StaticResourceLocation location); void silent$loadShader(StaticResourceLocation location);

2
src/main/java/net/silentclient/client/mixin/ducks/FontRendererExt.java
View File

@ -1,6 +1,6 @@
package net.silentclient.client.mixin.ducks; package net.silentclient.client.mixin.ducks;
import net.silentclient.client.cosmetics.StaticResourceLocation; import net.silentclient.clientcommon.cosmetics.StaticResourceLocation;
public interface FontRendererExt { public interface FontRendererExt {
StaticResourceLocation silent$getFontTextures(); StaticResourceLocation silent$getFontTextures();

2
src/main/java/net/silentclient/client/mixin/ducks/TextureManagerExt.java
View File

@ -1,6 +1,6 @@
package net.silentclient.client.mixin.ducks; package net.silentclient.client.mixin.ducks;
import net.silentclient.client.cosmetics.StaticResourceLocation; import net.silentclient.clientcommon.cosmetics.StaticResourceLocation;
public interface TextureManagerExt { public interface TextureManagerExt {
boolean waitBindTexture(StaticResourceLocation resource); boolean waitBindTexture(StaticResourceLocation resource);

22
src/main/java/net/silentclient/client/mixin/mixins/AbstractClientPlayerMixin.java
View File

@ -8,18 +8,18 @@ import net.minecraft.client.renderer.texture.DynamicTexture;
import net.minecraft.util.ResourceLocation; import net.minecraft.util.ResourceLocation;
import net.minecraft.util.StringUtils; import net.minecraft.util.StringUtils;
import net.minecraft.world.World; import net.minecraft.world.World;
import net.silentclient.client.Client; import net.silentclient.clientcommon.Client;
import net.silentclient.client.admin.AdminRender; import net.silentclient.clientcommon.admin.AdminRender;
import net.silentclient.client.cosmetics.*; import net.silentclient.clientcommon.cosmetics.*;
import net.silentclient.client.cosmetics.dynamiccurved.DynamicCape; import net.silentclient.clientcommon.cosmetics.dynamiccurved.DynamicCape;
import net.silentclient.client.event.impl.EventFovUpdate; import net.silentclient.clientcommon.event.impl.EventFovUpdate;
import net.silentclient.client.mixin.ducks.AbstractClientPlayerExt; import net.silentclient.client.mixin.ducks.AbstractClientPlayerExt;
import net.silentclient.client.mods.render.AnimationsMod; import net.silentclient.clientcommon.mods.render.AnimationsMod;
import net.silentclient.client.mods.settings.CosmeticsMod; import net.silentclient.clientcommon.mods.settings.CosmeticsMod;
import net.silentclient.client.utils.CustomSkin; import net.silentclient.clientcommon.utils.CustomSkin;
import net.silentclient.client.utils.Players; import net.silentclient.clientcommon.utils.Players;
import net.silentclient.client.utils.SCTextureManager; import net.silentclient.clientcommon.utils.SCTextureManager;
import net.silentclient.client.utils.types.PlayerResponse; import net.silentclient.clientcommon.types.PlayerResponse;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.Shadow;
import org.spongepowered.asm.mixin.Unique; import org.spongepowered.asm.mixin.Unique;

4
src/main/java/net/silentclient/client/mixin/mixins/ArmorStandRendererMixin.java
View File

@ -3,8 +3,8 @@ package net.silentclient.client.mixin.mixins;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.entity.ArmorStandRenderer; import net.minecraft.client.renderer.entity.ArmorStandRenderer;
import net.minecraft.entity.item.EntityArmorStand; import net.minecraft.entity.item.EntityArmorStand;
import net.silentclient.client.Client; import net.silentclient.clientcommon.Client;
import net.silentclient.client.mods.render.NametagsMod; import net.silentclient.clientcommon.mods.render.NametagsMod;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.Inject;

4
src/main/java/net/silentclient/client/mixin/mixins/BlockGlassMixin.java
View File

@ -8,8 +8,8 @@ import net.minecraft.block.material.Material;
import net.minecraft.util.BlockPos; import net.minecraft.util.BlockPos;
import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumFacing;
import net.minecraft.world.IBlockAccess; import net.minecraft.world.IBlockAccess;
import net.silentclient.client.Client; import net.silentclient.clientcommon.Client;
import net.silentclient.client.mods.render.ClearGlassMod; import net.silentclient.clientcommon.mods.render.ClearGlassMod;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
@Mixin({BlockGlass.class, BlockStainedGlass.class}) @Mixin({BlockGlass.class, BlockStainedGlass.class})

4
src/main/java/net/silentclient/client/mixin/mixins/BlockLiquidMixin.java
View File

@ -3,8 +3,8 @@ package net.silentclient.client.mixin.mixins;
import net.minecraft.block.BlockLiquid; import net.minecraft.block.BlockLiquid;
import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.EnumParticleTypes;
import net.minecraft.world.World; import net.minecraft.world.World;
import net.silentclient.client.Client; import net.silentclient.clientcommon.Client;
import net.silentclient.client.mods.settings.FPSBoostMod; import net.silentclient.clientcommon.mods.settings.FPSBoostMod;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Redirect; import org.spongepowered.asm.mixin.injection.Redirect;

4
src/main/java/net/silentclient/client/mixin/mixins/BlockRendererDispatcherMixin.java
View File

@ -5,8 +5,8 @@ import net.minecraft.client.renderer.BlockRendererDispatcher;
import net.minecraft.client.renderer.WorldRenderer; import net.minecraft.client.renderer.WorldRenderer;
import net.minecraft.util.BlockPos; import net.minecraft.util.BlockPos;
import net.minecraft.world.IBlockAccess; import net.minecraft.world.IBlockAccess;
import net.silentclient.client.Client; import net.silentclient.clientcommon.Client;
import net.silentclient.client.mods.settings.FPSBoostMod; import net.silentclient.clientcommon.mods.settings.FPSBoostMod;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.Inject;

4
src/main/java/net/silentclient/client/mixin/mixins/ChunkMixin.java
View File

@ -4,8 +4,8 @@ package net.silentclient.client.mixin.mixins;
import net.minecraft.block.state.IBlockState; import net.minecraft.block.state.IBlockState;
import net.minecraft.util.BlockPos; import net.minecraft.util.BlockPos;
import net.minecraft.world.chunk.Chunk; import net.minecraft.world.chunk.Chunk;
import net.silentclient.client.Client; import net.silentclient.clientcommon.Client;
import net.silentclient.client.hooks.ChunkHook; import net.silentclient.clientcommon.hooks.ChunkHook;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Overwrite; import org.spongepowered.asm.mixin.Overwrite;
import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.At;

4
src/main/java/net/silentclient/client/mixin/mixins/ChunkRenderDispatcherMixin.java
View File

@ -2,8 +2,8 @@ package net.silentclient.client.mixin.mixins;
import net.minecraft.client.renderer.chunk.ChunkCompileTaskGenerator; import net.minecraft.client.renderer.chunk.ChunkCompileTaskGenerator;
import net.minecraft.client.renderer.chunk.ChunkRenderDispatcher; import net.minecraft.client.renderer.chunk.ChunkRenderDispatcher;
import net.silentclient.client.Client; import net.silentclient.clientcommon.Client;
import net.silentclient.client.mods.settings.FPSBoostMod; import net.silentclient.clientcommon.mods.settings.FPSBoostMod;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.Inject;

4
src/main/java/net/silentclient/client/mixin/mixins/EffectRendererMixin.java
View File

@ -8,8 +8,8 @@ import net.minecraft.entity.Entity;
import net.minecraft.util.BlockPos; import net.minecraft.util.BlockPos;
import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumFacing;
import net.silentclient.client.mixin.ducks.EntityFXExt; import net.silentclient.client.mixin.ducks.EntityFXExt;
import net.silentclient.client.mods.settings.FPSBoostMod; import net.silentclient.clientcommon.mods.settings.FPSBoostMod;
import net.silentclient.client.utils.culling.ParticleCulling; import net.silentclient.clientcommon.utils.culling.ParticleCulling;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.*; import org.spongepowered.asm.mixin.injection.*;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;

2
src/main/java/net/silentclient/client/mixin/mixins/EntityFXMixin.java
View File

@ -2,7 +2,7 @@ package net.silentclient.client.mixin.mixins;
import net.minecraft.client.particle.EntityFX; import net.minecraft.client.particle.EntityFX;
import net.silentclient.client.mixin.ducks.EntityFXExt; import net.silentclient.client.mixin.ducks.EntityFXExt;
import net.silentclient.client.mods.settings.FPSBoostMod; import net.silentclient.clientcommon.mods.settings.FPSBoostMod;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Unique; import org.spongepowered.asm.mixin.Unique;
import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.At;

2
src/main/java/net/silentclient/client/mixin/mixins/EntityPlayerMixin.java
View File

@ -6,7 +6,7 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.event.HoverEvent; import net.minecraft.event.HoverEvent;
import net.minecraft.util.ChatStyle; import net.minecraft.util.ChatStyle;
import net.minecraft.util.IChatComponent; import net.minecraft.util.IChatComponent;
import net.silentclient.client.event.impl.EntityAttackEvent; import net.silentclient.clientcommon.event.impl.EntityAttackEvent;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.Inject;

32
src/main/java/net/silentclient/client/mixin/mixins/EntityRendererMixin.java
View File

@ -10,23 +10,23 @@ import net.minecraft.client.renderer.culling.ICamera;
import net.minecraft.client.shader.ShaderGroup; import net.minecraft.client.shader.ShaderGroup;
import net.minecraft.entity.Entity; import net.minecraft.entity.Entity;
import net.minecraft.util.ResourceLocation; import net.minecraft.util.ResourceLocation;
import net.silentclient.client.Client; import net.silentclient.clientcommon.Client;
import net.silentclient.client.cosmetics.StaticResourceLocation; import net.silentclient.clientcommon.cosmetics.StaticResourceLocation;
import net.silentclient.client.event.impl.EventCameraRotation; import net.silentclient.clientcommon.event.impl.EventCameraRotation;
import net.silentclient.client.event.impl.EventPlayerHeadRotation; import net.silentclient.clientcommon.event.impl.EventPlayerHeadRotation;
import net.silentclient.client.event.impl.EventRender3D; import net.silentclient.clientcommon.event.impl.EventRender3D;
import net.silentclient.client.event.impl.EventZoomFov; import net.silentclient.clientcommon.event.impl.EventZoomFov;
import net.silentclient.client.gui.notification.NotificationManager; import net.silentclient.clientcommon.gui.notification.NotificationManager;
import net.silentclient.client.mixin.ducks.EntityRendererExt; import net.silentclient.client.mixin.ducks.EntityRendererExt;
import net.silentclient.client.mods.render.AnimationsMod; import net.silentclient.clientcommon.mods.render.AnimationsMod;
import net.silentclient.client.mods.render.NewMotionBlurMod; import net.silentclient.clientcommon.mods.render.NewMotionBlurMod;
import net.silentclient.client.mods.settings.RenderMod; import net.silentclient.clientcommon.mods.settings.RenderMod;
import net.silentclient.client.utils.CloudRenderer; import net.silentclient.clientcommon.utils.CloudRenderer;
import net.silentclient.client.utils.HUDCaching; import net.silentclient.clientcommon.utils.HUDCaching;
import net.silentclient.client.utils.OptifinePatch; import net.silentclient.clientcommon.utils.OptifinePatch;
import net.silentclient.client.utils.animations.SneakHandler; import net.silentclient.clientcommon.utils.animations.SneakHandler;
import net.silentclient.client.utils.culling.EntityCulling; import net.silentclient.clientcommon.utils.culling.EntityCulling;
import net.silentclient.client.utils.shader.MotionBlurUtils; import net.silentclient.clientcommon.utils.shader.MotionBlurUtils;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.Shadow;
import org.spongepowered.asm.mixin.Unique; import org.spongepowered.asm.mixin.Unique;

4
src/main/java/net/silentclient/client/mixin/mixins/FontRendererMixin.java
View File

@ -2,8 +2,8 @@ package net.silentclient.client.mixin.mixins;
import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.FontRenderer;
import net.minecraft.util.ResourceLocation; import net.minecraft.util.ResourceLocation;
import net.silentclient.client.cosmetics.StaticResourceLocation; import net.silentclient.clientcommon.cosmetics.StaticResourceLocation;
import net.silentclient.client.event.impl.EventText; import net.silentclient.clientcommon.event.impl.EventText;
import net.silentclient.client.mixin.ducks.FontRendererExt; import net.silentclient.client.mixin.ducks.FontRendererExt;
import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Final;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;

2
src/main/java/net/silentclient/client/mixin/mixins/FramebufferMixin.java
View File

@ -2,7 +2,7 @@ package net.silentclient.client.mixin.mixins;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
import net.minecraft.client.shader.Framebuffer; import net.minecraft.client.shader.Framebuffer;
import net.silentclient.client.utils.HUDCaching; import net.silentclient.clientcommon.utils.HUDCaching;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.Inject;

6
src/main/java/net/silentclient/client/mixin/mixins/GameSettingsMixin.java
View File

@ -4,10 +4,10 @@ import com.google.common.util.concurrent.ListenableFuture;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
import net.minecraft.client.settings.GameSettings; import net.minecraft.client.settings.GameSettings;
import net.minecraft.client.settings.KeyBinding; import net.minecraft.client.settings.KeyBinding;
import net.silentclient.client.Client; import net.silentclient.clientcommon.Client;
import net.silentclient.client.keybinds.KeyBindManager; import net.silentclient.clientcommon.keybinds.KeyBindManager;
import net.silentclient.client.mixin.ducks.GameSettingsExt; import net.silentclient.client.mixin.ducks.GameSettingsExt;
import net.silentclient.client.mods.player.ZoomMod; import net.silentclient.clientcommon.mods.player.ZoomMod;
import org.lwjgl.input.Keyboard; import org.lwjgl.input.Keyboard;
import org.lwjgl.input.Mouse; import org.lwjgl.input.Mouse;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;

2
src/main/java/net/silentclient/client/mixin/mixins/GlStateManagerMixin.java
View File

@ -2,7 +2,7 @@ package net.silentclient.client.mixin.mixins;
import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.GlStateManager;
import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.OpenGlHelper;
import net.silentclient.client.utils.HUDCaching; import net.silentclient.clientcommon.utils.HUDCaching;
import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL11;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.Shadow;

4
src/main/java/net/silentclient/client/mixin/mixins/GuiAchievementMixin.java
View File

@ -2,8 +2,8 @@ package net.silentclient.client.mixin.mixins;
import net.minecraft.client.gui.achievement.GuiAchievement; import net.minecraft.client.gui.achievement.GuiAchievement;
import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.GlStateManager;
import net.silentclient.client.Client; import net.silentclient.clientcommon.Client;
import net.silentclient.client.mods.settings.RenderMod; import net.silentclient.clientcommon.mods.settings.RenderMod;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.Inject;

10
src/main/java/net/silentclient/client/mixin/mixins/GuiChatMixin.java
View File

@ -2,11 +2,11 @@ package net.silentclient.client.mixin.mixins;
import net.minecraft.client.gui.GuiChat; import net.minecraft.client.gui.GuiChat;
import net.minecraft.client.gui.GuiTextField; import net.minecraft.client.gui.GuiTextField;
import net.silentclient.client.Client; import net.silentclient.clientcommon.Client;
import net.silentclient.client.gui.animation.SimpleAnimation; import net.silentclient.clientcommon.gui.animation.SimpleAnimation;
import net.silentclient.client.gui.lite.clickgui.utils.GlUtils; import net.silentclient.clientcommon.gui.lite.clickgui.utils.GlUtils;
import net.silentclient.client.mods.render.ChatMod; import net.silentclient.clientcommon.mods.render.ChatMod;
import net.silentclient.client.utils.calculator.ChatCalculator; import net.silentclient.clientcommon.utils.calculator.ChatCalculator;
import org.lwjgl.input.Keyboard; import org.lwjgl.input.Keyboard;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.Shadow;

9
src/main/java/net/silentclient/client/mixin/mixins/GuiContainerMixin.java
View File

@ -3,12 +3,11 @@ package net.silentclient.client.mixin.mixins;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.gui.GuiScreen;
import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.gui.inventory.GuiContainer;
import net.minecraft.util.ResourceLocation; import net.silentclient.clientcommon.Client;
import net.silentclient.client.Client; import net.silentclient.clientcommon.cosmetics.StaticResourceLocation;
import net.silentclient.client.cosmetics.StaticResourceLocation; import net.silentclient.clientcommon.gui.hud.Watermark;
import net.silentclient.client.gui.hud.Watermark;
import net.silentclient.client.mixin.ducks.EntityRendererExt; import net.silentclient.client.mixin.ducks.EntityRendererExt;
import net.silentclient.client.mods.render.InventoryBlurMod; import net.silentclient.clientcommon.mods.render.InventoryBlurMod;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.Shadow;
import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.At;

8
src/main/java/net/silentclient/client/mixin/mixins/GuiDisconnectedMixin.java
View File

@ -5,10 +5,10 @@ import net.minecraft.client.gui.GuiDisconnected;
import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.gui.GuiScreen;
import net.minecraft.client.resources.I18n; import net.minecraft.client.resources.I18n;
import net.minecraft.util.IChatComponent; import net.minecraft.util.IChatComponent;
import net.silentclient.client.Client; import net.silentclient.clientcommon.Client;
import net.silentclient.client.event.impl.ServerLeaveEvent; import net.silentclient.clientcommon.event.impl.ServerLeaveEvent;
import net.silentclient.client.gui.minecraft.GuiConnecting; import net.silentclient.clientcommon.gui.minecraft.GuiConnecting;
import net.silentclient.client.gui.multiplayer.SilentMultiplayerGui; import net.silentclient.clientcommon.gui.multiplayer.SilentMultiplayerGui;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.Shadow;
import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.At;

26
src/main/java/net/silentclient/client/mixin/mixins/GuiInGameMixin.java
View File

@ -8,19 +8,19 @@ import net.minecraft.client.gui.ScaledResolution;
import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.GlStateManager;
import net.minecraft.scoreboard.ScoreObjective; import net.minecraft.scoreboard.ScoreObjective;
import net.minecraft.util.ResourceLocation; import net.minecraft.util.ResourceLocation;
import net.silentclient.client.Client; import net.silentclient.clientcommon.Client;
import net.silentclient.client.event.impl.EventRenderDamageTint; import net.silentclient.clientcommon.event.impl.EventRenderDamageTint;
import net.silentclient.client.event.impl.RenderEvent; import net.silentclient.clientcommon.event.impl.RenderEvent;
import net.silentclient.client.gui.lite.clickgui.utils.GlUtils; import net.silentclient.clientcommon.gui.lite.clickgui.utils.GlUtils;
import net.silentclient.client.mods.hud.BossBarMod; import net.silentclient.clientcommon.mods.hud.BossBarMod;
import net.silentclient.client.mods.hud.ScoreboardMod; import net.silentclient.clientcommon.mods.hud.ScoreboardMod;
import net.silentclient.client.mods.render.AnimationsMod; import net.silentclient.clientcommon.mods.render.AnimationsMod;
import net.silentclient.client.mods.render.CrosshairMod; import net.silentclient.clientcommon.mods.render.CrosshairMod;
import net.silentclient.client.mods.render.PackTweaksMod; import net.silentclient.clientcommon.mods.render.PackTweaksMod;
import net.silentclient.client.mods.render.TitlesMod; import net.silentclient.clientcommon.mods.render.TitlesMod;
import net.silentclient.client.mods.settings.RenderMod; import net.silentclient.clientcommon.mods.settings.RenderMod;
import net.silentclient.client.utils.ColorUtils; import net.silentclient.clientcommon.utils.ColorUtils;
import net.silentclient.client.utils.HUDCaching; import net.silentclient.clientcommon.utils.HUDCaching;
import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL11;
import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Final;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;

2
src/main/java/net/silentclient/client/mixin/mixins/GuiMultiplayerMixin.java
View File

@ -3,7 +3,7 @@ package net.silentclient.client.mixin.mixins;
import net.minecraft.client.gui.GuiMultiplayer; import net.minecraft.client.gui.GuiMultiplayer;
import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.gui.GuiScreen;
import net.minecraft.client.multiplayer.ServerData; import net.minecraft.client.multiplayer.ServerData;
import net.silentclient.client.gui.minecraft.GuiConnecting; import net.silentclient.clientcommon.gui.minecraft.GuiConnecting;
import net.silentclient.client.mixin.ducks.GuiMultiplayerExt; import net.silentclient.client.mixin.ducks.GuiMultiplayerExt;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Overwrite; import org.spongepowered.asm.mixin.Overwrite;

6
src/main/java/net/silentclient/client/mixin/mixins/GuiNewChatMixin.java
View File

@ -4,9 +4,9 @@ import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.*; import net.minecraft.client.gui.*;
import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.GlStateManager;
import net.minecraft.util.IChatComponent; import net.minecraft.util.IChatComponent;
import net.silentclient.client.Client; import net.silentclient.clientcommon.Client;
import net.silentclient.client.mods.render.ChatMod; import net.silentclient.clientcommon.mods.render.ChatMod;
import net.silentclient.client.utils.MathUtils; import net.silentclient.clientcommon.utils.MathUtils;
import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Final;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.Shadow;

10
src/main/java/net/silentclient/client/mixin/mixins/GuiPlayerTabOverlayMixin.java
View File

@ -21,13 +21,13 @@ import net.minecraft.scoreboard.Scoreboard;
import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.EnumChatFormatting;
import net.minecraft.util.IChatComponent; import net.minecraft.util.IChatComponent;
import net.minecraft.world.WorldSettings; import net.minecraft.world.WorldSettings;
import net.silentclient.client.Client; import net.silentclient.clientcommon.Client;
import net.silentclient.client.cosmetics.StaticResourceLocation; import net.silentclient.clientcommon.cosmetics.StaticResourceLocation;
import net.silentclient.client.mixin.ducks.AbstractClientPlayerExt; import net.silentclient.client.mixin.ducks.AbstractClientPlayerExt;
import net.silentclient.client.mixin.ducks.TextureManagerExt; import net.silentclient.client.mixin.ducks.TextureManagerExt;
import net.silentclient.client.mods.render.TabMod; import net.silentclient.clientcommon.mods.render.TabMod;
import net.silentclient.client.utils.ColorUtils; import net.silentclient.clientcommon.utils.ColorUtils;
import net.silentclient.client.utils.Players; import net.silentclient.clientcommon.utils.Players;
import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Final;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Overwrite; import org.spongepowered.asm.mixin.Overwrite;

4
src/main/java/net/silentclient/client/mixin/mixins/GuiScreenMixin.java
View File

@ -2,8 +2,8 @@ package net.silentclient.client.mixin.mixins;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.gui.GuiScreen;
import net.silentclient.client.event.impl.RunCommandEvent; import net.silentclient.clientcommon.event.impl.RunCommandEvent;
import net.silentclient.client.utils.ResolutionHelper; import net.silentclient.clientcommon.utils.ResolutionHelper;
import org.lwjgl.input.Keyboard; import org.lwjgl.input.Keyboard;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.Shadow;

8
src/main/java/net/silentclient/client/mixin/mixins/InventoryEffectRendererMixin.java
View File

@ -4,14 +4,12 @@ import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.gui.inventory.GuiContainer;
import net.minecraft.client.renderer.InventoryEffectRenderer; import net.minecraft.client.renderer.InventoryEffectRenderer;
import net.minecraft.inventory.Container; import net.minecraft.inventory.Container;
import net.silentclient.client.Client; import net.silentclient.clientcommon.Client;
import net.silentclient.client.mods.hud.PotionHudMod; import net.silentclient.clientcommon.mods.hud.PotionHudMod;
import net.silentclient.client.mods.settings.RenderMod; import net.silentclient.clientcommon.mods.settings.RenderMod;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Overwrite; import org.spongepowered.asm.mixin.Overwrite;
import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.Shadow;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Redirect;
@Mixin(InventoryEffectRenderer.class) @Mixin(InventoryEffectRenderer.class)
public abstract class InventoryEffectRendererMixin extends GuiContainer { public abstract class InventoryEffectRendererMixin extends GuiContainer {

10
src/main/java/net/silentclient/client/mixin/mixins/ItemRendererMixin.java
View File

@ -5,11 +5,11 @@ import net.minecraft.client.renderer.GlStateManager;
import net.minecraft.client.renderer.ItemRenderer; import net.minecraft.client.renderer.ItemRenderer;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.silentclient.client.Client; import net.silentclient.clientcommon.Client;
import net.silentclient.client.event.impl.EventTransformFirstPersonItem; import net.silentclient.clientcommon.event.impl.EventTransformFirstPersonItem;
import net.silentclient.client.mods.render.AnimationsMod; import net.silentclient.clientcommon.mods.render.AnimationsMod;
import net.silentclient.client.mods.render.PackTweaksMod; import net.silentclient.clientcommon.mods.render.PackTweaksMod;
import net.silentclient.client.utils.animations.AnimationHandler; import net.silentclient.clientcommon.utils.animations.AnimationHandler;
import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Final;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.Shadow;

2
src/main/java/net/silentclient/client/mixin/mixins/LayerArmorBaseMixin.java
View File

@ -1,7 +1,7 @@
package net.silentclient.client.mixin.mixins; package net.silentclient.client.mixin.mixins;
import net.minecraft.client.renderer.entity.layers.LayerArmorBase; import net.minecraft.client.renderer.entity.layers.LayerArmorBase;
import net.silentclient.client.mods.render.AnimationsMod; import net.silentclient.clientcommon.mods.render.AnimationsMod;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.Inject;

4
src/main/java/net/silentclient/client/mixin/mixins/LayerArrowMixin.java
View File

@ -2,8 +2,8 @@ package net.silentclient.client.mixin.mixins;
import net.minecraft.client.renderer.entity.layers.LayerArrow; import net.minecraft.client.renderer.entity.layers.LayerArrow;
import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.EntityLivingBase;
import net.silentclient.client.Client; import net.silentclient.clientcommon.Client;
import net.silentclient.client.mods.settings.FPSBoostMod; import net.silentclient.clientcommon.mods.settings.FPSBoostMod;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.Inject;

6
src/main/java/net/silentclient/client/mixin/mixins/LoadingScreenRendererMixin.java
View File

@ -7,9 +7,9 @@ import net.minecraft.client.gui.ScaledResolution;
import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.GlStateManager;
import net.minecraft.util.MinecraftError; import net.minecraft.util.MinecraftError;
import net.minecraft.util.ResourceLocation; import net.minecraft.util.ResourceLocation;
import net.silentclient.client.Client; import net.silentclient.clientcommon.Client;
import net.silentclient.client.gui.font.SilentFontRenderer; import net.silentclient.clientcommon.gui.font.SilentFontRenderer;
import net.silentclient.client.gui.util.RenderUtil; import net.silentclient.clientcommon.gui.util.RenderUtil;
import net.silentclient.client.mixin.accessors.MinecraftAccessor; import net.silentclient.client.mixin.accessors.MinecraftAccessor;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Overwrite; import org.spongepowered.asm.mixin.Overwrite;

2
src/main/java/net/silentclient/client/mixin/mixins/MathHelperMixin.java
View File

@ -1,7 +1,7 @@
package net.silentclient.client.mixin.mixins; package net.silentclient.client.mixin.mixins;
import net.minecraft.util.MathHelper; import net.minecraft.util.MathHelper;
import net.silentclient.client.math.RivensHalfMath; import net.silentclient.clientcommon.math.RivensHalfMath;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Overwrite; import org.spongepowered.asm.mixin.Overwrite;

29
src/main/java/net/silentclient/client/mixin/mixins/MinecraftMixin.java
View File

@ -18,20 +18,21 @@ import net.minecraft.util.ResourceLocation;
import net.minecraft.util.Session; import net.minecraft.util.Session;
import net.minecraft.util.Timer; import net.minecraft.util.Timer;
import net.minecraft.world.WorldSettings; import net.minecraft.world.WorldSettings;
import net.silentclient.client.Client; import net.silentclient.client.Wrapper;
import net.silentclient.client.event.impl.*; import net.silentclient.clientcommon.Client;
import net.silentclient.client.gui.SilentScreen; import net.silentclient.clientcommon.event.impl.*;
import net.silentclient.client.gui.lite.LiteMainMenu; import net.silentclient.clientcommon.gui.SilentScreen;
import net.silentclient.client.gui.multiplayer.SilentMultiplayerGui; import net.silentclient.clientcommon.gui.lite.LiteMainMenu;
import net.silentclient.client.gui.resourcepacks.SilentResourcePacksGui; import net.silentclient.clientcommon.gui.multiplayer.SilentMultiplayerGui;
import net.silentclient.client.gui.silentmainmenu.MainMenuConcept; import net.silentclient.clientcommon.gui.resourcepacks.SilentResourcePacksGui;
import net.silentclient.client.gui.util.BackgroundPanorama; import net.silentclient.clientcommon.gui.silentmainmenu.MainMenuConcept;
import net.silentclient.client.hooks.MinecraftHook; import net.silentclient.clientcommon.gui.util.BackgroundPanorama;
import net.silentclient.clientcommon.hooks.MinecraftHook;
import net.silentclient.client.mixin.ducks.GuiMultiplayerExt; import net.silentclient.client.mixin.ducks.GuiMultiplayerExt;
import net.silentclient.client.mixin.ducks.MinecraftExt; import net.silentclient.client.mixin.ducks.MinecraftExt;
import net.silentclient.client.mods.player.ZoomMod; import net.silentclient.clientcommon.mods.player.ZoomMod;
import net.silentclient.client.mods.render.AnimationsMod; import net.silentclient.clientcommon.mods.render.AnimationsMod;
import net.silentclient.client.mods.settings.FPSBoostMod; import net.silentclient.clientcommon.mods.settings.FPSBoostMod;
import org.apache.commons.lang3.SystemUtils; import org.apache.commons.lang3.SystemUtils;
import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.Logger;
import org.lwjgl.LWJGLException; import org.lwjgl.LWJGLException;
@ -52,7 +53,7 @@ import java.io.IOException;
public abstract class MinecraftMixin implements MinecraftExt { public abstract class MinecraftMixin implements MinecraftExt {
@Inject(method = "startGame", at = @At("HEAD")) @Inject(method = "startGame", at = @At("HEAD"))
public void initClient(CallbackInfo callbackInfo) throws IOException { public void initClient(CallbackInfo callbackInfo) throws IOException {
Client.getInstance().init(); Client.getInstance().init(Wrapper.getInstance());
} }
@Inject(method = "startGame", at = @At("TAIL")) @Inject(method = "startGame", at = @At("TAIL"))
@ -156,7 +157,7 @@ public abstract class MinecraftMixin implements MinecraftExt {
return; return;
} }
if(guiScreenIn instanceof GuiIngameMenu) { if(guiScreenIn instanceof GuiIngameMenu) {
displayGuiScreen(new net.silentclient.client.gui.minecraft.GuiIngameMenu()); displayGuiScreen(new net.silentclient.clientcommon.gui.minecraft.GuiIngameMenu());
ci.cancel(); ci.cancel();
return; return;
} }

4
src/main/java/net/silentclient/client/mixin/mixins/MobSpawnerBaseLogicMixin.java
View File

@ -3,8 +3,8 @@ package net.silentclient.client.mixin.mixins;
import net.minecraft.tileentity.MobSpawnerBaseLogic; import net.minecraft.tileentity.MobSpawnerBaseLogic;
import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.EnumParticleTypes;
import net.minecraft.world.World; import net.minecraft.world.World;
import net.silentclient.client.Client; import net.silentclient.clientcommon.Client;
import net.silentclient.client.mods.settings.FPSBoostMod; import net.silentclient.clientcommon.mods.settings.FPSBoostMod;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Redirect; import org.spongepowered.asm.mixin.injection.Redirect;

2
src/main/java/net/silentclient/client/mixin/mixins/ModelBipedMixin.java
View File

@ -1,7 +1,7 @@
package net.silentclient.client.mixin.mixins; package net.silentclient.client.mixin.mixins;
import net.minecraft.client.model.ModelBiped; import net.minecraft.client.model.ModelBiped;
import net.silentclient.client.mods.render.AnimationsMod; import net.silentclient.clientcommon.mods.render.AnimationsMod;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.Constant; import org.spongepowered.asm.mixin.injection.Constant;
import org.spongepowered.asm.mixin.injection.ModifyConstant; import org.spongepowered.asm.mixin.injection.ModifyConstant;

2
src/main/java/net/silentclient/client/mixin/mixins/ModelRendererMixin.java
View File

@ -3,7 +3,7 @@ package net.silentclient.client.mixin.mixins;
import net.minecraft.client.model.ModelRenderer; import net.minecraft.client.model.ModelRenderer;
import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.Tessellator;
import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
import net.silentclient.client.mods.settings.FPSBoostMod; import net.silentclient.clientcommon.mods.settings.FPSBoostMod;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.Shadow;
import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.At;

6
src/main/java/net/silentclient/client/mixin/mixins/NetHandlerPlayClientMixin.java
View File

@ -7,9 +7,9 @@ import net.minecraft.client.network.NetHandlerPlayClient;
import net.minecraft.network.play.server.S19PacketEntityStatus; import net.minecraft.network.play.server.S19PacketEntityStatus;
import net.minecraft.network.play.server.S48PacketResourcePackSend; import net.minecraft.network.play.server.S48PacketResourcePackSend;
import net.minecraft.util.IChatComponent; import net.minecraft.util.IChatComponent;
import net.silentclient.client.event.impl.EntityDamageEvent; import net.silentclient.clientcommon.event.impl.EntityDamageEvent;
import net.silentclient.client.hooks.NetHandlerPlayClientHook; import net.silentclient.clientcommon.hooks.NetHandlerPlayClientHook;
import net.silentclient.client.utils.Players; import net.silentclient.clientcommon.utils.Players;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.Shadow;
import org.spongepowered.asm.mixin.injection.*; import org.spongepowered.asm.mixin.injection.*;

6
src/main/java/net/silentclient/client/mixin/mixins/NetworkManagerMixin.java
View File

@ -4,9 +4,9 @@ import io.netty.channel.ChannelHandlerContext;
import net.minecraft.network.NetworkManager; import net.minecraft.network.NetworkManager;
import net.minecraft.network.Packet; import net.minecraft.network.Packet;
import net.minecraft.network.play.server.S02PacketChat; import net.minecraft.network.play.server.S02PacketChat;
import net.silentclient.client.event.impl.EventReceivePacket; import net.silentclient.clientcommon.event.impl.EventReceivePacket;
import net.silentclient.client.event.impl.EventSendPacket; import net.silentclient.clientcommon.event.impl.EventSendPacket;
import net.silentclient.client.event.impl.NewMessageEvent; import net.silentclient.clientcommon.event.impl.NewMessageEvent;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.Inject;

12
src/main/java/net/silentclient/client/mixin/mixins/NetworkPlayerInfoMixin.java
View File

@ -6,15 +6,15 @@ import net.minecraft.client.Minecraft;
import net.minecraft.client.network.NetworkPlayerInfo; import net.minecraft.client.network.NetworkPlayerInfo;
import net.minecraft.client.resources.DefaultPlayerSkin; import net.minecraft.client.resources.DefaultPlayerSkin;
import net.minecraft.util.ResourceLocation; import net.minecraft.util.ResourceLocation;
import net.silentclient.client.Client; import net.silentclient.clientcommon.Client;
import net.silentclient.client.admin.AdminRender; import net.silentclient.clientcommon.admin.AdminRender;
import net.silentclient.client.mixin.accessors.NetworkPlayerInfoAccessor; import net.silentclient.client.mixin.accessors.NetworkPlayerInfoAccessor;
import net.silentclient.client.mixin.ducks.AbstractClientPlayerExt; import net.silentclient.client.mixin.ducks.AbstractClientPlayerExt;
import net.silentclient.client.mixin.ducks.NetworkPlayerInfoExt; import net.silentclient.client.mixin.ducks.NetworkPlayerInfoExt;
import net.silentclient.client.mods.player.NickHiderMod; import net.silentclient.clientcommon.mods.player.NickHiderMod;
import net.silentclient.client.mods.render.AnimationsMod; import net.silentclient.clientcommon.mods.render.AnimationsMod;
import net.silentclient.client.mods.settings.FPSBoostMod; import net.silentclient.clientcommon.mods.settings.FPSBoostMod;
import net.silentclient.client.utils.NetworkPlayerInfoOptimization; import net.silentclient.clientcommon.utils.NetworkPlayerInfoOptimization;
import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Final;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.Shadow;

2
src/main/java/net/silentclient/client/mixin/mixins/RenderArrowMixin.java
View File

@ -2,7 +2,7 @@ package net.silentclient.client.mixin.mixins;
import net.minecraft.client.renderer.entity.RenderArrow; import net.minecraft.client.renderer.entity.RenderArrow;
import net.minecraft.entity.projectile.EntityArrow; import net.minecraft.entity.projectile.EntityArrow;
import net.silentclient.client.hooks.RenderArrowHook; import net.silentclient.clientcommon.hooks.RenderArrowHook;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.Inject;

6
src/main/java/net/silentclient/client/mixin/mixins/RenderEntityItemMixin.java
View File

@ -4,9 +4,9 @@ import net.minecraft.client.renderer.entity.RenderEntityItem;
import net.minecraft.client.resources.model.IBakedModel; import net.minecraft.client.resources.model.IBakedModel;
import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.item.EntityItem;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.silentclient.client.hooks.RenderEntityItemHook; import net.silentclient.clientcommon.hooks.RenderEntityItemHook;
import net.silentclient.client.mods.settings.FPSBoostMod; import net.silentclient.clientcommon.mods.settings.FPSBoostMod;
import net.silentclient.client.utils.culling.EntityCulling; import net.silentclient.clientcommon.utils.culling.EntityCulling;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Overwrite; import org.spongepowered.asm.mixin.Overwrite;
import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.Shadow;

4
src/main/java/net/silentclient/client/mixin/mixins/RenderFishMixin.java
View File

@ -2,8 +2,8 @@ package net.silentclient.client.mixin.mixins;
import net.minecraft.client.renderer.entity.RenderFish; import net.minecraft.client.renderer.entity.RenderFish;
import net.minecraft.util.Vec3; import net.minecraft.util.Vec3;
import net.silentclient.client.mods.render.AnimationsMod; import net.silentclient.clientcommon.mods.render.AnimationsMod;
import net.silentclient.client.utils.animations.FishingLineHandler; import net.silentclient.clientcommon.utils.animations.FishingLineHandler;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Redirect; import org.spongepowered.asm.mixin.injection.Redirect;

4
src/main/java/net/silentclient/client/mixin/mixins/RenderGlobalMixin.java
View File

@ -9,8 +9,8 @@ import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.MovingObjectPosition;
import net.minecraft.util.ResourceLocation; import net.minecraft.util.ResourceLocation;
import net.silentclient.client.event.impl.RenderTickEvent; import net.silentclient.clientcommon.event.impl.RenderTickEvent;
import net.silentclient.client.mods.render.BlockOverlayMod; import net.silentclient.clientcommon.mods.render.BlockOverlayMod;
import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Final;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Overwrite; import org.spongepowered.asm.mixin.Overwrite;

6
src/main/java/net/silentclient/client/mixin/mixins/RenderItemFrameMixin.java
View File

@ -5,9 +5,9 @@ import net.minecraft.entity.item.EntityItemFrame;
import net.minecraft.init.Items; import net.minecraft.init.Items;
import net.minecraft.item.Item; import net.minecraft.item.Item;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.silentclient.client.Client; import net.silentclient.clientcommon.Client;
import net.silentclient.client.mods.settings.FPSBoostMod; import net.silentclient.clientcommon.mods.settings.FPSBoostMod;
import net.silentclient.client.utils.culling.EntityCulling; import net.silentclient.clientcommon.utils.culling.EntityCulling;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.Inject;

6
src/main/java/net/silentclient/client/mixin/mixins/RenderItemMixin.java
View File

@ -11,9 +11,9 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.EnumAction; import net.minecraft.item.EnumAction;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.util.ResourceLocation; import net.minecraft.util.ResourceLocation;
import net.silentclient.client.Client; import net.silentclient.clientcommon.Client;
import net.silentclient.client.mods.render.AnimationsMod; import net.silentclient.clientcommon.mods.render.AnimationsMod;
import net.silentclient.client.utils.animations.AnimationHandler; import net.silentclient.clientcommon.utils.animations.AnimationHandler;
import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Final;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.Shadow;

4
src/main/java/net/silentclient/client/mixin/mixins/RenderManagerMixin.java
View File

@ -3,8 +3,8 @@ package net.silentclient.client.mixin.mixins;
import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.entity.RenderManager;
import net.minecraft.entity.Entity; import net.minecraft.entity.Entity;
import net.minecraft.entity.projectile.EntityArrow; import net.minecraft.entity.projectile.EntityArrow;
import net.silentclient.client.event.impl.EventRenderHitbox; import net.silentclient.clientcommon.event.impl.EventRenderHitbox;
import net.silentclient.client.hooks.RenderArrowHook; import net.silentclient.clientcommon.hooks.RenderArrowHook;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.Inject;

2
src/main/java/net/silentclient/client/mixin/mixins/RenderMixin.java
View File

@ -2,7 +2,7 @@ package net.silentclient.client.mixin.mixins;
import net.minecraft.client.renderer.entity.Render; import net.minecraft.client.renderer.entity.Render;
import net.minecraft.entity.Entity; import net.minecraft.entity.Entity;
import net.silentclient.client.hooks.NameTagRenderingHooks; import net.silentclient.clientcommon.hooks.NameTagRenderingHooks;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Overwrite; import org.spongepowered.asm.mixin.Overwrite;

18
src/main/java/net/silentclient/client/mixin/mixins/RenderPlayerMixin.java
View File

@ -8,16 +8,16 @@ import net.minecraft.client.renderer.entity.RenderManager;
import net.minecraft.client.renderer.entity.RenderPlayer; import net.minecraft.client.renderer.entity.RenderPlayer;
import net.minecraft.client.renderer.entity.RendererLivingEntity; import net.minecraft.client.renderer.entity.RendererLivingEntity;
import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.EnumChatFormatting;
import net.silentclient.client.Client; import net.silentclient.clientcommon.Client;
import net.silentclient.client.cosmetics.AbstractShieldRenderer; import net.silentclient.clientcommon.cosmetics.AbstractShieldRenderer;
import net.silentclient.client.cosmetics.BandanaRenderer; import net.silentclient.clientcommon.cosmetics.BandanaRenderer;
import net.silentclient.client.cosmetics.CapeRenderer; import net.silentclient.clientcommon.cosmetics.CapeRenderer;
import net.silentclient.client.cosmetics.HatRenderer; import net.silentclient.clientcommon.cosmetics.HatRenderer;
import net.silentclient.client.cosmetics.wings.WingsModel; import net.silentclient.clientcommon.cosmetics.wings.WingsModel;
import net.silentclient.client.mixin.ducks.AbstractClientPlayerExt; import net.silentclient.client.mixin.ducks.AbstractClientPlayerExt;
import net.silentclient.client.mods.render.NametagsMod; import net.silentclient.clientcommon.mods.render.NametagsMod;
import net.silentclient.client.mods.util.Server; import net.silentclient.clientcommon.mods.util.Server;
import net.silentclient.client.utils.HypixelUtils; import net.silentclient.clientcommon.utils.HypixelUtils;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.Inject;

2
src/main/java/net/silentclient/client/mixin/mixins/RenderTNTPrimedMixin.java
View File

@ -2,7 +2,7 @@ package net.silentclient.client.mixin.mixins;
import net.minecraft.client.renderer.entity.RenderTNTPrimed; import net.minecraft.client.renderer.entity.RenderTNTPrimed;
import net.minecraft.entity.item.EntityTNTPrimed; import net.minecraft.entity.item.EntityTNTPrimed;
import net.silentclient.client.Client; import net.silentclient.clientcommon.Client;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.Inject;

20
src/main/java/net/silentclient/client/mixin/mixins/RendererLivingEntityMixin.java
View File

@ -12,16 +12,16 @@ import net.minecraft.entity.passive.EntityAmbientCreature;
import net.minecraft.entity.passive.EntityAnimal; import net.minecraft.entity.passive.EntityAnimal;
import net.minecraft.entity.passive.EntityWaterMob; import net.minecraft.entity.passive.EntityWaterMob;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.silentclient.client.Client; import net.silentclient.clientcommon.Client;
import net.silentclient.client.admin.AdminRender; import net.silentclient.clientcommon.admin.AdminRender;
import net.silentclient.client.cosmetics.gui.CosmeticsGui; import net.silentclient.clientcommon.cosmetics.gui.CosmeticsGui;
import net.silentclient.client.event.impl.EventHitOverlay; import net.silentclient.clientcommon.event.impl.EventHitOverlay;
import net.silentclient.client.event.impl.RenderLivingEvent; import net.silentclient.clientcommon.event.impl.RenderLivingEvent;
import net.silentclient.client.hooks.NameTagRenderingHooks; import net.silentclient.clientcommon.hooks.NameTagRenderingHooks;
import net.silentclient.client.mods.render.NametagsMod; import net.silentclient.clientcommon.mods.render.NametagsMod;
import net.silentclient.client.mods.settings.FPSBoostMod; import net.silentclient.clientcommon.mods.settings.FPSBoostMod;
import net.silentclient.client.utils.RenderTransformer; import net.silentclient.clientcommon.utils.RenderTransformer;
import net.silentclient.client.utils.culling.EntityCulling; import net.silentclient.clientcommon.utils.culling.EntityCulling;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.*; import org.spongepowered.asm.mixin.injection.*;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;

2
src/main/java/net/silentclient/client/mixin/mixins/ResourcePackRepositoryMixin.java
View File

@ -1,7 +1,7 @@
package net.silentclient.client.mixin.mixins; package net.silentclient.client.mixin.mixins;
import net.minecraft.client.resources.ResourcePackRepository; import net.minecraft.client.resources.ResourcePackRepository;
import net.silentclient.client.hooks.ResourcePackRepositoryHook; import net.silentclient.clientcommon.hooks.ResourcePackRepositoryHook;
import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Final;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.Shadow;

4
src/main/java/net/silentclient/client/mixin/mixins/ScreenShotHelperMixin.java
View File

@ -6,8 +6,8 @@ import net.minecraft.client.renderer.OpenGlHelper;
import net.minecraft.client.shader.Framebuffer; import net.minecraft.client.shader.Framebuffer;
import net.minecraft.util.IChatComponent; import net.minecraft.util.IChatComponent;
import net.minecraft.util.ScreenShotHelper; import net.minecraft.util.ScreenShotHelper;
import net.silentclient.client.utils.AsyncScreenshots; import net.silentclient.clientcommon.utils.AsyncScreenshots;
import net.silentclient.client.utils.Multithreading; import net.silentclient.clientcommon.utils.Multithreading;
import org.lwjgl.BufferUtils; import org.lwjgl.BufferUtils;
import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL11;
import org.lwjgl.opengl.GL12; import org.lwjgl.opengl.GL12;

2
src/main/java/net/silentclient/client/mixin/mixins/ServerListEntryNormalMixin.java
View File

@ -2,7 +2,7 @@ package net.silentclient.client.mixin.mixins;
import net.minecraft.client.gui.ServerListEntryNormal; import net.minecraft.client.gui.ServerListEntryNormal;
import net.minecraft.client.multiplayer.ServerData; import net.minecraft.client.multiplayer.ServerData;
import net.silentclient.client.Client; import net.silentclient.clientcommon.Client;
import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Final;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.Shadow;

2
src/main/java/net/silentclient/client/mixin/mixins/ShaderGroupMixin.java
View File

@ -3,7 +3,7 @@ package net.silentclient.client.mixin.mixins;
import net.minecraft.client.shader.Framebuffer; import net.minecraft.client.shader.Framebuffer;
import net.minecraft.client.shader.Shader; import net.minecraft.client.shader.Shader;
import net.minecraft.client.shader.ShaderGroup; import net.minecraft.client.shader.ShaderGroup;
import net.silentclient.client.mods.util.IMixinShaderGroup; import net.silentclient.clientcommon.mods.util.IMixinShaderGroup;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.Shadow;
import org.spongepowered.asm.mixin.gen.Accessor; import org.spongepowered.asm.mixin.gen.Accessor;

4
src/main/java/net/silentclient/client/mixin/mixins/TextureManagerMixin.java
View File

@ -6,8 +6,8 @@ import net.minecraft.client.renderer.texture.ITextureObject;
import net.minecraft.client.renderer.texture.SimpleTexture; import net.minecraft.client.renderer.texture.SimpleTexture;
import net.minecraft.client.renderer.texture.TextureManager; import net.minecraft.client.renderer.texture.TextureManager;
import net.minecraft.util.ResourceLocation; import net.minecraft.util.ResourceLocation;
import net.silentclient.client.Client; import net.silentclient.clientcommon.Client;
import net.silentclient.client.cosmetics.StaticResourceLocation; import net.silentclient.clientcommon.cosmetics.StaticResourceLocation;
import net.silentclient.client.mixin.ducks.TextureManagerExt; import net.silentclient.client.mixin.ducks.TextureManagerExt;
import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Final;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;

2
src/main/java/net/silentclient/client/mixin/mixins/TexturedQuadMixin.java
View File

@ -6,7 +6,7 @@ import net.minecraft.client.renderer.WorldRenderer;
import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
import net.minecraft.client.renderer.vertex.VertexFormat; import net.minecraft.client.renderer.vertex.VertexFormat;
import net.silentclient.client.mixin.accessors.WorldRendererAccessor; import net.silentclient.client.mixin.accessors.WorldRendererAccessor;
import net.silentclient.client.mods.settings.FPSBoostMod; import net.silentclient.clientcommon.mods.settings.FPSBoostMod;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Unique; import org.spongepowered.asm.mixin.Unique;
import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.At;

6
src/main/java/net/silentclient/client/mixin/mixins/TileEntityMobSpawnerRendererMixin.java
View File

@ -2,9 +2,9 @@ package net.silentclient.client.mixin.mixins;
import net.minecraft.client.renderer.tileentity.TileEntityMobSpawnerRenderer; import net.minecraft.client.renderer.tileentity.TileEntityMobSpawnerRenderer;
import net.minecraft.tileentity.MobSpawnerBaseLogic; import net.minecraft.tileentity.MobSpawnerBaseLogic;
import net.silentclient.client.Client; import net.silentclient.clientcommon.Client;
import net.silentclient.client.mods.settings.FPSBoostMod; import net.silentclient.clientcommon.mods.settings.FPSBoostMod;
import net.silentclient.client.utils.culling.EntityCulling; import net.silentclient.clientcommon.utils.culling.EntityCulling;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.Inject;

4
src/main/java/net/silentclient/client/mixin/mixins/TileEntitySkullRendererMixin.java
View File

@ -3,8 +3,8 @@ package net.silentclient.client.mixin.mixins;
import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.GlStateManager;
import net.minecraft.client.renderer.tileentity.TileEntitySkullRenderer; import net.minecraft.client.renderer.tileentity.TileEntitySkullRenderer;
import net.minecraft.tileentity.TileEntitySkull; import net.minecraft.tileentity.TileEntitySkull;
import net.silentclient.client.Client; import net.silentclient.clientcommon.Client;
import net.silentclient.client.mods.settings.FPSBoostMod; import net.silentclient.clientcommon.mods.settings.FPSBoostMod;
import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL11;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.At;

4
src/main/java/net/silentclient/client/mixin/mixins/WorldClientMixin.java
View File

@ -4,8 +4,8 @@ import net.minecraft.client.Minecraft;
import net.minecraft.client.audio.PositionedSoundRecord; import net.minecraft.client.audio.PositionedSoundRecord;
import net.minecraft.client.multiplayer.WorldClient; import net.minecraft.client.multiplayer.WorldClient;
import net.minecraft.util.ResourceLocation; import net.minecraft.util.ResourceLocation;
import net.silentclient.client.event.impl.EventPlaySound; import net.silentclient.clientcommon.event.impl.EventPlaySound;
import net.silentclient.client.mods.settings.FPSBoostMod; import net.silentclient.clientcommon.mods.settings.FPSBoostMod;
import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Final;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.Shadow;

4
src/main/java/net/silentclient/client/mixin/mixins/WorldInfoMixin.java
View File

@ -1,8 +1,8 @@
package net.silentclient.client.mixin.mixins; package net.silentclient.client.mixin.mixins;
import net.minecraft.world.storage.WorldInfo; import net.minecraft.world.storage.WorldInfo;
import net.silentclient.client.Client; import net.silentclient.clientcommon.Client;
import net.silentclient.client.mods.world.TimeChangerMod; import net.silentclient.clientcommon.mods.world.TimeChangerMod;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Overwrite; import org.spongepowered.asm.mixin.Overwrite;
import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.Shadow;

7
src/main/java/net/silentclient/client/mixin/mixins/WorldMixin.java
View File

@ -8,17 +8,14 @@ import net.minecraft.entity.item.EntityItem;
import net.minecraft.entity.item.EntityTNTPrimed; import net.minecraft.entity.item.EntityTNTPrimed;
import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.AxisAlignedBB;
import net.minecraft.world.World; import net.minecraft.world.World;
import net.minecraft.world.WorldProvider; import net.silentclient.clientcommon.Client;
import net.silentclient.client.Client; import net.silentclient.clientcommon.event.impl.EntityJoinLevelEvent;
import net.silentclient.client.event.impl.EntityJoinLevelEvent;
import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Final;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.Shadow;
import org.spongepowered.asm.mixin.Unique; import org.spongepowered.asm.mixin.Unique;
import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.ModifyVariable;
import org.spongepowered.asm.mixin.injection.Redirect;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
import org.spongepowered.asm.mixin.injection.callback.LocalCapture; import org.spongepowered.asm.mixin.injection.callback.LocalCapture;

10
src/main/java/net/silentclient/client/mods/render/SkinsMod.java
View File

@ -1,10 +0,0 @@
package net.silentclient.client.mods.render;
import net.silentclient.client.mods.Mod;
import net.silentclient.client.mods.ModCategory;
public class SkinsMod extends Mod {
public SkinsMod() {
super("3D Skins", ModCategory.MODS, "silentclient/icons/mods/3dskins.png");
}
}

102
src/main/java/net/silentclient/client/Client.java → src/main/java/net/silentclient/clientcommon/Client.java
View File

@ -1,4 +1,4 @@
package net.silentclient.client; package net.silentclient.clientcommon;
import com.google.gson.Gson; import com.google.gson.Gson;
import com.google.gson.GsonBuilder; import com.google.gson.GsonBuilder;
@ -8,37 +8,38 @@ import net.minecraft.client.gui.ScaledResolution;
import net.minecraft.client.multiplayer.ServerData; import net.minecraft.client.multiplayer.ServerData;
import net.minecraft.client.resources.data.IMetadataSerializer; import net.minecraft.client.resources.data.IMetadataSerializer;
import net.minecraft.util.ResourceLocation; import net.minecraft.util.ResourceLocation;
import net.silentclient.client.config.ConfigManager;
import net.silentclient.client.cosmetics.Cosmetics;
import net.silentclient.client.event.EventManager;
import net.silentclient.client.event.EventTarget;
import net.silentclient.client.event.impl.*;
import net.silentclient.client.gui.GuiError;
import net.silentclient.client.gui.UserTutorial;
import net.silentclient.client.gui.font.SilentFontRenderer;
import net.silentclient.client.gui.lite.GuiNews;
import net.silentclient.client.gui.lite.LiteMainMenu;
import net.silentclient.client.gui.lite.clickgui.ClickGUI;
import net.silentclient.client.gui.modmenu.ModMenu;
import net.silentclient.client.gui.silentmainmenu.MainMenuConcept;
import net.silentclient.client.gui.util.BackgroundPanorama;
import net.silentclient.client.keybinds.KeyBindManager;
import net.silentclient.client.mixin.SilentClientTweaker; import net.silentclient.client.mixin.SilentClientTweaker;
import net.silentclient.client.mixin.accessors.MinecraftAccessor; import net.silentclient.client.mixin.accessors.MinecraftAccessor;
import net.silentclient.client.mods.ModInstances; import net.silentclient.clientcommon.config.ConfigManager;
import net.silentclient.client.mods.SettingsManager; import net.silentclient.clientcommon.cosmetics.Cosmetics;
import net.silentclient.client.mods.settings.FPSBoostMod; import net.silentclient.clientcommon.event.EventManager;
import net.silentclient.client.mods.settings.GeneralMod; import net.silentclient.clientcommon.event.EventTarget;
import net.silentclient.client.mods.util.PingSource; import net.silentclient.clientcommon.event.impl.*;
import net.silentclient.client.mods.util.Server; import net.silentclient.clientcommon.gui.GuiError;
import net.silentclient.client.mods.util.Utils; import net.silentclient.clientcommon.gui.UserTutorial;
import net.silentclient.client.premium.PremiumCosmeticsGui; import net.silentclient.clientcommon.gui.font.SilentFontRenderer;
import net.silentclient.client.premium.PremiumUtils; import net.silentclient.clientcommon.gui.lite.GuiNews;
import net.silentclient.client.utils.*; import net.silentclient.clientcommon.gui.lite.LiteMainMenu;
import net.silentclient.client.utils.animations.AnimationHandler; import net.silentclient.clientcommon.gui.lite.clickgui.ClickGUI;
import net.silentclient.client.utils.animations.SneakHandler; import net.silentclient.clientcommon.gui.modmenu.ModMenu;
import net.silentclient.client.utils.culling.EntityCulling; import net.silentclient.clientcommon.gui.silentmainmenu.MainMenuConcept;
import net.silentclient.client.utils.types.*; import net.silentclient.clientcommon.gui.util.BackgroundPanorama;
import net.silentclient.clientcommon.keybinds.KeyBindManager;
import net.silentclient.clientcommon.mods.ModInstances;
import net.silentclient.clientcommon.mods.SettingsManager;
import net.silentclient.clientcommon.mods.settings.FPSBoostMod;
import net.silentclient.clientcommon.mods.settings.GeneralMod;
import net.silentclient.clientcommon.mods.util.PingSource;
import net.silentclient.clientcommon.mods.util.Server;
import net.silentclient.clientcommon.mods.util.Utils;
import net.silentclient.clientcommon.premium.PremiumCosmeticsGui;
import net.silentclient.clientcommon.premium.PremiumUtils;
import net.silentclient.clientcommon.types.*;
import net.silentclient.clientcommon.types.interfaces.IWrapper;
import net.silentclient.clientcommon.utils.*;
import net.silentclient.clientcommon.utils.animations.AnimationHandler;
import net.silentclient.clientcommon.utils.animations.SneakHandler;
import net.silentclient.clientcommon.utils.culling.EntityCulling;
import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.Logger;
import org.json.JSONObject; import org.json.JSONObject;
@ -52,6 +53,7 @@ import java.lang.management.ManagementFactory;
import java.net.URISyntaxException; import java.net.URISyntaxException;
import java.net.URL; import java.net.URL;
import java.net.UnknownHostException; import java.net.UnknownHostException;
import java.nio.file.Files;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@ -97,6 +99,7 @@ public class Client {
private AccountManager accountManager; private AccountManager accountManager;
public ServerData lastServerData; public ServerData lastServerData;
public TextUtils textUtils; public TextUtils textUtils;
private static IWrapper wrapper;
public static void memoryDebug(String paramString) { public static void memoryDebug(String paramString) {
LogManager.getLogger().info("-- Start Memory Debug -- " + paramString); LogManager.getLogger().info("-- Start Memory Debug -- " + paramString);
@ -109,7 +112,9 @@ public class Client {
LogManager.getLogger().info("-- End Memory Debug -- " + paramString); LogManager.getLogger().info("-- End Memory Debug -- " + paramString);
} }
public void init() throws IOException { public void init(IWrapper wrapper) throws IOException {
Client.setWrapper(wrapper);
wrapper.init();
try { try {
InputStream in = getClass().getResourceAsStream("/build_data.json"); InputStream in = getClass().getResourceAsStream("/build_data.json");
BufferedReader reader = new BufferedReader(new InputStreamReader(in)); BufferedReader reader = new BufferedReader(new InputStreamReader(in));
@ -127,7 +132,8 @@ public class Client {
Client.logger.catching(e1); Client.logger.catching(e1);
} }
try { try {
InputStream in = new FileInputStream(new File(Minecraft.getMinecraft().mcDataDir, "silent_account.json")); Client.logger.info(wrapper.getMinecraft().getMcDataDir());
InputStream in = Files.newInputStream(new File(wrapper.getMinecraft().getMcDataDir(), "silent_account.json").toPath());
BufferedReader reader = new BufferedReader(new InputStreamReader(in)); BufferedReader reader = new BufferedReader(new InputStreamReader(in));
StringBuffer content = new StringBuffer(); StringBuffer content = new StringBuffer();
String inputLine; String inputLine;
@ -141,7 +147,7 @@ public class Client {
in.close(); in.close();
if(!ClientUtils.isDevelopment()) { if(!ClientUtils.isDevelopment()) {
try { try {
new File(Minecraft.getMinecraft().mcDataDir, "silent_account.json").delete(); new File(wrapper.getMinecraft().getMcDataDir(), "silent_account.json").delete();
} catch (Exception err) { } catch (Exception err) {
} }
@ -150,11 +156,11 @@ public class Client {
} }
logger.info("---------[ Silent Client Initialising ]---------"); logger.info("---------[ Silent Client Initialising ]---------");
logger.info("MC Version: 1.8.9"); logger.info("MC Version: " + wrapper.getMcVersion().toString());
logger.info("SC Version: " + getFullVersion()); logger.info("SC Version: " + getFullVersion());
logger.info("Width: " + Minecraft.getMinecraft().displayWidth); logger.info("Width: " + wrapper.getMinecraft().getDisplayWidth());
logger.info("Height: " + Minecraft.getMinecraft().displayHeight); logger.info("Height: " + wrapper.getMinecraft().getDisplayHeight());
logger.info("Fullscreen: " + Minecraft.getMinecraft().isFullScreen()); logger.info("Fullscreen: " + wrapper.getMinecraft().isFullScreen());
List<GarbageCollectorMXBean> gcMxBeans = ManagementFactory.getGarbageCollectorMXBeans(); List<GarbageCollectorMXBean> gcMxBeans = ManagementFactory.getGarbageCollectorMXBeans();
for (GarbageCollectorMXBean gcMxBean : gcMxBeans) { for (GarbageCollectorMXBean gcMxBean : gcMxBeans) {
@ -171,11 +177,11 @@ public class Client {
this.gson = (new GsonBuilder()).registerTypeAdapterFactory(new EnumAdapterFactory()).setPrettyPrinting() this.gson = (new GsonBuilder()).registerTypeAdapterFactory(new EnumAdapterFactory()).setPrettyPrinting()
.enableComplexMapKeySerialization().create(); .enableComplexMapKeySerialization().create();
logger.info("INITIALISING > silent-directory"); logger.info("INITIALISING > silent-directory");
configDir = new File(Minecraft.getMinecraft().mcDataDir, "SilentClient-Configs"); configDir = new File(wrapper.getMinecraft().getMcDataDir(), "SilentClient-Configs");
if (!configDir.exists()) { if (!configDir.exists()) {
configDir.mkdirs(); configDir.mkdirs();
} }
globalSettingsFile = new File(Minecraft.getMinecraft().mcDataDir, "silent_settings.json"); globalSettingsFile = new File(wrapper.getMinecraft().getMcDataDir(), "silent_settings.json");
if(!globalSettingsFile.exists()) { if(!globalSettingsFile.exists()) {
globalSettingsFile.createNewFile(); globalSettingsFile.createNewFile();
} }
@ -231,12 +237,12 @@ public class Client {
globalSettings.save(); globalSettings.save();
Client.getInstance().updateWindowTitle(); Client.getInstance().updateWindowTitle();
if(!globalSettings.configsMigrated && new File(Minecraft.getMinecraft().mcDataDir, "SilentClient").exists() && new File(Minecraft.getMinecraft().mcDataDir, "SilentClient").isDirectory()) { if(!globalSettings.configsMigrated && new File(wrapper.getMinecraft().getMcDataDir(), "SilentClient").exists() && new File(wrapper.getMinecraft().getMcDataDir(), "SilentClient").isDirectory()) {
logger.info("STARTING > migrating-configs"); logger.info("STARTING > migrating-configs");
for(String file : new File(Minecraft.getMinecraft().mcDataDir, "SilentClient").list()) { for(String file : new File(wrapper.getMinecraft().getMcDataDir(), "SilentClient").list()) {
if(!new File(Minecraft.getMinecraft().mcDataDir, "SilentClient/" + file).isDirectory()) { if(!new File(wrapper.getMinecraft().getMcDataDir(), "SilentClient/" + file).isDirectory()) {
Client.logger.info("STARTING > migrating-configs > " + file); Client.logger.info("STARTING > migrating-configs > " + file);
FileUtils.copyFile(new File(Minecraft.getMinecraft().mcDataDir, "SilentClient/" + file), new File(Minecraft.getMinecraft().mcDataDir, "SilentClient-Configs/" + file)); FileUtils.copyFile(new File(wrapper.getMinecraft().getMcDataDir(), "SilentClient/" + file), new File(wrapper.getMinecraft().getMcDataDir(), "SilentClient-Configs/" + file));
} }
} }
globalSettings.configsMigrated = true; globalSettings.configsMigrated = true;
@ -371,7 +377,7 @@ public class Client {
// utils // utils
public void updateWindowTitle() { public void updateWindowTitle() {
Display.setTitle(String.format("Silent Client%s %s (1.8.9)", Client.getInstance().getGlobalSettings() != null && Client.getInstance().getGlobalSettings().isLite() ? " Lite" : "", Client.getInstance().getFullVersion())); Display.setTitle(String.format("Silent Client%s %s (%s)", Client.getInstance().getGlobalSettings() != null && Client.getInstance().getGlobalSettings().isLite() ? " Lite" : "", Client.getInstance().getFullVersion(), getWrapper().getMcVersion().toString()));
} }
public void updateUserInformation() { public void updateUserInformation() {
@ -692,4 +698,12 @@ public class Client {
} }
return Client.getInstance().getGlobalSettings().isLite() ? new LiteMainMenu() : new MainMenuConcept(); return Client.getInstance().getGlobalSettings().isLite() ? new LiteMainMenu() : new MainMenuConcept();
} }
public static IWrapper getWrapper() {
return wrapper;
}
public static void setWrapper(IWrapper wrapper) {
Client.wrapper = wrapper;
}
} }

28
src/main/java/net/silentclient/client/admin/AdminRender.java → src/main/java/net/silentclient/clientcommon/admin/AdminRender.java
View File

@ -1,4 +1,4 @@
package net.silentclient.client.admin; package net.silentclient.clientcommon.admin;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.gui.GuiScreen;
@ -6,20 +6,20 @@ import net.minecraft.client.gui.ScaledResolution;
import net.minecraft.util.MathHelper; import net.minecraft.util.MathHelper;
import net.minecraft.util.ResourceLocation; import net.minecraft.util.ResourceLocation;
import net.minecraft.util.Util; import net.minecraft.util.Util;
import net.silentclient.client.Client; import net.silentclient.clientcommon.Client;
import net.silentclient.client.cosmetics.AnimatedResourceLocation; import net.silentclient.clientcommon.cosmetics.AnimatedResourceLocation;
import net.silentclient.client.cosmetics.ShieldData; import net.silentclient.clientcommon.cosmetics.ShieldData;
import net.silentclient.client.cosmetics.StaticResourceLocation; import net.silentclient.clientcommon.cosmetics.StaticResourceLocation;
import net.silentclient.client.cosmetics.gui.CosmeticsGui; import net.silentclient.clientcommon.cosmetics.gui.CosmeticsGui;
import net.silentclient.client.gui.elements.StaticButton; import net.silentclient.clientcommon.gui.elements.StaticButton;
import net.silentclient.client.gui.lite.clickgui.utils.GlUtils; import net.silentclient.clientcommon.gui.lite.clickgui.utils.GlUtils;
import net.silentclient.client.gui.lite.clickgui.utils.MouseUtils; import net.silentclient.clientcommon.gui.lite.clickgui.utils.MouseUtils;
import net.silentclient.client.gui.lite.clickgui.utils.RenderUtils; import net.silentclient.clientcommon.gui.lite.clickgui.utils.RenderUtils;
import net.silentclient.client.mixin.ducks.AbstractClientPlayerExt; import net.silentclient.client.mixin.ducks.AbstractClientPlayerExt;
import net.silentclient.client.mods.CustomFontRenderer; import net.silentclient.clientcommon.mods.CustomFontRenderer;
import net.silentclient.client.mods.CustomFontRenderer.RenderMode; import net.silentclient.clientcommon.mods.CustomFontRenderer.RenderMode;
import net.silentclient.client.utils.FileUtils; import net.silentclient.clientcommon.utils.FileUtils;
import net.silentclient.client.utils.Players; import net.silentclient.clientcommon.utils.Players;
import org.lwjgl.Sys; import org.lwjgl.Sys;
import org.lwjgl.input.Mouse; import org.lwjgl.input.Mouse;

2
src/main/java/net/silentclient/client/blc/BlcGlStateManager.java → src/main/java/net/silentclient/clientcommon/blc/BlcGlStateManager.java
View File

@ -1,4 +1,4 @@
package net.silentclient.client.blc; package net.silentclient.clientcommon.blc;
import java.nio.FloatBuffer; import java.nio.FloatBuffer;
import java.nio.IntBuffer; import java.nio.IntBuffer;

26
src/main/java/net/silentclient/client/config/AddConfigModal.java → src/main/java/net/silentclient/clientcommon/config/AddConfigModal.java
View File

@ -1,21 +1,21 @@
package net.silentclient.client.config; package net.silentclient.clientcommon.config;
import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiButton;
import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.gui.GuiScreen;
import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.GlStateManager;
import net.minecraft.util.ResourceLocation; import net.minecraft.util.ResourceLocation;
import net.silentclient.client.Client; import net.silentclient.clientcommon.Client;
import net.silentclient.client.gui.SilentScreen; import net.silentclient.clientcommon.gui.SilentScreen;
import net.silentclient.client.gui.elements.Button; import net.silentclient.clientcommon.gui.elements.Button;
import net.silentclient.client.gui.elements.Checkbox; import net.silentclient.clientcommon.gui.elements.Checkbox;
import net.silentclient.client.gui.elements.IconButton; import net.silentclient.clientcommon.gui.elements.IconButton;
import net.silentclient.client.gui.elements.Input; import net.silentclient.clientcommon.gui.elements.Input;
import net.silentclient.client.gui.font.SilentFontRenderer; import net.silentclient.clientcommon.gui.font.SilentFontRenderer;
import net.silentclient.client.gui.lite.clickgui.utils.RenderUtils; import net.silentclient.clientcommon.gui.lite.clickgui.utils.RenderUtils;
import net.silentclient.client.gui.theme.Theme; import net.silentclient.clientcommon.gui.theme.Theme;
import net.silentclient.client.utils.MenuBlurUtils; import net.silentclient.clientcommon.utils.MenuBlurUtils;
import net.silentclient.client.utils.MouseCursorHandler; import net.silentclient.clientcommon.utils.MouseCursorHandler;
import net.silentclient.client.utils.NotificationUtils; import net.silentclient.clientcommon.utils.NotificationUtils;
import org.lwjgl.input.Keyboard; import org.lwjgl.input.Keyboard;
import java.io.IOException; import java.io.IOException;

18
src/main/java/net/silentclient/client/config/ConfigManager.java → src/main/java/net/silentclient/clientcommon/config/ConfigManager.java
View File

@ -1,13 +1,13 @@
package net.silentclient.client.config; package net.silentclient.clientcommon.config;
import net.silentclient.client.Client; import net.silentclient.clientcommon.Client;
import net.silentclient.client.gui.hud.ScreenPosition; import net.silentclient.clientcommon.gui.hud.ScreenPosition;
import net.silentclient.client.gui.notification.NotificationManager; import net.silentclient.clientcommon.gui.notification.NotificationManager;
import net.silentclient.client.mods.Mod; import net.silentclient.clientcommon.mods.Mod;
import net.silentclient.client.mods.ModDraggable; import net.silentclient.clientcommon.mods.ModDraggable;
import net.silentclient.client.mods.Setting; import net.silentclient.clientcommon.mods.Setting;
import net.silentclient.client.mods.player.AutoTextMod.AutoTextCommand; import net.silentclient.clientcommon.mods.player.AutoTextMod.AutoTextCommand;
import net.silentclient.client.utils.FileUtils; import net.silentclient.clientcommon.utils.FileUtils;
import java.awt.*; import java.awt.*;
import java.io.*; import java.io.*;

8
src/main/java/net/silentclient/client/cosmetics/AbstractShieldRenderer.java → src/main/java/net/silentclient/clientcommon/cosmetics/AbstractShieldRenderer.java
View File

@ -1,4 +1,4 @@
package net.silentclient.client.cosmetics; package net.silentclient.clientcommon.cosmetics;
import net.minecraft.client.entity.AbstractClientPlayer; import net.minecraft.client.entity.AbstractClientPlayer;
import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelBase;
@ -6,10 +6,10 @@ import net.minecraft.client.renderer.GlStateManager;
import net.minecraft.client.renderer.entity.RenderPlayer; import net.minecraft.client.renderer.entity.RenderPlayer;
import net.minecraft.client.renderer.entity.layers.LayerRenderer; import net.minecraft.client.renderer.entity.layers.LayerRenderer;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.silentclient.client.Client; import net.silentclient.clientcommon.Client;
import net.silentclient.client.blc.BlcGlStateManager; import net.silentclient.clientcommon.blc.BlcGlStateManager;
import net.silentclient.client.mixin.ducks.AbstractClientPlayerExt; import net.silentclient.client.mixin.ducks.AbstractClientPlayerExt;
import net.silentclient.client.mods.settings.CosmeticsMod; import net.silentclient.clientcommon.mods.settings.CosmeticsMod;
public class AbstractShieldRenderer extends ModelBase implements LayerRenderer<AbstractClientPlayer> { public class AbstractShieldRenderer extends ModelBase implements LayerRenderer<AbstractClientPlayer> {
private final RenderPlayer playerRenderer; private final RenderPlayer playerRenderer;

8
src/main/java/net/silentclient/client/cosmetics/AnimatedResourceLocation.java → src/main/java/net/silentclient/clientcommon/cosmetics/AnimatedResourceLocation.java
View File

@ -1,9 +1,11 @@
package net.silentclient.client.cosmetics; package net.silentclient.clientcommon.cosmetics;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
import net.minecraft.util.ResourceLocation; import net.minecraft.util.ResourceLocation;
import net.silentclient.client.mixin.ducks.TextureManagerExt; import net.silentclient.client.mixin.ducks.TextureManagerExt;
import net.silentclient.client.utils.TimerUtils; import net.silentclient.clientcommon.Client;
import net.silentclient.clientcommon.types.interfaces.classwrappers.ResourceLocationWrapper;
import net.silentclient.clientcommon.utils.TimerUtils;
import java.util.ArrayList; import java.util.ArrayList;
@ -69,7 +71,7 @@ public class AnimatedResourceLocation {
public void bindTexture() { public void bindTexture() {
if(currentFrame == 0) { if(currentFrame == 0) {
binding = false; binding = false;
Minecraft.getMinecraft().getTextureManager().bindTexture(this.getTexture()); Client.getWrapper().getMinecraft().getTextureManager().bindTexture(new ResourceLocationWrapper(getTexture().getResourcePath()));
return; return;
} }
binding = ((TextureManagerExt) Minecraft.getMinecraft().getTextureManager()).waitBindTexture(new StaticResourceLocation(this.getTexture().getResourcePath()), new StaticResourceLocation(this.getTextures()[0].getResourcePath()), 1000); binding = ((TextureManagerExt) Minecraft.getMinecraft().getTextureManager()).waitBindTexture(new StaticResourceLocation(this.getTexture().getResourcePath()), new StaticResourceLocation(this.getTextures()[0].getResourcePath()), 1000);

10
src/main/java/net/silentclient/client/cosmetics/BandanaRenderer.java → src/main/java/net/silentclient/clientcommon/cosmetics/BandanaRenderer.java
View File

@ -1,4 +1,4 @@
package net.silentclient.client.cosmetics; package net.silentclient.clientcommon.cosmetics;
import java.awt.image.BufferedImage; import java.awt.image.BufferedImage;
import java.io.File; import java.io.File;
@ -17,12 +17,12 @@ import net.minecraft.client.renderer.GlStateManager;
import net.minecraft.client.renderer.entity.RenderPlayer; import net.minecraft.client.renderer.entity.RenderPlayer;
import net.minecraft.client.renderer.entity.layers.LayerRenderer; import net.minecraft.client.renderer.entity.layers.LayerRenderer;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.silentclient.client.Client; import net.silentclient.clientcommon.Client;
import net.silentclient.client.blc.BlcGlStateManager; import net.silentclient.clientcommon.blc.BlcGlStateManager;
import net.silentclient.client.mixin.accessors.MinecraftAccessor; import net.silentclient.client.mixin.accessors.MinecraftAccessor;
import net.silentclient.client.mixin.ducks.AbstractClientPlayerExt; import net.silentclient.client.mixin.ducks.AbstractClientPlayerExt;
import net.silentclient.client.mods.settings.CosmeticsMod; import net.silentclient.clientcommon.mods.settings.CosmeticsMod;
import net.silentclient.client.utils.ColorUtils; import net.silentclient.clientcommon.utils.ColorUtils;
public class BandanaRenderer extends ModelBase implements LayerRenderer<AbstractClientPlayer> { public class BandanaRenderer extends ModelBase implements LayerRenderer<AbstractClientPlayer> {
private final RenderPlayer playerRenderer; private final RenderPlayer playerRenderer;

8
src/main/java/net/silentclient/client/cosmetics/CapeRenderer.java → src/main/java/net/silentclient/clientcommon/cosmetics/CapeRenderer.java
View File

@ -1,4 +1,4 @@
package net.silentclient.client.cosmetics; package net.silentclient.clientcommon.cosmetics;
import net.silentclient.client.mixin.ducks.AbstractClientPlayerExt; import net.silentclient.client.mixin.ducks.AbstractClientPlayerExt;
import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL11;
@ -9,9 +9,9 @@ import net.minecraft.client.model.ModelRenderer;
import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.GlStateManager;
import net.minecraft.client.renderer.entity.RenderPlayer; import net.minecraft.client.renderer.entity.RenderPlayer;
import net.minecraft.client.renderer.entity.layers.LayerRenderer; import net.minecraft.client.renderer.entity.layers.LayerRenderer;
import net.silentclient.client.Client; import net.silentclient.clientcommon.Client;
import net.silentclient.client.mods.settings.FPSBoostMod; import net.silentclient.clientcommon.mods.settings.FPSBoostMod;
import net.silentclient.client.utils.AngleUtilities; import net.silentclient.clientcommon.utils.AngleUtilities;
public class CapeRenderer extends ModelBase implements LayerRenderer<AbstractClientPlayer> { public class CapeRenderer extends ModelBase implements LayerRenderer<AbstractClientPlayer> {
private final RenderPlayer playerRenderer; private final RenderPlayer playerRenderer;

16
src/main/java/net/silentclient/client/cosmetics/Cosmetics.java → src/main/java/net/silentclient/clientcommon/cosmetics/Cosmetics.java
View File

@ -1,4 +1,4 @@
package net.silentclient.client.cosmetics; package net.silentclient.clientcommon.cosmetics;
import com.google.gson.Gson; import com.google.gson.Gson;
import com.google.gson.GsonBuilder; import com.google.gson.GsonBuilder;
@ -6,14 +6,14 @@ import net.minecraft.client.Minecraft;
import net.minecraft.client.entity.AbstractClientPlayer; import net.minecraft.client.entity.AbstractClientPlayer;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.util.ResourceLocation; import net.minecraft.util.ResourceLocation;
import net.silentclient.client.Client; import net.silentclient.clientcommon.Client;
import net.silentclient.client.cosmetics.model.ModelBuffer; import net.silentclient.clientcommon.cosmetics.model.ModelBuffer;
import net.silentclient.client.mixin.ducks.AbstractClientPlayerExt; import net.silentclient.client.mixin.ducks.AbstractClientPlayerExt;
import net.silentclient.client.mods.settings.CosmeticsMod; import net.silentclient.clientcommon.mods.settings.CosmeticsMod;
import net.silentclient.client.utils.Players; import net.silentclient.clientcommon.utils.Players;
import net.silentclient.client.utils.Requests; import net.silentclient.clientcommon.utils.Requests;
import net.silentclient.client.utils.types.PlayerResponse; import net.silentclient.clientcommon.types.PlayerResponse;
import net.silentclient.client.utils.types.PlayerResponse.Account.Cosmetics.CosmeticItem; import net.silentclient.clientcommon.types.PlayerResponse.Account.Cosmetics.CosmeticItem;
import java.io.BufferedReader; import java.io.BufferedReader;
import java.io.InputStream; import java.io.InputStream;

2
src/main/java/net/silentclient/client/cosmetics/HatData.java → src/main/java/net/silentclient/clientcommon/cosmetics/HatData.java
View File

@ -1,4 +1,4 @@
package net.silentclient.client.cosmetics; package net.silentclient.clientcommon.cosmetics;
public class HatData { public class HatData {
private final String model; private final String model;

8
src/main/java/net/silentclient/client/cosmetics/HatRenderer.java → src/main/java/net/silentclient/clientcommon/cosmetics/HatRenderer.java
View File

@ -1,4 +1,4 @@
package net.silentclient.client.cosmetics; package net.silentclient.clientcommon.cosmetics;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
import net.minecraft.client.entity.AbstractClientPlayer; import net.minecraft.client.entity.AbstractClientPlayer;
@ -7,11 +7,11 @@ import net.minecraft.client.renderer.GlStateManager;
import net.minecraft.client.renderer.entity.RenderPlayer; import net.minecraft.client.renderer.entity.RenderPlayer;
import net.minecraft.client.renderer.entity.layers.LayerRenderer; import net.minecraft.client.renderer.entity.layers.LayerRenderer;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.silentclient.client.Client; import net.silentclient.clientcommon.Client;
import net.silentclient.client.blc.BlcGlStateManager; import net.silentclient.clientcommon.blc.BlcGlStateManager;
import net.silentclient.client.mixin.accessors.MinecraftAccessor; import net.silentclient.client.mixin.accessors.MinecraftAccessor;
import net.silentclient.client.mixin.ducks.AbstractClientPlayerExt; import net.silentclient.client.mixin.ducks.AbstractClientPlayerExt;
import net.silentclient.client.mods.settings.CosmeticsMod; import net.silentclient.clientcommon.mods.settings.CosmeticsMod;
import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL11;
import javax.imageio.ImageIO; import javax.imageio.ImageIO;

6
src/main/java/net/silentclient/client/cosmetics/Outfits.java → src/main/java/net/silentclient/clientcommon/cosmetics/Outfits.java
View File

@ -1,8 +1,8 @@
package net.silentclient.client.cosmetics; package net.silentclient.clientcommon.cosmetics;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
import net.silentclient.client.Client; import net.silentclient.clientcommon.Client;
import net.silentclient.client.utils.Requests; import net.silentclient.clientcommon.utils.Requests;
import java.io.*; import java.io.*;
import java.util.ArrayList; import java.util.ArrayList;

2
src/main/java/net/silentclient/client/cosmetics/ShieldData.java → src/main/java/net/silentclient/clientcommon/cosmetics/ShieldData.java
View File

@ -1,4 +1,4 @@
package net.silentclient.client.cosmetics; package net.silentclient.clientcommon.cosmetics;
public class ShieldData { public class ShieldData {
private final String model; private final String model;

4
src/main/java/net/silentclient/client/cosmetics/StaticCape.java → src/main/java/net/silentclient/clientcommon/cosmetics/StaticCape.java
View File

@ -1,8 +1,8 @@
package net.silentclient.client.cosmetics; package net.silentclient.clientcommon.cosmetics;
import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL11;
import net.silentclient.client.cosmetics.dynamiccurved.Box; import net.silentclient.clientcommon.cosmetics.dynamiccurved.Box;
public class StaticCape { public class StaticCape {
private final float curvePoints; private final float curvePoints;

2
src/main/java/net/silentclient/client/cosmetics/StaticResourceLocation.java → src/main/java/net/silentclient/clientcommon/cosmetics/StaticResourceLocation.java
View File

@ -1,4 +1,4 @@
package net.silentclient.client.cosmetics; package net.silentclient.clientcommon.cosmetics;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
import net.minecraft.util.ResourceLocation; import net.minecraft.util.ResourceLocation;

2
src/main/java/net/silentclient/client/cosmetics/dynamiccurved/Box.java → src/main/java/net/silentclient/clientcommon/cosmetics/dynamiccurved/Box.java
View File

@ -1,4 +1,4 @@
package net.silentclient.client.cosmetics.dynamiccurved; package net.silentclient.clientcommon.cosmetics.dynamiccurved;
public class Box { public class Box {
public float a; public float a;

2
src/main/java/net/silentclient/client/cosmetics/dynamiccurved/DynamicCape.java → src/main/java/net/silentclient/clientcommon/cosmetics/dynamiccurved/DynamicCape.java
View File

@ -1,4 +1,4 @@
package net.silentclient.client.cosmetics.dynamiccurved; package net.silentclient.clientcommon.cosmetics.dynamiccurved;
import java.nio.FloatBuffer; import java.nio.FloatBuffer;

38
src/main/java/net/silentclient/client/cosmetics/gui/CosmeticsGui.java → src/main/java/net/silentclient/clientcommon/cosmetics/gui/CosmeticsGui.java
View File

@ -1,4 +1,4 @@
package net.silentclient.client.cosmetics.gui; package net.silentclient.clientcommon.cosmetics.gui;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiButton;
@ -9,23 +9,23 @@ import net.minecraft.client.renderer.entity.RenderManager;
import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.EntityLivingBase;
import net.minecraft.util.MathHelper; import net.minecraft.util.MathHelper;
import net.minecraft.util.ResourceLocation; import net.minecraft.util.ResourceLocation;
import net.silentclient.client.Client; import net.silentclient.clientcommon.Client;
import net.silentclient.client.gui.SilentScreen; import net.silentclient.clientcommon.gui.SilentScreen;
import net.silentclient.client.gui.elements.Button; import net.silentclient.clientcommon.gui.elements.Button;
import net.silentclient.client.gui.elements.Input; import net.silentclient.clientcommon.gui.elements.Input;
import net.silentclient.client.gui.font.SilentFontRenderer; import net.silentclient.clientcommon.gui.font.SilentFontRenderer;
import net.silentclient.client.gui.lite.clickgui.utils.MouseUtils; import net.silentclient.clientcommon.gui.lite.clickgui.utils.MouseUtils;
import net.silentclient.client.gui.theme.Theme; import net.silentclient.clientcommon.gui.theme.Theme;
import net.silentclient.client.gui.theme.button.DefaultButtonTheme; import net.silentclient.clientcommon.gui.theme.button.DefaultButtonTheme;
import net.silentclient.client.gui.theme.button.SelectedButtonTheme; import net.silentclient.clientcommon.gui.theme.button.SelectedButtonTheme;
import net.silentclient.client.gui.util.RenderUtil; import net.silentclient.clientcommon.gui.util.RenderUtil;
import net.silentclient.client.mods.settings.CosmeticsMod; import net.silentclient.clientcommon.mods.settings.CosmeticsMod;
import net.silentclient.client.mods.settings.GeneralMod; import net.silentclient.clientcommon.mods.settings.GeneralMod;
import net.silentclient.client.utils.MenuBlurUtils; import net.silentclient.clientcommon.utils.MenuBlurUtils;
import net.silentclient.client.utils.MouseCursorHandler; import net.silentclient.clientcommon.utils.MouseCursorHandler;
import net.silentclient.client.utils.ScrollHelper; import net.silentclient.clientcommon.utils.ScrollHelper;
import net.silentclient.client.utils.Sounds; import net.silentclient.clientcommon.utils.Sounds;
import net.silentclient.client.utils.types.PlayerResponse.Account.Cosmetics.CosmeticItem; import net.silentclient.clientcommon.types.PlayerResponse.Account.Cosmetics.CosmeticItem;
import org.lwjgl.input.Mouse; import org.lwjgl.input.Mouse;
import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL11;
@ -303,7 +303,7 @@ public class CosmeticsGui extends SilentScreen {
scrollHelper.setStep(5); scrollHelper.setStep(5);
scrollHelper.setElementsHeight((items != null ? items.size() : 0) * 35); scrollHelper.setElementsHeight((items != null ? items.size() : 0) * 35);
scrollHelper.setMaxScroll(height - 25); scrollHelper.setMaxScroll(height - 25);
scrollHelper.setSpeed(100); scrollHelper.setSpeed(200);
GL11.glPushMatrix(); GL11.glPushMatrix();
GL11.glEnable(GL11.GL_SCISSOR_TEST); GL11.glEnable(GL11.GL_SCISSOR_TEST);
ScaledResolution r = new ScaledResolution(mc); ScaledResolution r = new ScaledResolution(mc);

24
src/main/java/net/silentclient/client/cosmetics/gui/NewOutfitModal.java → src/main/java/net/silentclient/clientcommon/cosmetics/gui/NewOutfitModal.java
View File

@ -1,20 +1,20 @@
package net.silentclient.client.cosmetics.gui; package net.silentclient.clientcommon.cosmetics.gui;
import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiButton;
import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.gui.GuiScreen;
import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.GlStateManager;
import net.minecraft.util.ResourceLocation; import net.minecraft.util.ResourceLocation;
import net.silentclient.client.Client; import net.silentclient.clientcommon.Client;
import net.silentclient.client.cosmetics.Outfits; import net.silentclient.clientcommon.cosmetics.Outfits;
import net.silentclient.client.gui.SilentScreen; import net.silentclient.clientcommon.gui.SilentScreen;
import net.silentclient.client.gui.elements.Button; import net.silentclient.clientcommon.gui.elements.Button;
import net.silentclient.client.gui.elements.IconButton; import net.silentclient.clientcommon.gui.elements.IconButton;
import net.silentclient.client.gui.elements.Input; import net.silentclient.clientcommon.gui.elements.Input;
import net.silentclient.client.gui.font.SilentFontRenderer; import net.silentclient.clientcommon.gui.font.SilentFontRenderer;
import net.silentclient.client.gui.lite.clickgui.utils.RenderUtils; import net.silentclient.clientcommon.gui.lite.clickgui.utils.RenderUtils;
import net.silentclient.client.gui.theme.Theme; import net.silentclient.clientcommon.gui.theme.Theme;
import net.silentclient.client.utils.MenuBlurUtils; import net.silentclient.clientcommon.utils.MenuBlurUtils;
import net.silentclient.client.utils.NotificationUtils; import net.silentclient.clientcommon.utils.NotificationUtils;
import org.lwjgl.input.Keyboard; import org.lwjgl.input.Keyboard;
import java.awt.*; import java.awt.*;

28
src/main/java/net/silentclient/client/cosmetics/gui/OutfitsGui.java → src/main/java/net/silentclient/clientcommon/cosmetics/gui/OutfitsGui.java
View File

@ -1,4 +1,4 @@
package net.silentclient.client.cosmetics.gui; package net.silentclient.clientcommon.cosmetics.gui;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiButton;
@ -6,18 +6,18 @@ import net.minecraft.client.gui.GuiScreen;
import net.minecraft.client.gui.ScaledResolution; import net.minecraft.client.gui.ScaledResolution;
import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.GlStateManager;
import net.minecraft.util.ResourceLocation; import net.minecraft.util.ResourceLocation;
import net.silentclient.client.Client; import net.silentclient.clientcommon.Client;
import net.silentclient.client.cosmetics.Outfits; import net.silentclient.clientcommon.cosmetics.Outfits;
import net.silentclient.client.gui.SilentScreen; import net.silentclient.clientcommon.gui.SilentScreen;
import net.silentclient.client.gui.elements.IconButton; import net.silentclient.clientcommon.gui.elements.IconButton;
import net.silentclient.client.gui.font.SilentFontRenderer; import net.silentclient.clientcommon.gui.font.SilentFontRenderer;
import net.silentclient.client.gui.lite.clickgui.utils.MouseUtils; import net.silentclient.clientcommon.gui.lite.clickgui.utils.MouseUtils;
import net.silentclient.client.gui.theme.Theme; import net.silentclient.clientcommon.gui.theme.Theme;
import net.silentclient.client.gui.util.RenderUtil; import net.silentclient.clientcommon.gui.util.RenderUtil;
import net.silentclient.client.utils.MenuBlurUtils; import net.silentclient.clientcommon.utils.MenuBlurUtils;
import net.silentclient.client.utils.MouseCursorHandler; import net.silentclient.clientcommon.utils.MouseCursorHandler;
import net.silentclient.client.utils.ScrollHelper; import net.silentclient.clientcommon.utils.ScrollHelper;
import net.silentclient.client.utils.types.PlayerResponse; import net.silentclient.clientcommon.types.PlayerResponse;
import org.lwjgl.input.Keyboard; import org.lwjgl.input.Keyboard;
import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL11;
@ -70,7 +70,7 @@ public class OutfitsGui extends SilentScreen {
scrollHelper.setStep(5); scrollHelper.setStep(5);
scrollHelper.setElementsHeight((float) Math.ceil((Outfits.getOutfits().size() + 3) / 3) * 85); scrollHelper.setElementsHeight((float) Math.ceil((Outfits.getOutfits().size() + 3) / 3) * 85);
scrollHelper.setMaxScroll(height - 20); scrollHelper.setMaxScroll(height - 20);
scrollHelper.setSpeed(100); scrollHelper.setSpeed(200);
scrollHelper.setFlag(true); scrollHelper.setFlag(true);
float scrollY = scrollHelper.getScroll(); float scrollY = scrollHelper.getScroll();
RenderUtil.drawRoundedRect(x, y, width, height, 4, Theme.backgroundColor().getRGB()); RenderUtil.drawRoundedRect(x, y, width, height, 4, Theme.backgroundColor().getRGB());

2
src/main/java/net/silentclient/client/cosmetics/model/Face.java → src/main/java/net/silentclient/clientcommon/cosmetics/model/Face.java
View File

@ -1,4 +1,4 @@
package net.silentclient.client.cosmetics.model; package net.silentclient.clientcommon.cosmetics.model;
public class Face public class Face
{ {

5
src/main/java/net/silentclient/clientcommon/cosmetics/model/Material.java Normal file
View File

@ -0,0 +1,5 @@
package net.silentclient.clientcommon.cosmetics.model;
public class Material {
}

Some files were not shown because too many files have changed in this diff Show More