R3944Realms/CarryOn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updated configs, improved compatibility, fixed sponge server issue

Browse Source
This commit is contained in:
Tschipp 2021-04-10 10:59:42 +02:00
parent d948c37146
commit 9503120d58
6 changed files with 34 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build.gradle
View File

@ -9,13 +9,9 @@ buildscript {
} }
} }
apply plugin: 'net.minecraftforge.gradle.forge' apply plugin: 'net.minecraftforge.gradle.forge'
apply plugin: 'maven-publish' apply plugin: 'maven-publish'
apply from: 'https://raw.githubusercontent.com/MinecraftModDevelopment/Gradle-Collection/22e7d543a18cd30675277fbfa3669e3d9e206010/generic/secrets.gradle' apply from: 'https://raw.githubusercontent.com/MinecraftModDevelopment/Gradle-Collection/22e7d543a18cd30675277fbfa3669e3d9e206010/generic/secrets.gradle'
import groovy.json.JsonOutput import groovy.json.JsonOutput

2
gradle.properties
View File

@ -1,5 +1,5 @@
# Sets default memory used for gradle commands. Can be overridden by user or command line properties. # Sets default memory used for gradle commands. Can be overridden by user or command line properties.
# This is required to provide enough memory for the Minecraft decompilation process. # This is required to provide enough memory for the Minecraft decompilation process.
org.gradle.jvmargs=-Xmx3G org.gradle.jvmargs=-Xmx3G
version=1.12.3 version=1.12.4
minecraft_version=1.12.2 minecraft_version=1.12.2

17
src/main/java/tschipp/carryon/common/config/Configs.java
View File

@ -197,7 +197,14 @@ public class Configs {
"dumpsterdiving:rep_casing", "dumpsterdiving:rep_casing",
"dumpsterdiving:trash_furn_g", "dumpsterdiving:trash_furn_g",
"dumpsterdiving:trash_furn_n", "dumpsterdiving:trash_furn_n",
"*door*" "*door*",
"waystones:*",
"immersiverailroading:*",
"integrateddynamics:*",
"bloodmagic:*",
"rftools:screen",
"rftools:creative_screen",
}; };
@Comment("Entities that cannot be picked up") @Comment("Entities that cannot be picked up")
@ -220,7 +227,11 @@ public class Configs {
"mynko:*", "mynko:*",
"astikorcarts:*", "astikorcarts:*",
"dakimakuramod:*", "dakimakuramod:*",
"tektopia:*" "tektopia:*",
"mocreatures:*",
"pixelmon:*",
"thebetweenlands:draeton**",
"mysticalworld:*"
}; };
@ -300,7 +311,7 @@ public class Configs {
"animania:cheese_mold;7->(block)animania:cheese_mold;7", "animania:cheese_mold;7->(block)animania:cheese_mold;7",
"animania:cheese_mold;8->(block)animania:cheese_mold;8", "animania:cheese_mold;8->(block)animania:cheese_mold;8",
"animania:cheese_mold;9->(block)animania:cheese_mold;9", "animania:cheese_mold;9->(block)animania:cheese_mold;9",
"animania:cheese_mold;10->(block)animania:cheese_mold;10", "animania:cheese_mold;10->(block)animania:cheese_mold;10"
}; };
} }

2
src/main/java/tschipp/carryon/common/event/ItemEntityEvents.java
View File

@ -57,7 +57,7 @@ public class ItemEntityEvents
{ {
String command = override.getCommandPlace(); String command = override.getCommandPlace();
if (command != null) if (command != null)
player.getServer().getCommandManager().executeCommand(player.getServer(), "/execute " + player.getGameProfile().getName() + " ~ ~ ~ " + command); player.getServer().getCommandManager().executeCommand(player.getServer(), "execute " + player.getGameProfile().getName() + " ~ ~ ~ " + command);
} }
} }
} }

9
src/main/java/tschipp/carryon/common/event/ItemEvents.java
View File

@ -90,7 +90,7 @@ public class ItemEvents
{ {
String command = override.getCommandPlace(); String command = override.getCommandPlace();
if (command != null) if (command != null)
player.getServer().getCommandManager().executeCommand(player.getServer(), "/execute " + player.getGameProfile().getName() + " ~ ~ ~ " + command); player.getServer().getCommandManager().executeCommand(player.getServer(), "execute " + player.getGameProfile().getName() + " ~ ~ ~ " + command);
} }
} }
} }
@ -375,7 +375,10 @@ public class ItemEvents
{ {
String command = override.getCommandInit(); String command = override.getCommandInit();
if (command != null) if (command != null)
player.getServer().getCommandManager().executeCommand(player.getServer(), "/execute " + player.getGameProfile().getName() + " ~ ~ ~ " + command); {
CarryOn.LOGGER.info("Executing command: execute " + player.getGameProfile().getName() + " ~ ~ ~ " + command);
player.getServer().getCommandManager().executeCommand(player.getServer(), "execute " + player.getGameProfile().getName() + " ~ ~ ~ " + command);
}
} }
} }
@ -501,7 +504,7 @@ public class ItemEvents
{ {
String command = override.getCommandLoop(); String command = override.getCommandLoop();
if (command != null) if (command != null)
player.getServer().getCommandManager().executeCommand(player.getServer(), "/execute " + player.getGameProfile().getName() + " ~ ~ ~ " + command); player.getServer().getCommandManager().executeCommand(player.getServer(), "execute " + player.getGameProfile().getName() + " ~ ~ ~ " + command);
} }
} }

14
src/main/java/tschipp/carryon/common/item/ItemTile.java
View File

@ -210,8 +210,11 @@ public class ItemTile extends Item
TileEntity tile = world.getTileEntity(pos2); TileEntity tile = world.getTileEntity(pos2);
if (tile != null) if (tile != null)
{ {
tile.readFromNBT(getTileData(stack)); NBTTagCompound tag = getTileData(stack);
tile.setPos(pos2); updateTileLocation(tag, pos2);
tile.readFromNBT(tag);
// tile.readFromNBT(getTileData(stack));
// tile.setPos(pos2);
} }
clearTileData(stack); clearTileData(stack);
player.playSound(containedblock.getSoundType().getPlaceSound(), 1.0f, 0.5f); player.playSound(containedblock.getSoundType().getPlaceSound(), 1.0f, 0.5f);
@ -321,6 +324,13 @@ public class ItemTile extends Item
} }
} }
public static void updateTileLocation(NBTTagCompound tag, BlockPos pos)
{
tag.setInteger("x", pos.getX());
tag.setInteger("y", pos.getY());
tag.setInteger("z", pos.getZ());
}
public static NBTTagCompound getTileData(ItemStack stack) public static NBTTagCompound getTileData(ItemStack stack)
{ {
if (stack.hasTagCompound()) if (stack.hasTagCompound())