Compare commits

..
Author SHA1 Message Date
Martin Robertz 92bf2aba66 Merge remote-tracking branch 'slprime/panel-alignment-center-to-edges' into dev 2026-02-07 18:52:28 +01:00
Martin Robertz e781d2e49a Merge remote-tracking branch 'slprime/search-page-reset' into dev 2026-02-07 18:52:25 +01:00
Martin Robertz 2f4397f236 Merge remote-tracking branch 'NealDeal34/master' into dev 2026-02-07 18:52:21 +01:00
slprime ebe95b3cf1 Align panels from center to edges 2026-02-07 19:01:11 +02:00
slprime d9881fe81c fix first check 2026-02-07 18:55:44 +02:00
slprime c2e4d168e9 Reset item panel page on search result size change 2026-02-07 18:49:07 +02:00
NealDeal34 23015aa613 update
Replace WeakHashMap with ConcurrentHashMap for thread safety, and improve logging for entity creation and loading.
2026-02-07 13:38:49 +08:00
Martin Robertz 83c54ec6c6 Merge remote-tracking branch 'NealDeal34/master' into dev 2026-02-06 20:56:05 +01:00
NealDeal34 688c2c1f36 Revert wrong merge of test branches 2026-02-04 02:43:21 +08:00
NealDeal34 22280ea320 Revert "sync" 2026-02-04 02:32:04 +08:00
NealDeal34 6df14438c5 Merge pull request #2 from NealDeal34/2.8.55-GTNH
sync
2026-02-04 02:26:07 +08:00
NealDeal34 0b1019bdf0 Merge branch 'GTNewHorizons:master' into 2.8.55-GTNH 2026-02-04 02:22:35 +08:00
NealDeal34 a811d20299 Merge branch 'master' into master 2026-02-04 02:06:52 +08:00
NealDeal34 4e1835ed12 sa 2026-01-28 05:01:39 +08:00
NealDeal34 1db5809cde Update build-and-test.yml 2026-01-28 04:48:32 +08:00
github-actions[bot] fa4411ad2e Apply spotless formatting [skip ci] 2026-01-27 20:46:02 +00:00
NealDeal34 80f7455e7f Refactor spotless-format job and git tagging
Removed output for formatted files in spotless-format job and adjusted git tag handling.
2026-01-28 04:44:05 +08:00
NealDeal34 b9cac67ec7 Update GitHub Actions workflow for release builds 2026-01-28 04:40:05 +08:00
NealDeal34 41a6cc0711 Update build-and-test.yml 2026-01-28 04:27:17 +08:00
NealDeal34 319ed409f1 update 2026-01-28 04:16:10 +08:00
NealDeal34 ad153f1c0a sa 2026-01-28 04:02:42 +08:00
Martin Robertz e340423b28 Merge branch 'master' into master 2026-01-26 21:30:13 +01:00
NealDeal34 7b0feb16f9 Refactor ItemMobSpawner for clarity 2026-01-27 04:09:48 +08:00
NealDeal34 e0b34e8b9a Update method call for setting entity name in spawner 2026-01-27 03:58:06 +08:00
NealDeal34 c533f6f1b5 Refactor ItemMobSpawner for thread safety and clarity 2026-01-27 03:51:51 +08:00
NealDeal34 140977be2e Merge branch 'GTNewHorizons:master' into 2.7.28-GTNH 2026-01-27 03:43:02 +08:00
Martin Robertz 8a13af1969 Merge branch 'master' into master 2026-01-10 01:49:44 +01:00
Martin Robertz d6d50a968d sa 2026-01-02 08:59:20 +01:00
NealDeal34 43459d4b41 Update ItemMobSpawner.java 2025-12-30 15:57:58 +08:00
NealDeal34 2a1aff073b Update ItemMobSpawner.java 2025-12-30 15:39:49 +08:00
NealDeal34 73eea57d11 Update ItemMobSpawner.java 2025-12-30 15:34:47 +08:00
NealDeal34 9b84ea7804 Update ItemMobSpawner.java 2025-12-30 15:32:57 +08:00
NealDeal34 de42a43b2c update 2025-12-30 03:50:49 +08:00
NealDeal34 b89734f3e6 Added checks for abstract classes when retrieving entities 2025-12-30 03:19:36 +08:00
NealDeal34 7445d96531 Add workflow_dispatch trigger to release-tags.yml 2025-12-30 02:42:47 +08:00
NealDeal34 dc997626c1 Refactor getEntity method to handle abstract classes 2025-12-30 02:41:45 +08:00
11 changed files with 28 additions and 85 deletions

No files matched your search

