mirror of
https://github.com/GTNewHorizons/CodeChickenCore.git
synced 2026-11-18 19:39:09 +00:00
Few things for new updated mods.
This commit is contained in:
1 parent
dfe178ec51
commit
a1696fe91b
4 files changed
+58
-65
No files matched your search
@@ -1,4 +1,4 @@
|
||||
mc_version=1.7.10
|
||||
forge_version=10.13.0.1151
|
||||
ccl_version=1.1.1.96
|
||||
ccl_version=1.1.1.98
|
||||
mod_version=1.0.3
|
||||
@@ -3,6 +3,7 @@ package codechicken.core;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
import com.mojang.authlib.GameProfile;
|
||||
import net.minecraft.server.MinecraftServer;
|
||||
import net.minecraft.command.CommandHandler;
|
||||
import net.minecraft.inventory.Container;
|
||||
@@ -43,18 +44,20 @@ public class ServerUtils extends CommonUtils
|
||||
player.openContainer.addCraftingToCrafters(player);
|
||||
}
|
||||
|
||||
public static GameProfile getGameProfile(String username) {
|
||||
return mc().func_152358_ax().func_152655_a(username);
|
||||
}
|
||||
|
||||
public static boolean isPlayerOP(String username) {
|
||||
return mc().getConfigurationManager().func_152596_g(getPlayer(username).getGameProfile());
|
||||
GameProfile prof = getGameProfile(username);
|
||||
if(prof == null) return false;
|
||||
return mc().getConfigurationManager().func_152596_g(getGameProfile(username));
|
||||
}
|
||||
|
||||
public static boolean isPlayerOwner(String username) {
|
||||
return mc().isSinglePlayer() && mc().getServerOwner().equalsIgnoreCase(username);
|
||||
}
|
||||
|
||||
public static void registerCommand(ICommand command) {
|
||||
((CommandHandler) mc().getCommandManager()).registerCommand(command);
|
||||
}
|
||||
|
||||
public static void sendChatToAll(IChatComponent msg) {
|
||||
for(EntityPlayer p : getPlayers())
|
||||
p.addChatComponentMessage(msg);
|
||||
|
||||
@@ -40,6 +40,9 @@ public class CodeChickenCoreModContainer extends DummyModContainer
|
||||
if(!getVersion().contains("$")) {
|
||||
deps.add(VersionParser.parseVersionReference("NotEnoughItems@[1.0.3,)"));
|
||||
deps.add(VersionParser.parseVersionReference("EnderStorage@[1.4.5,)"));
|
||||
deps.add(VersionParser.parseVersionReference("ChickenChunks@[1.4.5,)"));
|
||||
deps.add(VersionParser.parseVersionReference("Translocator@[1.4.5,)"));
|
||||
deps.add(VersionParser.parseVersionReference("WR-CBE|Core@[1.4.5,)"));
|
||||
}
|
||||
return deps;
|
||||
}
|
||||
|
||||
@@ -5,6 +5,7 @@ import java.util.List;
|
||||
import codechicken.core.ServerUtils;
|
||||
import net.minecraft.server.MinecraftServer;
|
||||
import net.minecraft.util.ChatComponentText;
|
||||
import net.minecraft.util.ChatComponentTranslation;
|
||||
import net.minecraft.util.ChunkCoordinates;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.entity.player.EntityPlayerMP;
|
||||
@@ -16,11 +17,11 @@ import net.minecraft.world.WorldServer;
|
||||
import net.minecraftforge.common.DimensionManager;
|
||||
|
||||
public abstract class CoreCommand implements ICommand
|
||||
{
|
||||
{
|
||||
public class WCommandSender implements ICommandSender
|
||||
{
|
||||
public ICommandSender wrapped;
|
||||
|
||||
|
||||
public WCommandSender(ICommandSender sender) {
|
||||
wrapped = sender;
|
||||
}
|
||||
@@ -54,98 +55,84 @@ public abstract class CoreCommand implements ICommand
|
||||
public IChatComponent func_145748_c_() {
|
||||
return new ChatComponentText(getCommandSenderName());
|
||||
}
|
||||
|
||||
public void chatT(String s, Object... params) {
|
||||
addChatMessage(new ChatComponentTranslation(s, params));
|
||||
}
|
||||
|
||||
public void chatOpsT(String s, Object... params) {
|
||||
for (EntityPlayerMP player : ServerUtils.getPlayers())
|
||||
if (MinecraftServer.getServer().getConfigurationManager().func_152596_g(player.getGameProfile()))
|
||||
player.addChatMessage(new ChatComponentTranslation(s, params));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
public abstract boolean OPOnly();
|
||||
|
||||
|
||||
@Override
|
||||
public String getCommandUsage(ICommandSender var1)
|
||||
{
|
||||
public String getCommandUsage(ICommandSender var1) {
|
||||
return "/" + getCommandName() + " help";
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public void processCommand(ICommandSender listener, String[] args)
|
||||
{
|
||||
public void processCommand(ICommandSender listener, String[] args) {
|
||||
WCommandSender wsender = new WCommandSender(listener);
|
||||
|
||||
if(args.length < minimumParameters() ||
|
||||
args.length == 1 && args[0].equals("help"))
|
||||
{
|
||||
|
||||
if (args.length < minimumParameters() ||
|
||||
args.length == 1 && args[0].equals("help")) {
|
||||
printHelp(wsender);
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
String command = getCommandName();
|
||||
for(String arg : args)
|
||||
command+=" "+arg;
|
||||
|
||||
for (String arg : args)
|
||||
command += " " + arg;
|
||||
|
||||
handleCommand(command, wsender.getCommandSenderName(), args, wsender);
|
||||
}
|
||||
|
||||
|
||||
public abstract void handleCommand(String command, String playername, String[] args, WCommandSender listener);
|
||||
|
||||
|
||||
public abstract void printHelp(WCommandSender listener);
|
||||
|
||||
public final EntityPlayerMP getPlayer(String name)
|
||||
{
|
||||
|
||||
public final EntityPlayerMP getPlayer(String name) {
|
||||
return ServerUtils.getPlayer(name);
|
||||
}
|
||||
|
||||
public WorldServer getWorld(int dimension)
|
||||
{
|
||||
|
||||
public WorldServer getWorld(int dimension) {
|
||||
return DimensionManager.getWorld(dimension);
|
||||
}
|
||||
|
||||
public WorldServer getWorld(EntityPlayer player)
|
||||
{
|
||||
public WorldServer getWorld(EntityPlayer player) {
|
||||
return (WorldServer) player.worldObj;
|
||||
}
|
||||
|
||||
public Integer parseInteger(String parse)
|
||||
{
|
||||
try
|
||||
{
|
||||
return Integer.parseInt(parse);
|
||||
}
|
||||
catch(NumberFormatException e)
|
||||
{
|
||||
return null;
|
||||
}
|
||||
@Override
|
||||
public int compareTo(Object arg0) {
|
||||
return getCommandName().compareTo(((ICommand) arg0).getCommandName());
|
||||
}
|
||||
|
||||
@Override
|
||||
public int compareTo(Object arg0)
|
||||
{
|
||||
return getCommandName().compareTo(((ICommand)arg0).getCommandName());
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<?> getCommandAliases()
|
||||
{
|
||||
public List<?> getCommandAliases() {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<?> addTabCompletionOptions(ICommandSender var1, String[] var2)
|
||||
{
|
||||
public List<?> addTabCompletionOptions(ICommandSender var1, String[] var2) {
|
||||
return null;
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public boolean isUsernameIndex(String[] astring, int i)
|
||||
{
|
||||
public boolean isUsernameIndex(String[] astring, int i) {
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public boolean canCommandSenderUseCommand(ICommandSender var1)
|
||||
{
|
||||
if(OPOnly())
|
||||
{
|
||||
if(var1 instanceof EntityPlayer)
|
||||
return ServerUtils.isPlayerOP(var1.getCommandSenderName());
|
||||
else if(var1 instanceof MinecraftServer)
|
||||
public boolean canCommandSenderUseCommand(ICommandSender var1) {
|
||||
if (OPOnly()) {
|
||||
if (var1 instanceof EntityPlayer)
|
||||
return MinecraftServer.getServer().getConfigurationManager().func_152596_g(((EntityPlayer) var1).getGameProfile());
|
||||
else if (var1 instanceof MinecraftServer)
|
||||
return true;
|
||||
else
|
||||
return false;
|
||||
@@ -153,6 +140,6 @@ public abstract class CoreCommand implements ICommand
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
|
||||
public abstract int minimumParameters();
|
||||
}
|
||||
Reference in new issue
Block a user