mirror of
https://github.com/GTNewHorizons/Draconic-Evolution.git
synced 2026-10-26 14:24:14 +00:00
Compare commits
2
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
82ad40f1cf | ||
|
|
6d8b0a0e72 |
No files matched your search
+7
-7
@@ -4,14 +4,14 @@ dependencies {
|
||||
api("com.github.GTNewHorizons:BrandonsCore:1.2.0-GTNH:dev")
|
||||
api("curse.maven:cofh-lib-220333:2388748")
|
||||
|
||||
compileOnly("com.github.GTNewHorizons:ForestryMC:4.10.17:api") {transitive = false}
|
||||
compileOnly("com.github.GTNewHorizons:OpenComputers:1.12.0-GTNH:api") {transitive = false}
|
||||
compileOnly("com.github.GTNewHorizons:NotEnoughItems:2.8.9-GTNH:dev") {transitive = false}
|
||||
compileOnly("com.github.GTNewHorizons:CodeChickenCore:1.4.7:dev") {transitive = false}
|
||||
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.37-GTNH:dev") {transitive = false}
|
||||
compileOnly("com.github.GTNewHorizons:CodeChickenCore:1.4.8:dev") {transitive = false}
|
||||
compileOnly("com.github.GTNewHorizons:inventory-tweaks:1.7.1:dev") {transitive = false}
|
||||
compileOnly('com.github.GTNewHorizons:Baubles-Expanded:2.2.0-GTNH:dev') {transitive = false}
|
||||
compileOnly("com.github.GTNewHorizons:GT5-Unofficial:5.09.52.31:dev") {transitive = false}
|
||||
compileOnly("com.github.GTNewHorizons:GTNHLib:0.7.0: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.106:dev") {transitive = false}
|
||||
compileOnly("com.github.GTNewHorizons:GTNHLib:0.8.6:dev") {transitive = false}
|
||||
|
||||
compileOnly("thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev") {transitive = false}
|
||||
compileOnly("curse.maven:computercraft-67504:2269339") {transitive = false}
|
||||
|
||||
+9
-1
@@ -96,7 +96,9 @@ usesMixinDebug = false
|
||||
# Specify the location of your implementation of IMixinConfigPlugin. Leave it empty otherwise.
|
||||
mixinPlugin =
|
||||
|
||||
# Specify the package that contains all of your Mixins. You may only place Mixins in this package or the build will fail!
|
||||
# Specify the package that contains all of your Mixins. The package must exist or
|
||||
# the build will fail. If you have a package property defined in your mixins.<modid>.json,
|
||||
# it must match with this or the build will fail.
|
||||
mixinsPackage =
|
||||
|
||||
# Specify the core mod entry class if you use a core mod. This class must implement IFMLLoadingPlugin!
|
||||
@@ -172,6 +174,12 @@ curseForgeRelations =
|
||||
# projects. New projects should not use this parameter.
|
||||
customArchiveBaseName = Draconic-Evolution
|
||||
|
||||
# Optional parameter to customize the default working directory used by the runClient* tasks. Relative to the project directory.
|
||||
# runClientWorkingDirectory = run/client
|
||||
|
||||
# Optional parameter to customize the default working directory used by the runServer* tasks. Relative to the project directory.
|
||||
# runServerWorkingDirectory = run/server
|
||||
|
||||
# Optional parameter to have the build automatically fail if an illegal version is used.
|
||||
# This can be useful if you e.g. only want to allow versions in the form of '1.1.xxx'.
|
||||
# The check is ONLY performed if the version is a git tag.
|
||||
|
||||
Vendored
BIN
Binary file not shown.
+1
-1
@@ -1,6 +1,6 @@
|
||||
distributionBase=GRADLE_USER_HOME
|
||||
distributionPath=wrapper/dists
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
|
||||
networkTimeout=10000
|
||||
validateDistributionUrl=true
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
|
||||
@@ -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
@@ -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
|
||||
|
||||
+1
-1
@@ -17,7 +17,7 @@ pluginManagement {
|
||||
}
|
||||
|
||||
plugins {
|
||||
id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.43'
|
||||
id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.48'
|
||||
}
|
||||
|
||||
|
||||
@@ -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;
|
||||
|
||||
Reference in new issue
Block a user