Compare commits

...
Author SHA1 Message Date
Martin Robertz 05dc51ded0 update 2025-12-09 16:54:40 +01:00
Martin Robertz 9be1b63fe8 Merge branch 'master' into dev 2025-12-09 16:54:19 +01:00
Martin Robertz 82ad40f1cf update 2025-11-14 22:35:48 +01:00
Super 6d8b0a0e72 Add block blacklist for magnets 2025-10-13 13:38:50 +03:00
6 changed files with 53 additions and 11 deletions

No files matched your search

+6 -6
View File
@@ -5,13 +5,13 @@ dependencies {
api("curse.maven:cofh-lib-220333:2388748")
compileOnly("com.github.GTNewHorizons:ForestryMC:4.11.2:api") {transitive = false}
compileOnly("com.github.GTNewHorizons:OpenComputers:1.12.4-GTNH:api") {transitive = false}
compileOnly("com.github.GTNewHorizons:NotEnoughItems:2.8.39-GTNH:dev") {transitive = false}
compileOnly("com.github.GTNewHorizons:CodeChickenCore:1.4.8:dev") {transitive = false}
compileOnly("com.github.GTNewHorizons:OpenComputers:1.12.6-GTNH:api") {transitive = false}
compileOnly("com.github.GTNewHorizons:NotEnoughItems:2.8.40-GTNH:dev") {transitive = false}
compileOnly("com.github.GTNewHorizons:CodeChickenCore:1.4.10:dev") {transitive = false}
compileOnly("com.github.GTNewHorizons:inventory-tweaks:1.7.1:dev") {transitive = false}
compileOnly('com.github.GTNewHorizons:Baubles-Expanded:2.2.2-GTNH:dev') {transitive = false}
compileOnly("com.github.GTNewHorizons:GT5-Unofficial:5.09.52.117:dev") {transitive = false}
compileOnly("com.github.GTNewHorizons:GTNHLib:0.8.9:dev") {transitive = false}
compileOnly('com.github.GTNewHorizons:Baubles-Expanded:2.2.4-GTNH:dev') {transitive = false}
compileOnly("com.github.GTNewHorizons:GT5-Unofficial:5.09.52.134:dev") {transitive = false}
compileOnly("com.github.GTNewHorizons:GTNHLib:0.8.25:dev") {transitive = false}
compileOnly("thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev") {transitive = false}
compileOnly("curse.maven:computercraft-67504:2269339") {transitive = false}
Binary file not shown.
Vendored
+2 -2
View File
@@ -114,7 +114,7 @@ case "$( uname )" in #(
NONSTOP* ) nonstop=true ;;
esac
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
CLASSPATH="\\\"\\\""
# Determine the Java command to use to start the JVM.
@@ -213,7 +213,7 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
set -- \
"-Dorg.gradle.appname=$APP_BASE_NAME" \
-classpath "$CLASSPATH" \
org.gradle.wrapper.GradleWrapperMain \
-jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
"$@"
# Stop when "xargs" is not available.
Vendored
+2 -2
View File
@@ -70,11 +70,11 @@ goto fail
:execute
@rem Setup the command line
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
set CLASSPATH=
@rem Execute Gradle
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
"%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
@@ -55,6 +55,8 @@ public class ConfigHandler {
public static boolean enableFlight;
private static String[] itemDislocatorBlacklist;
public static Map<String, Integer> itemDislocatorBlacklistMap = new HashMap<String, Integer>();
private static String[] itemDislocatorBlockBlacklist;
public static Map<String, Integer> itemDislocatorBlockBlacklistMap = new HashMap<String, Integer>();
public static boolean itemDislocatorDisableSound;
// spawner
@@ -303,7 +305,12 @@ public class ConfigHandler {
"Item Dislocator Blacklist",
Configuration.CATEGORY_GENERAL,
new String[] { "appliedenergistics2:item.ItemCrystalSeed" },
"A list of items of items that should be ignored by the item dislocator. Use the items registry name e.g. minecraft:apple you can also add a meta value like so minecraft:wool|4");
"A list of items that should be ignored by the item dislocator. Use the items registry name e.g. minecraft:apple you can also add a meta value like so minecraft:wool|4");
itemDislocatorBlockBlacklist = config.getStringList(
"Item Dislocator Block Blacklist",
Configuration.CATEGORY_GENERAL,
new String[] { "Thaumcraft:blockAlchemyFurnace|0", "Botania:pool" },
"A list of blocks that will cause items above or inside of them to be ignored by the item dislocator. Use the items registry name e.g. minecraft:apple you can also add a meta value like so minecraft:wool|4");
itemDislocatorDisableSound = config.get(
Configuration.CATEGORY_GENERAL,
"Item Dislocator Disable Sound",
@@ -428,6 +435,16 @@ public class ConfigHandler {
}
}
itemDislocatorBlockBlacklistMap.clear();
for (String s : itemDislocatorBlockBlacklist) {
if (s.contains("|")) {
itemDislocatorBlockBlacklistMap
.put(s.substring(0, s.indexOf("|")), Integer.parseInt(s.substring(s.indexOf("|") + 1)));
} else {
itemDislocatorBlockBlacklistMap.put(s, -1);
}
}
if (disableLog) {
disableLog = false;
LogHelper.warn("###########################################");
@@ -3,6 +3,7 @@ package com.brandon3055.draconicevolution.common.items.tools;
import java.util.ArrayList;
import java.util.List;
import net.minecraft.block.Block;
import net.minecraft.client.Minecraft;
import net.minecraft.client.entity.EntityClientPlayerMP;
import net.minecraft.client.renderer.texture.IIconRegister;
@@ -147,6 +148,30 @@ public class Magnet extends ItemDE implements IBauble, IConfigurableItem {
continue;
}
int x = (int) Math.floor(item.posX);
int y = (int) Math.floor(item.posY);
int z = (int) Math.floor(item.posZ);
Block block = world.getBlock(x, y, z);
String blockName = Item.itemRegistry.getNameForObject(Item.getItemFromBlock(block));
int meta = world.getBlockMetadata(x, y, z);
if (ConfigHandler.itemDislocatorBlockBlacklistMap.containsKey(blockName)
&& (ConfigHandler.itemDislocatorBlockBlacklistMap.get(blockName) == -1
|| ConfigHandler.itemDislocatorBlockBlacklistMap.get(blockName) == meta)) {
continue;
}
y--;
block = world.getBlock(x, y, z);
blockName = Item.itemRegistry.getNameForObject(Item.getItemFromBlock(block));
meta = world.getBlockMetadata(x, y, z);
if (ConfigHandler.itemDislocatorBlockBlacklistMap.containsKey(blockName)
&& (ConfigHandler.itemDislocatorBlockBlacklistMap.get(blockName) == -1
|| ConfigHandler.itemDislocatorBlockBlacklistMap.get(blockName) == meta)) {
continue;
}
if (!skipPlayerCheck) {
EntityPlayer closestPlayer = world.getClosestPlayerToEntity(item, range);
if (closestPlayer == null || closestPlayer != player) continue;