Merge branch 'dev' into feat/zstd-compressor

This commit is contained in:
Kamron Vaswani authored and GitHub committed 2022-03-14 00:07:23 -04:00
commit 0226001596
9 files changed
+14 -10

No files matched your search

@@ -29,7 +29,6 @@ import noppes.npcs.enchants.EnchantInterface;
import noppes.npcs.entity.*;
import noppes.npcs.entity.old.*;
import noppes.npcs.scripted.wrapper.WrapperNpcAPI;
import java.io.File;
import java.util.Set;
import java.util.concurrent.Executors;
@@ -99,7 +99,7 @@ public class TranslateUtil {
return null;
element = array.get(0);
}
System.out.println(element.getAsString());
// System.out.println(element.getAsString());
return element.getAsString();
}
}
@@ -163,8 +163,8 @@ public class GuiNpcPuppet extends GuiModelInterface implements ISliderListener{
}
if(btn.id == 170 || btn.id == 171 || btn.id == 172){
if(btn.id == 170){
System.out.println(part.rotationX);
System.out.println(rotateX.sliderValue);
// System.out.println(part.rotationX);
/// System.out.println(rotateX.sliderValue);
part.rotationX = 0.0f;
rotateX.sliderValue = 0.5f;
int percent = (int) ((rotateX.sliderValue) * 360);
@@ -42,8 +42,8 @@ public class ServerCloneController implements ICloneHandler {
try {
File dir = new File(getDir(), "..");
File file = new File(dir, "clonednpcs.dat");
System.out.println(file.getAbsolutePath());
System.out.println(file.exists());
// System.out.println(file.getAbsolutePath());
// System.out.println(file.exists());
if(file.exists()){
Map<Integer, Map<String, NBTTagCompound>> clones = loadOldClones(file);
file.delete();
@@ -106,7 +106,11 @@ public class ScriptLivingBase<T extends EntityLivingBase> extends ScriptEntity<T
public T getMCEntity(){
return entity;
}
public T getMinecraftEntity(){
return getMCEntity();
}
/**
* Makes the entity swing its hand
*/