aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/kubatech/api
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/kubatech/api')
-rw-r--r--src/main/java/kubatech/api/Variables.java1
-rw-r--r--src/main/java/kubatech/api/network/CustomTileEntityPacket.java2
-rw-r--r--src/main/java/kubatech/api/utils/GSONUtils.java78
-rw-r--r--src/main/java/kubatech/api/utils/ItemID.java5
-rw-r--r--src/main/java/kubatech/api/utils/ModUtils.java1
5 files changed, 27 insertions, 60 deletions
diff --git a/src/main/java/kubatech/api/Variables.java b/src/main/java/kubatech/api/Variables.java
index c8d551a44e..3b926392fb 100644
--- a/src/main/java/kubatech/api/Variables.java
+++ b/src/main/java/kubatech/api/Variables.java
@@ -26,5 +26,4 @@ public class Variables {
public static final String StructureHologram =
"To see the structure, use a " + EnumChatFormatting.BLUE + "Tec" + EnumChatFormatting.DARK_BLUE + "Tech"
+ EnumChatFormatting.RESET + "" + EnumChatFormatting.GRAY + " Blueprint on the Controller!";
- ;
}
diff --git a/src/main/java/kubatech/api/network/CustomTileEntityPacket.java b/src/main/java/kubatech/api/network/CustomTileEntityPacket.java
index 9a3df765d2..b81bbb0337 100644
--- a/src/main/java/kubatech/api/network/CustomTileEntityPacket.java
+++ b/src/main/java/kubatech/api/network/CustomTileEntityPacket.java
@@ -37,7 +37,7 @@ import net.minecraft.world.World;
public class CustomTileEntityPacket implements IMessage {
public int w, x, y, z;
- public ByteBuf customdata = Unpooled.buffer();
+ public final ByteBuf customdata = Unpooled.buffer();
@SuppressWarnings("unused")
public CustomTileEntityPacket() {}
diff --git a/src/main/java/kubatech/api/utils/GSONUtils.java b/src/main/java/kubatech/api/utils/GSONUtils.java
index 2936aee2b2..b5a466c257 100644
--- a/src/main/java/kubatech/api/utils/GSONUtils.java
+++ b/src/main/java/kubatech/api/utils/GSONUtils.java
@@ -20,16 +20,11 @@
package kubatech.api.utils;
import com.google.gson.*;
-import java.io.File;
import java.io.IOException;
-import java.io.Reader;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import java.lang.reflect.Type;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
import net.minecraft.nbt.CompressedStreamTools;
import net.minecraft.nbt.NBTSizeTracker;
import net.minecraft.nbt.NBTTagCompound;
@@ -51,39 +46,29 @@ public class GSONUtils {
}
};
- private static final JsonSerializer<NBTTagCompound> NBTTagCompoundSerializer =
- new JsonSerializer<NBTTagCompound>() {
-
- @Override
- public JsonElement serialize(NBTTagCompound src, Type typeOfSrc, JsonSerializationContext context) {
- try {
- JsonArray array = new JsonArray();
- for (byte b : CompressedStreamTools.compress(src)) {
- array.add(new JsonPrimitive(b));
- }
- return array;
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
- }
- };
+ private static final JsonSerializer<NBTTagCompound> NBTTagCompoundSerializer = (src, typeOfSrc, context) -> {
+ try {
+ JsonArray array = new JsonArray();
+ for (byte b : CompressedStreamTools.compress(src)) {
+ array.add(new JsonPrimitive(b));
+ }
+ return array;
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ };
- private static final JsonDeserializer<NBTTagCompound> NBTTagCompoundDeserializer =
- new JsonDeserializer<NBTTagCompound>() {
- @Override
- public NBTTagCompound deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context)
- throws JsonParseException {
- try {
- if (!(json instanceof JsonArray)) return null;
- byte[] bytes = new byte[((JsonArray) json).size()];
- for (int i = 0; i < bytes.length; i++)
- bytes[i] = ((JsonArray) json).get(i).getAsByte();
- return CompressedStreamTools.func_152457_a(bytes, new NBTSizeTracker(2097152L));
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
- }
- };
+ private static final JsonDeserializer<NBTTagCompound> NBTTagCompoundDeserializer = (json, typeOfT, context) -> {
+ try {
+ if (!(json instanceof JsonArray)) return null;
+ byte[] bytes = new byte[((JsonArray) json).size()];
+ for (int i = 0; i < bytes.length; i++)
+ bytes[i] = ((JsonArray) json).get(i).getAsByte();
+ return CompressedStreamTools.func_152457_a(bytes, new NBTSizeTracker(2097152L));
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ };
public static final GsonBuilder GSON_BUILDER = new GsonBuilder()
.addSerializationExclusionStrategy(GSONStrategy)
@@ -98,23 +83,4 @@ public class GSONUtils {
.registerTypeAdapter(NBTTagCompound.class, NBTTagCompoundSerializer)
.serializeNulls()
.setPrettyPrinting();
-
- public static <T> T readFile(Gson gson, File file, Class<T> tClass) {
- if (!file.exists()) return null;
- if (!file.isFile()) return null;
- T t = null;
- Reader reader = null;
- try {
- reader = Files.newBufferedReader(file.toPath(), StandardCharsets.UTF_8);
- t = gson.fromJson(reader, tClass);
- } catch (Exception ignored) {
- } finally {
- if (reader != null)
- try {
- reader.close();
- } catch (Exception ignored) {
- }
- }
- return t;
- }
}
diff --git a/src/main/java/kubatech/api/utils/ItemID.java b/src/main/java/kubatech/api/utils/ItemID.java
index a452021bad..669de356fc 100644
--- a/src/main/java/kubatech/api/utils/ItemID.java
+++ b/src/main/java/kubatech/api/utils/ItemID.java
@@ -90,8 +90,9 @@ public class ItemID {
if (!ignorecount) if (count != ((ItemStack) obj).stackSize) return false;
if (!ignoremeta) if (meta != ((ItemStack) obj).getItemDamage()) return false;
if (!ignorenbt) {
- if (tag == null) return ((ItemStack) obj).stackTagCompound == null;
- if (!tag.equals(((ItemStack) obj).stackTagCompound)) return false;
+ if (tag == null)
+ return ((ItemStack) obj).stackTagCompound == null || ((ItemStack) obj).stackTagCompound.hasNoTags();
+ return tag.equals(((ItemStack) obj).stackTagCompound);
}
return true;
}
diff --git a/src/main/java/kubatech/api/utils/ModUtils.java b/src/main/java/kubatech/api/utils/ModUtils.java
index 53f0086e25..e809fa607d 100644
--- a/src/main/java/kubatech/api/utils/ModUtils.java
+++ b/src/main/java/kubatech/api/utils/ModUtils.java
@@ -54,6 +54,7 @@ public class ModUtils {
public static String getModListVersion() {
if (modListVersion != null) return modListVersion;
+ @SuppressWarnings("unchecked")
ArrayList<ModContainer> modlist = (ArrayList<ModContainer>)
((ArrayList<ModContainer>) Loader.instance().getActiveModList()).clone();
String sortedList = modlist.stream()
generated by cgit (git 2.46.0) at 2025-03-10 18:20:08 +0000