Skip to content

Commit

Permalink
Merge pull request #1 from S-B99/feature/master
Browse files Browse the repository at this point in the history
update
  • Loading branch information
IronException authored Jan 6, 2020
2 parents fb74246 + 46cc226 commit 16d4724
Show file tree
Hide file tree
Showing 91 changed files with 298 additions and 205 deletions.
49 changes: 9 additions & 40 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,50 +8,19 @@ cd ../

echo "BUILD: copied"
mkdir KAMI-Blue-beta/
cp -r kami-fix-npe/gradle* KAMI-Blue-beta/
cp -r kami-fix-npe/gradlew* KAMI-Blue-beta/
cp -r kami-fix-npe/gradle/ KAMI-Blue-beta/
cp -r kami-fix-npe/build.sh KAMI-Blue-beta/
cp -r kami-fix-npe/build.gradle KAMI-Blue-beta/
cp -r kami-fix-npe/src/ KAMI-Blue-beta/

#echo "BUILD: copied modules and tools"
#cp kamiblue/sdashb.modules kamiblue-buildtools/
#cp kamiblue/build*.sh kamiblue-buildtools/

#echo "BUILD: copied gradle"
#cp kamiblue/build.gradle kamiblue-buildtools/
#cp kamiblue/gradle.properties kamiblue-buildtools/

#echo "BUILD: committing to git"
#cd kamiblue-buildtools/
#git add .
#git commit -m "Auto commit from building"
#git push
#cd ../
cp -r kamiblue/gradle* KAMI-Blue-beta/
cp -r kamiblue/gradlew* KAMI-Blue-beta/
cp -r kamiblue/gradle/ KAMI-Blue-beta/
cp -r kamiblue/build.sh KAMI-Blue-beta/
cp -r kamiblue/build.gradle KAMI-Blue-beta/
cp -r kamiblue/src/ KAMI-Blue-beta/

echo "BUILD: cd in"
cd KAMI-Blue-beta/

#echo "BUILD: removing donator modules"
#rm -rf src/main/java/me/zeroeightsix/kami/module/modules/sdashb/capes/
#rm -rf src/main/java/me/zeroeightsix/kami/module/modules/sdashb/render/CapeGUI.java
#rm -rf src/main/java/me/zeroeightsix/kami/mixin/client/MixinAbstractClientPlayer.java
#curl https://raw.githubusercontent.com/S-B99/KAMI/features-master/src/main/java/me/zeroeightsix/kami/mixin/client/MixinMinecraft.java -o src/main/java/me/zeroeightsix/kami/mixin/client/MixinMinecraft.java
#curl https://raw.githubusercontent.com/S-B99/KAMI/features-master/src/main/resources/mixins.kami.json -o src/main/resources/mixins.kami.json
cd KAMI-Blue-beta/ || exit

echo "BUILD: removing keygen"
rm -rf src/main/java/me/zeroeightsix/kami/module/modules/sdashb/experimental/Gen.java

echo "BUILD: removing net minecraft"
rm -rf src/main/java/net/minecraft

#echo "BUILD: removing org lwjgl"
#rm -rf src/main/java/org/lwjgl

#echo "BUILD: removing com google"
#rm -rf src/main/java/org/google

echo "BUILD: cleaning"
./gradlew clean

Expand All @@ -68,10 +37,10 @@ echo "BUILD: deleting"
rm -rf KAMI-Blue-beta/

echo "BUILD: cd in"
cd kami-fix-npe/
cd kamiblue/ || exit

echo "BUILD: finished"

END_TIME="$(date +%s)"
echo "BUILD: took" $(($(date +%s)-$START_TIME)) "seconds"
echo "BUILD: finished at" $(date -d "@$END_TIME")
echo "BUILD: finished at" "$(date -d "@$END_TIME")"
8 changes: 4 additions & 4 deletions src/main/java/me/zeroeightsix/kami/KamiMod.java
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,14 @@
import me.zeroeightsix.kami.module.ModuleManager;
import me.zeroeightsix.kami.module.modules.bewwawho.capes.Capes;
import me.zeroeightsix.kami.module.modules.bewwawho.misc.BlueDiscordRPC;
import me.zeroeightsix.kami.module.modules.bewwawho.util.Donator;
import me.zeroeightsix.kami.util.bewwawho.Donator;
import me.zeroeightsix.kami.setting.Setting;
import me.zeroeightsix.kami.setting.Settings;
import me.zeroeightsix.kami.setting.SettingsRegister;
import me.zeroeightsix.kami.setting.config.Configuration;
import me.zeroeightsix.kami.util.Friends;
import me.zeroeightsix.kami.util.LagCompensator;
import me.zeroeightsix.kami.util.Wrapper;
import me.zeroeightsix.kami.util.zeroeightysix.Friends;
import me.zeroeightsix.kami.util.zeroeightysix.LagCompensator;
import me.zeroeightsix.kami.util.zeroeightysix.Wrapper;
import net.minecraft.client.Minecraft;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.fml.common.Mod;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/me/zeroeightsix/kami/command/Command.java
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import me.zeroeightsix.kami.command.syntax.SyntaxChunk;
import me.zeroeightsix.kami.setting.Setting;
import me.zeroeightsix.kami.setting.Settings;
import me.zeroeightsix.kami.util.Wrapper;
import me.zeroeightsix.kami.util.zeroeightysix.Wrapper;
import net.minecraft.client.Minecraft;
import net.minecraft.launchwrapper.LogWrapper;
import net.minecraft.util.text.ITextComponent;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import me.zeroeightsix.kami.KamiMod;
import me.zeroeightsix.kami.command.commands.BindCommand;
import me.zeroeightsix.kami.util.ClassFinder;
import me.zeroeightsix.kami.util.zeroeightysix.ClassFinder;