+1 -4
View File
@@ -2,6 +2,7 @@ compileJava {
options.encoding = "UTF-8"
}
generateGrammarSource {
maxHeapSize = "128m"
arguments += ['-package', 'codechicken.nei.search', '-visitor', '-no-listener']
@@ -11,10 +12,6 @@ generateGrammarSource {
compileJava.dependsOn generateGrammarSource
sourcesJar.dependsOn generateGrammarSource
sourcesJar {
duplicatesStrategy = DuplicatesStrategy.EXCLUDE
}
sourceSets {
main {
java.srcDirs += ["build/generated/sources/search/antlr/"]
+2 -2
View File
@@ -1,8 +1,8 @@
// Add your dependencies here
dependencies {
api('com.github.GTNewHorizons:CodeChickenCore:1.4.10:dev')
implementation('com.github.GTNewHorizons:GTNHLib:0.9.13:dev')
api('com.github.GTNewHorizons:CodeChickenCore:1.4.7:dev')
implementation('com.github.GTNewHorizons:GTNHLib:0.9.6:dev')
shadowImplementation('org.apache.commons:commons-csv:1.10.0')
+3 -30
View File
@@ -39,33 +39,9 @@ remoteMappings = https\://raw.githubusercontent.com/MinecraftForge/FML/1.7.10/co
# `./gradlew runClient --username=AnotherPlayer`, or configuring this command in your IDE.
developmentEnvironmentUserName = Developer
# Enables modern Java syntax support. Valid values:
# - false: No modern syntax, Java 8 only
# - jabel: Jabel syntax-only support, compiles to J8 bytecode
# - jvmDowngrader: Full modern Java via JVM Downgrader (syntax + stdlib APIs)
# - modern: Native modern Java bytecode, no downgrading
enableModernJavaSyntax = jabel
# If set, ignores the above setting and compiles with the given toolchain. This may cause unexpected issues,
# and should *not* be used in most situations. -1 disables this.
# forceToolchainVersion = -1
# Target JVM version for JVM Downgrader bytecode downgrading.
# Only used when enableModernJavaSyntax = jvmDowngrader
# downgradeTargetVersion = 8
# Comma-separated list of Java versions for multi-release jar support (JVM Downgrader only).
# Classes will be available in META-INF/versions/N/ for each version N in this list.
# Default: "21,25" (J25+ gets native classes, J21-24 gets partial downgrade, J8-20 gets full downgrade).
# jvmDowngraderMultiReleaseVersions = 21,25
# Specifies how JVM Downgrader API stubs are provided. Options:
# - shade: Shade minimized stubs into the jar
# - gtnhlib: GTNHLib provides stubs at runtime (adds version constraint)
# - external: Another dependency provides stubs (no constraint, no warning)
# - (empty): Warning reminding you to configure stubs
# Note: 'shade' option requires you to verify license compliance, see: https://github.com/unimined/JvmDowngrader/blob/main/LICENSE.md
# jvmDowngraderStubsProvider =
# Enables using modern Java syntax (up to version 17) via Jabel, while still targeting JVM 8.
# See https://github.com/bsideup/jabel for details on how this works.
enableModernJavaSyntax = true
# Enables injecting missing generics into the decompiled source code for a better coding experience.
# Turns most publicly visible List, Map, etc. into proper List<E>, Map<K, V> types.
@@ -233,6 +209,3 @@ curseForgeRelations = requiredDependency\:codechickencore-unofficial
# This is meant to be set in $HOME/.gradle/gradle.properties.
# ideaCheckSpotlessOnBuild = true
# Non-GTNH properties
org.gradle.configuration-cache = true
org.gradle.parallel = true
-12
View File
@@ -1,12 +0,0 @@
#This file is generated by updateDaemonJvm
toolchainUrl.FREE_BSD.AARCH64=https\://api.foojay.io/disco/v3.0/ids/df211d3c3eefdc408b462041881bc575/redirect
toolchainUrl.FREE_BSD.X86_64=https\://api.foojay.io/disco/v3.0/ids/b41931cf1e70bc8e08d7dd19c343ef00/redirect
toolchainUrl.LINUX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/4945f00643ec68e7c7a6b66f90124f89/redirect
toolchainUrl.LINUX.X86_64=https\://api.foojay.io/disco/v3.0/ids/93aeea858331bd6bb00ba94759830234/redirect
toolchainUrl.MAC_OS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/3426ffcaa54c3f62406beb1f1ab8b179/redirect
toolchainUrl.MAC_OS.X86_64=https\://api.foojay.io/disco/v3.0/ids/f636c800fdb3f9ae33f019dfa048ba72/redirect
toolchainUrl.UNIX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/df211d3c3eefdc408b462041881bc575/redirect
toolchainUrl.UNIX.X86_64=https\://api.foojay.io/disco/v3.0/ids/93aeea858331bd6bb00ba94759830234/redirect
toolchainUrl.WINDOWS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/3cd7045fca9a72cd9bc7d14a385e594c/redirect
toolchainUrl.WINDOWS.X86_64=https\://api.foojay.io/disco/v3.0/ids/552c7bffe0370c66410a51c55985b511/redirect
toolchainVersion=25
Binary file not shown.
+1 -1
View File
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Vendored
+4 -1
View File
@@ -1,7 +1,7 @@
#!/bin/sh
#
# Copyright © 2015 the original authors.
# Copyright © 2015-2021 the original authors.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -114,6 +114,7 @@ case "$( uname )" in #(
NONSTOP* ) nonstop=true ;;
esac
CLASSPATH="\\\"\\\""
# Determine the Java command to use to start the JVM.
@@ -171,6 +172,7 @@ fi
# For Cygwin or MSYS, switch paths to Windows format before running java
if "$cygwin" || "$msys" ; then
APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
JAVACMD=$( cygpath --unix "$JAVACMD" )
@@ -210,6 +212,7 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
set -- \
"-Dorg.gradle.appname=$APP_BASE_NAME" \
-classpath "$CLASSPATH" \
-jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
"$@"
Vendored
+2 -1
View File
@@ -70,10 +70,11 @@ goto fail
:execute
@rem Setup the command line
set CLASSPATH=
@rem Execute Gradle
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
:end
@rem End local scope for the variables with windows NT shell
+1 -1
View File
@@ -17,7 +17,7 @@ pluginManagement {
}
plugins {
id 'com.gtnewhorizons.gtnhsettingsconvention' version '2.0.19'
id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.49'
}
@@ -4,7 +4,6 @@ import java.util.ArrayList;
import java.util.List;
import net.minecraft.client.gui.inventory.GuiContainer;
import net.minecraft.inventory.Slot;
import net.minecraft.item.ItemStack;
import codechicken.nei.api.IBookmarkContainerHandler;
@@ -13,14 +12,15 @@ public class DefaultBookmarkContainerHandler implements IBookmarkContainerHandle
@Override
public void pullBookmarkItemsFromContainer(GuiContainer guiContainer, ArrayList<ItemStack> bookmarkItems) {
final List<Slot> slots = guiContainer.inventorySlots.inventorySlots;
final FastTransferManager manager = new FastTransferManager();
final List<ItemStack> containerStacks = getStorageStacks(guiContainer);
for (ItemStack bookmarkItem : bookmarkItems) {
for (int i = 0; i < slots.size() - 4 * 9; i++) {
final Slot slot = slots.get(i);
if (slot.getHasStack() && bookmarkItem.isItemEqual(slot.getStack())) {
final int transferAmount = Math.min(bookmarkItem.stackSize, slot.getStack().stackSize);
for (int i = 0; i < containerStacks.size() && bookmarkItem.stackSize > 0; i++) {
final ItemStack containerItem = containerStacks.get(i);
if (bookmarkItem.isItemEqual(containerItem)) {
final int transferAmount = Math.min(bookmarkItem.stackSize, containerItem.stackSize);
manager.transferItems(guiContainer, i, transferAmount);
bookmarkItem.stackSize -= transferAmount;
}
@@ -17,7 +17,6 @@ import net.minecraft.init.Blocks;
import net.minecraft.item.Item;
import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.tileentity.TileEntityMobSpawner;
import net.minecraft.util.EnumChatFormatting;
import net.minecraft.util.IIcon;
@@ -34,22 +33,7 @@ public class ItemMobSpawner extends ItemBlock {
private static final Map<Class<? extends Entity>, String> ENTITY_CLASS_TO_NAME_CACHE = new ConcurrentHashMap<>();
public static int idPig = 90;
private static volatile boolean loaded = false;
// For asm
public static int placedX;
public static int placedY;
public static int placedZ;
public static void setLastPlacedPosition(int x, int y, int z) {
placedX = x;
placedY = y;
placedZ = z;
}
public static int[] getLastPlacedPosition() {
return new int[] { placedX, placedY, placedZ };
}
private static boolean loaded = false;
public ItemMobSpawner() {
super(Blocks.mob_spawner);
@@ -65,22 +49,15 @@ public class ItemMobSpawner extends ItemBlock {
@Override
public boolean onItemUse(ItemStack itemstack, EntityPlayer entityplayer, World world, int x, int y, int z, int side,
float hitX, float hitY, float hitZ) {
placedX = x;
placedY = y;
placedZ = z;
boolean placed = super.onItemUse(itemstack, entityplayer, world, x, y, z, side, hitX, hitY, hitZ);
if (placed && !world.isRemote) {
TileEntity tileEntity = world.getTileEntity(x, y, z);
if (tileEntity instanceof TileEntityMobSpawner) {
TileEntityMobSpawner spawner = (TileEntityMobSpawner) tileEntity;
if (world.getTileEntity(x, y, z) instanceof TileEntityMobSpawner) {
TileEntityMobSpawner spawner = (TileEntityMobSpawner) world.getTileEntity(x, y, z);
String mobType = getMobTypeFromItemStack(itemstack);
if (mobType != null) {
spawner.func_145881_a().setEntityName(mobType);
world.markBlockForUpdate(x, y, z);
NEICPH.sendMobSpawnerID(x, y, z, mobType);
spawner.func_145881_a().setEntityName(mobType);
}
}
return true;
@@ -230,6 +207,10 @@ public class ItemMobSpawner extends ItemBlock {
}
synchronized (ItemMobSpawner.class) {
if (loaded) {
return;
}
try {
for (Map.Entry<Class<? extends Entity>, String> entry : ((Map<Class<? extends Entity>, String>) EntityList.classToStringMapping)
.entrySet()) {