aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-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
-rw-r--r--src/main/java/kubatech/kubatech.java1
-rw-r--r--src/main/java/kubatech/loaders/MobRecipeLoader.java30
-rw-r--r--src/main/java/kubatech/loaders/RecipeLoader.java1
-rw-r--r--src/main/java/kubatech/loaders/item/KubaItems.java5
-rw-r--r--src/main/java/kubatech/loaders/item/items/TeaCollection.java2
-rw-r--r--src/main/java/kubatech/nei/Mob_Handler.java7
11 files changed, 39 insertions, 94 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()
diff --git a/src/main/java/kubatech/kubatech.java b/src/main/java/kubatech/kubatech.java
index 4c5f78ae10..7d0ac1a192 100644
--- a/src/main/java/kubatech/kubatech.java
+++ b/src/main/java/kubatech/kubatech.java
@@ -68,6 +68,7 @@ public class kubatech {
return Tags.MODNAME;
}
+ @SuppressWarnings("unchecked")
@Override
public void displayAllReleventItems(List p_78018_1_) {
super.displayAllReleventItems(p_78018_1_);
diff --git a/src/main/java/kubatech/loaders/MobRecipeLoader.java b/src/main/java/kubatech/loaders/MobRecipeLoader.java
index ba3773bf69..c7e64da29d 100644
--- a/src/main/java/kubatech/loaders/MobRecipeLoader.java
+++ b/src/main/java/kubatech/loaders/MobRecipeLoader.java
@@ -627,7 +627,7 @@ public class MobRecipeLoader {
LOG.info("Cached map version mismatch, generating a new one");
}
} catch (Exception ignored) {
- LOG.info("There was an exception while parsing cached map, generating a new one");
+ LOG.warn("There was an exception while parsing cached map, generating a new one");
} finally {
if (reader != null)
try {
@@ -677,8 +677,6 @@ public class MobRecipeLoader {
((Map<String, Class<? extends Entity>>) EntityList.stringToClassMapping).forEach((k, v) -> {
if (v == null) return;
- LOG.info("Generating entry for mob: " + k);
-
if (Modifier.isAbstract(v.getModifiers())) {
LOG.info("Entity " + k + " is abstract, skipping");
return;
@@ -734,8 +732,6 @@ public class MobRecipeLoader {
droplist additionaldrops = new droplist();
droplist dropslooting = new droplist();
- LOG.info("Generating normal drops");
-
frand.newRound();
collector.newRound();
@@ -774,15 +770,13 @@ public class MobRecipeLoader {
collector.addDrop(drops, e.capturedDrops, frand.chance);
if (second && frand.chance < 0.0000001d) {
- LOG.info("Skipping " + k + " normal dropmap because it's too randomized");
+ LOG.warn("Skipping " + k + " normal dropmap because it's too randomized");
break;
}
second = true;
} while (frand.nextRound());
- LOG.info("Generating normal drops with looting");
-
frand.newRound();
collector.newRound();
@@ -821,15 +815,13 @@ public class MobRecipeLoader {
collector.addDrop(dropslooting, e.capturedDrops, frand.chance);
if (second && frand.chance < 0.0000001d) {
- LOG.info("Skipping " + k + " normal dropmap because it's too randomized");
+ LOG.warn("Skipping " + k + " normal dropmap because it's too randomized");
break;
}
second = true;
} while (frand.nextRound());
- LOG.info("Generating rare drops");
-
frand.newRound();
collector.newRound();
@@ -844,15 +836,13 @@ public class MobRecipeLoader {
collector.addDrop(raredrops, e.capturedDrops, frand.chance);
if (second && frand.chance < 0.0000001d) {
- LOG.info("Skipping " + k + " rare dropmap because it's too randomized");
+ LOG.warn("Skipping " + k + " rare dropmap because it's too randomized");
break;
}
second = true;
} while (frand.nextRound());
- LOG.info("Generating super rare drops");
-
frand.newRound();
collector.newRound();
@@ -867,15 +857,13 @@ public class MobRecipeLoader {
collector.addDrop(superraredrops, e.capturedDrops, frand.chance);
if (second && frand.chance < 0.0000001d) {
- LOG.info("Skipping " + k + " rare dropmap because it's too randomized");
+ LOG.warn("Skipping " + k + " rare dropmap because it's too randomized");
break;
}
second = true;
} while (frand.nextRound());
- LOG.info("Generating additional drops");
-
frand.newRound();
collector.newRound();
@@ -957,7 +945,7 @@ public class MobRecipeLoader {
Arrays.fill(e.getLastActiveItems(), null);
if (second && frand.chance < 0.0000001d) {
- LOG.info("Skipping " + k + " additional dropmap because it's too randomized");
+ LOG.warn("Skipping " + k + " additional dropmap because it's too randomized");
break;
}
second = true;
@@ -972,7 +960,7 @@ public class MobRecipeLoader {
if (drops.isEmpty() && raredrops.isEmpty() && additionaldrops.isEmpty()) {
ArrayList<MobDrop> arr = new ArrayList<>();
GeneralMobList.put(k, new GeneralMappedMob(e, new MobRecipe(e, arr), arr));
- LOG.info("Entity " + k + " doesn't drop any items, skipping EEC Recipe map");
+ LOG.info("Mapped " + k);
return;
}
@@ -1130,7 +1118,7 @@ public class MobRecipeLoader {
Optionals.parseMTAdditions(k, drops, recipe);
}
- OverridesConfig.MobOverride override = null;
+ OverridesConfig.MobOverride override;
if ((override = OverridesConfig.overrides.get(k)) != null) {
if (override.removeAll) {
drops.clear();
@@ -1177,7 +1165,7 @@ public class MobRecipeLoader {
Optionals.parseMTAdditions(k, drops, recipe);
}
- OverridesConfig.MobOverride override = null;
+ OverridesConfig.MobOverride override;
if ((override = overrides.get(k)) != null) {
if (override.removeAll) {
drops.clear();
diff --git a/src/main/java/kubatech/loaders/RecipeLoader.java b/src/main/java/kubatech/loaders/RecipeLoader.java
index 62d1594a30..66a889b010 100644
--- a/src/main/java/kubatech/loaders/RecipeLoader.java
+++ b/src/main/java/kubatech/loaders/RecipeLoader.java
@@ -20,7 +20,6 @@
package kubatech.loaders;
import static kubatech.api.enums.ItemList.*;
-import static kubatech.api.enums.ItemList.YellowTea;
import cpw.mods.fml.common.registry.GameRegistry;
import gregtech.api.enums.GT_Values;
diff --git a/src/main/java/kubatech/loaders/item/KubaItems.java b/src/main/java/kubatech/loaders/item/KubaItems.java
index 17a97e3d70..b0f8723cde 100644
--- a/src/main/java/kubatech/loaders/item/KubaItems.java
+++ b/src/main/java/kubatech/loaders/item/KubaItems.java
@@ -100,11 +100,6 @@ public class KubaItems extends Item {
return p_77647_1_;
}
- @Override
- public String getUnlocalizedName() {
- return super.getUnlocalizedName();
- }
-
@SuppressWarnings("unchecked")
@Override
public void addInformation(ItemStack p_77624_1_, EntityPlayer p_77624_2_, List p_77624_3_, boolean p_77624_4_) {
diff --git a/src/main/java/kubatech/loaders/item/items/TeaCollection.java b/src/main/java/kubatech/loaders/item/items/TeaCollection.java
index 8f61015812..85b74421b6 100644
--- a/src/main/java/kubatech/loaders/item/items/TeaCollection.java
+++ b/src/main/java/kubatech/loaders/item/items/TeaCollection.java
@@ -159,7 +159,7 @@ public class TeaCollection extends ItemProxy {
super("Tea");
}
- LinkedList<Achievement> unlockedAchievements = new LinkedList<>();
+ final LinkedList<Achievement> unlockedAchievements = new LinkedList<>();
@Override
public List<Achievement> getAchievements() {
diff --git a/src/main/java/kubatech/nei/Mob_Handler.java b/src/main/java/kubatech/nei/Mob_Handler.java
index 86c6e720b3..6b9aac78d0 100644
--- a/src/main/java/kubatech/nei/Mob_Handler.java
+++ b/src/main/java/kubatech/nei/Mob_Handler.java
@@ -293,12 +293,7 @@ public class Mob_Handler extends TemplateRecipeHandler {
e.setPosition(mc.thePlayer.posX + 5, mc.thePlayer.posY, mc.thePlayer.posZ);
// ARGS: x, y, scale, rot, rot, entity
GuiInventory.func_147046_a(
- mobx,
- moby,
- Math.round(scaled),
- (float) (x + mobx) - mouseX,
- (float) (y + moby - eheight * scaled) - mouseZ,
- e);
+ mobx, moby, Math.round(scaled), (x + mobx) - mouseX, y + moby - eheight * scaled - mouseZ, e);
} catch (Throwable ex) {
Tessellator tes = Tessellator.instance;
try {
generated by cgit (git 2.46.0) at 2025-03-10 14:53:08 +0000