import java.util.ArrayList;
import java.util.LinkedList;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import me.zeroeightsix.kami.setting.Setting;
import me.zeroeightsix.kami.setting.Settings;
import me.zeroeightsix.kami.setting.builder.SettingBuilder;
import me.zeroeightsix.kami.util.Wrapper;
import me.zeroeightsix.kami.util.zeroeightysix.Wrapper;

/**
* Created by 086 on 12/11/2017.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import me.zeroeightsix.kami.command.Command;
import me.zeroeightsix.kami.command.syntax.ChunkBuilder;
import me.zeroeightsix.kami.command.syntax.parsers.EnumParser;
import me.zeroeightsix.kami.util.Friends;
import me.zeroeightsix.kami.util.zeroeightysix.Friends;
import net.minecraft.client.Minecraft;
import net.minecraft.client.network.NetworkPlayerInfo;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import me.zeroeightsix.kami.command.Command;
import me.zeroeightsix.kami.command.syntax.SyntaxChunk;
import me.zeroeightsix.kami.util.Wrapper;
import me.zeroeightsix.kami.util.zeroeightysix.Wrapper;
import net.minecraft.item.ItemShulkerBox;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntityShulkerBox;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@

import me.zeroeightsix.kami.command.Command;
import me.zeroeightsix.kami.command.syntax.ChunkBuilder;
import me.zeroeightsix.kami.command.syntax.SyntaxChunk;
import me.zeroeightsix.kami.util.Wrapper;
import me.zeroeightsix.kami.util.zeroeightysix.Wrapper;

import net.minecraft.item.ItemWritableBook;
import net.minecraft.item.ItemStack;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
import me.zeroeightsix.kami.gui.rgui.component.container.use.Frame;
import me.zeroeightsix.kami.module.ModuleManager;
import me.zeroeightsix.kami.module.modules.zeroeightysix.render.BossStack;
import me.zeroeightsix.kami.util.KamiTessellator;
import me.zeroeightsix.kami.util.Wrapper;
import me.zeroeightsix.kami.util.zeroeightysix.KamiTessellator;
import me.zeroeightsix.kami.util.zeroeightysix.Wrapper;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.GuiChat;
import net.minecraft.client.gui.ScaledResolution;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/me/zeroeightsix/kami/event/KamiEvent.java
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package me.zeroeightsix.kami.event;

import me.zero.alpine.type.Cancellable;
import me.zeroeightsix.kami.util.Wrapper;
import me.zeroeightsix.kami.util.zeroeightysix.Wrapper;

/**
* Created by 086 on 16/11/2017.
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/me/zeroeightsix/kami/gui/UIRenderer.java
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import me.zeroeightsix.kami.gui.rgui.component.Component;
import me.zeroeightsix.kami.gui.rgui.component.container.use.Frame;
import me.zeroeightsix.kami.gui.rgui.component.listen.RenderListener;
import me.zeroeightsix.kami.util.Wrapper;
import me.zeroeightsix.kami.util.zeroeightysix.Wrapper;
import net.minecraft.client.renderer.GlStateManager;
import org.lwjgl.opengl.GL11;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import me.zeroeightsix.kami.gui.rgui.component.Component;
import me.zeroeightsix.kami.gui.rgui.component.container.use.Frame;
import me.zeroeightsix.kami.module.ModuleManager;
import me.zeroeightsix.kami.util.Wrapper;
import me.zeroeightsix.kami.util.zeroeightysix.Wrapper;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.GuiScreen;
import net.minecraft.client.renderer.GlStateManager;
Expand Down
10 changes: 5 additions & 5 deletions src/main/java/me/zeroeightsix/kami/gui/kami/KamiGUI.java
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@
import me.zeroeightsix.kami.module.Module;
import me.zeroeightsix.kami.module.ModuleManager;
import me.zeroeightsix.kami.module.modules.bewwawho.gui.InfoOverlay;
import me.zeroeightsix.kami.module.modules.bewwawho.util.CalcPing;
import me.zeroeightsix.kami.util.ColourHolder;
import me.zeroeightsix.kami.util.LagCompensator;
import me.zeroeightsix.kami.util.Pair;
import me.zeroeightsix.kami.util.Wrapper;
import me.zeroeightsix.kami.util.bewwawho.CalcPing;
import me.zeroeightsix.kami.util.zeroeightysix.ColourHolder;
import me.zeroeightsix.kami.util.zeroeightysix.LagCompensator;
import me.zeroeightsix.kami.util.zeroeightysix.Pair;
import me.zeroeightsix.kami.util.zeroeightysix.Wrapper;
import net.minecraft.client.Minecraft;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import me.zeroeightsix.kami.gui.rgui.component.listen.KeyListener;
import me.zeroeightsix.kami.gui.rgui.component.listen.MouseListener;
import me.zeroeightsix.kami.module.Module;
import me.zeroeightsix.kami.util.Bind;
import me.zeroeightsix.kami.util.zeroeightysix.Bind;
import org.lwjgl.input.Keyboard;

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
import me.zeroeightsix.kami.setting.impl.numerical.FloatSetting;
import me.zeroeightsix.kami.setting.impl.numerical.IntegerSetting;
import me.zeroeightsix.kami.setting.impl.numerical.NumberSetting;
import me.zeroeightsix.kami.util.Bind;
import me.zeroeightsix.kami.util.zeroeightysix.Bind;

import java.util.Arrays;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import me.zeroeightsix.kami.gui.rgui.component.container.use.Frame;
import me.zeroeightsix.kami.module.Module;
import me.zeroeightsix.kami.module.ModuleManager;
import me.zeroeightsix.kami.util.Wrapper;
import me.zeroeightsix.kami.util.zeroeightysix.Wrapper;
import net.minecraftforge.fml.common.FMLCommonHandler;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import net.minecraftforge.fml.common.gameevent.InputEvent;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import me.zeroeightsix.kami.gui.rgui.render.font.FontRenderer;
import me.zeroeightsix.kami.module.Module;
import me.zeroeightsix.kami.module.ModuleManager;
import me.zeroeightsix.kami.util.Wrapper;
import me.zeroeightsix.kami.util.zeroeightysix.Wrapper;
import org.lwjgl.opengl.GL11;

import java.awt.*;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
import me.zeroeightsix.kami.gui.rgui.render.font.FontRenderer;
import me.zeroeightsix.kami.gui.rgui.util.ContainerHelper;
import me.zeroeightsix.kami.gui.rgui.util.Docking;
import me.zeroeightsix.kami.util.Bind;
import me.zeroeightsix.kami.util.ColourHolder;
import me.zeroeightsix.kami.util.Wrapper;
import me.zeroeightsix.kami.util.zeroeightysix.Bind;
import me.zeroeightsix.kami.util.zeroeightysix.ColourHolder;
import me.zeroeightsix.kami.util.zeroeightysix.Wrapper;
import org.lwjgl.opengl.GL11;

import static org.lwjgl.opengl.GL11.*;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
import me.zeroeightsix.kami.gui.kami.component.Radar;
import me.zeroeightsix.kami.gui.rgui.render.AbstractComponentUI;
import me.zeroeightsix.kami.gui.rgui.render.font.FontRenderer;
import me.zeroeightsix.kami.util.EntityUtil;
import me.zeroeightsix.kami.util.Wrapper;
import me.zeroeightsix.kami.util.zeroeightysix.EntityUtil;
import me.zeroeightsix.kami.util.zeroeightysix.Wrapper;
import net.minecraft.client.renderer.GlStateManager;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLiving;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import me.zeroeightsix.kami.gui.rgui.render.AbstractComponentUI;
import me.zeroeightsix.kami.gui.rgui.render.font.FontRenderer;
import me.zeroeightsix.kami.module.Module;
import me.zeroeightsix.kami.util.Wrapper;
import me.zeroeightsix.kami.util.zeroeightysix.Wrapper;
import org.lwjgl.opengl.GL11;

import static org.lwjgl.opengl.GL11.glColor3f;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import com.mojang.authlib.GameProfile;
import me.zeroeightsix.kami.module.modules.bewwawho.capes.LayerCape;
import me.zeroeightsix.kami.util.Wrapper;
import me.zeroeightsix.kami.util.zeroeightysix.Wrapper;
import net.minecraft.client.entity.AbstractClientPlayer;
import net.minecraft.client.renderer.entity.RenderPlayer;
import net.minecraft.world.World;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import me.zeroeightsix.kami.command.Command;
import me.zeroeightsix.kami.gui.mc.KamiGuiChat;
import me.zeroeightsix.kami.util.Wrapper;
import me.zeroeightsix.kami.util.zeroeightysix.Wrapper;
import net.minecraft.client.gui.GuiChat;
import net.minecraft.client.gui.GuiTextField;
import org.spongepowered.asm.mixin.Mixin;
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
package me.zeroeightsix.kami.mixin.client;

import me.zeroeightsix.kami.module.modules.bewwawho.gui.CleanGUI;
import net.minecraft.client.gui.FontRenderer;
import net.minecraft.client.gui.Gui;
import net.minecraft.client.gui.GuiNewChat;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Redirect;

/***
* @author 3arthqu4ke
* Updated by S-B99 on 27/12/19
*/
@Mixin(GuiNewChat.class)
public abstract class MixinGuiNewChat {

@Redirect(method = "drawChat", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/GuiNewChat;drawRect(IIIII)V"))
private void drawRectBackgroundClean(int left, int top, int right, int bottom, int color) {
if (!CleanGUI.enabled() || (CleanGUI.enabled() && !CleanGUI.chatGlobal.getValue())) {
Gui.drawRect(left, top, right, bottom, color);
}
}

@Redirect(method = "drawChat", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/FontRenderer;drawStringWithShadow(Ljava/lang/String;FFI)I"))
private int drawStringWithShadowClean(FontRenderer fontRenderer, String text, float x, float y, int color) {
if (!CleanGUI.enabled() || (CleanGUI.enabled() && !CleanGUI.chatGlobal.getValue())) {
return fontRenderer.drawStringWithShadow(text, x, y, color);
}

return fontRenderer.drawString(text, (int) x, (int) y, color);
}

}
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package me.zeroeightsix.kami.mixin.client;

import me.zeroeightsix.kami.module.ModuleManager;
import me.zeroeightsix.kami.module.modules.bewwawho.gui.CleanGUI;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.FontRenderer;
import net.minecraft.client.gui.GuiScreen;
Expand Down Expand Up @@ -94,7 +95,7 @@ public void renderToolTip(ItemStack stack, int x, int y, CallbackInfo info) {

@Inject(method = "Lnet/minecraft/client/gui/GuiScreen;drawWorldBackground(I)V", at = @At("HEAD"), cancellable = true)
private void drawWorldBackgroundWrapper(final int tint, final CallbackInfo ci) {
if (this.mc.world != null && ModuleManager.isModuleEnabled("CleanGUI")) {
if (this.mc.world != null && ModuleManager.isModuleEnabled("CleanGUI") && (((CleanGUI) ModuleManager.getModuleByName("CleanGUI")).inventoryGlobal.getValue())) {
ci.cancel();
}
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
package me.zeroeightsix.kami.mixin.client;

import me.zeroeightsix.kami.module.ModuleManager;
import me.zeroeightsix.kami.module.modules.bewwawho.gui.ArmourHide;
import net.minecraft.client.model.ModelBiped;
import net.minecraft.client.renderer.entity.layers.LayerBipedArmor;
import net.minecraft.inventory.EntityEquipmentSlot;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;

/***
* @author TBM, Darki
*/
@Mixin(LayerBipedArmor.class)
public class MixinLayerBipedArmor {

@Inject(method = "setModelSlotVisible", at = @At(value = "HEAD"), cancellable = true)
protected void setModelSlotVisible(ModelBiped model, EntityEquipmentSlot slotIn, CallbackInfo info) {
if (ModuleManager.isModuleEnabled("ArmourHide")) {
info.cancel();
switch (slotIn) {
case HEAD:
model.bipedHead.showModel = false;
model.bipedHeadwear.showModel = false;
case CHEST:
model.bipedBody.showModel = false;
model.bipedRightArm.showModel = false;
model.bipedLeftArm.showModel = false;
case LEGS:
model.bipedBody.showModel = false;
model.bipedRightLeg.showModel = false;
model.bipedLeftLeg.showModel = false;
case FEET:
model.bipedRightLeg.showModel = false;
model.bipedLeftLeg.showModel = false;
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import me.zeroeightsix.kami.KamiMod;
import me.zeroeightsix.kami.event.events.GuiScreenEvent;
import me.zeroeightsix.kami.util.Wrapper;
import me.zeroeightsix.kami.util.zeroeightysix.Wrapper;
import net.minecraft.client.Minecraft;
import net.minecraft.client.audio.SoundHandler;
import net.minecraft.client.entity.EntityPlayerSP;
Expand Down
Loading

0 comments on commit 16d4724

Please sign in to comment.