Skip to content

Commit 76191c9

Browse files
MgazulMgazul
committed
Little cleaner
1 parent 7aa0a4e commit 76191c9

10 files changed

+51
-61
lines changed

‎patches/net/minecraft/block/BlockBrewingStand.java.patch

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
11
--- ../src-base/minecraft/net/minecraft/block/BlockBrewingStand.java
22
+++ ../src-work/minecraft/net/minecraft/block/BlockBrewingStand.java
3-
@@ -20,7 +20,7 @@
3+
@@ -20,6 +20,7 @@
44
import net.minecraft.util.AxisAlignedBB;
55
import net.minecraft.util.IIcon;
66
import net.minecraft.world.World;
7-
-
87
+import net.minecraft.nbt.NBTTagCompound;
8+
99
public class BlockBrewingStand extends BlockContainer
1010
{
11-
private Random field_149961_a = new Random();
12-
@@ -126,6 +126,12 @@
11+
@@ -126,6 +127,12 @@
1312
entityitem.motionX = (double)((float)this.field_149961_a.nextGaussian() * f3);
1413
entityitem.motionY = (double)((float)this.field_149961_a.nextGaussian() * f3 + 0.2F);
1514
entityitem.motionZ = (double)((float)this.field_149961_a.nextGaussian() * f3);

‎patches/net/minecraft/block/BlockCactus.java.patch

+5-6
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
11
--- ../src-base/minecraft/net/minecraft/block/BlockCactus.java
22
+++ ../src-work/minecraft/net/minecraft/block/BlockCactus.java
3-
@@ -17,6 +17,8 @@
3+
@@ -16,6 +16,7 @@
4+
import net.minecraftforge.common.EnumPlantType;
45
import net.minecraftforge.common.util.ForgeDirection;
56
import net.minecraftforge.common.IPlantable;
6-
77
+import org.bukkit.craftbukkit.event.CraftEventFactory; // CraftBukkit
8-
+
8+
99
public class BlockCactus extends Block implements IPlantable
1010
{
11-
@SideOnly(Side.CLIENT)
12-
@@ -47,9 +49,9 @@
11+
@@ -47,9 +48,9 @@
1312
{
1413
int i1 = p_149674_1_.getBlockMetadata(p_149674_2_, p_149674_3_, p_149674_4_);
1514

@@ -21,7 +20,7 @@
2120
p_149674_1_.setBlockMetadataWithNotify(p_149674_2_, p_149674_3_, p_149674_4_, 0, 4);
2221
this.onNeighborBlockChange(p_149674_1_, p_149674_2_, p_149674_3_ + 1, p_149674_4_, this);
2322
}
24-
@@ -135,6 +137,7 @@
23+
@@ -135,6 +136,7 @@
2524

2625
public void onEntityCollidedWithBlock(World p_149670_1_, int p_149670_2_, int p_149670_3_, int p_149670_4_, Entity p_149670_5_)
2726
{

‎patches/net/minecraft/block/BlockCommandBlock.java.patch

+4-5
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
11
--- ../src-base/minecraft/net/minecraft/block/BlockCommandBlock.java
22
+++ ../src-work/minecraft/net/minecraft/block/BlockCommandBlock.java
3-
@@ -10,6 +10,8 @@
3+
@@ -9,6 +9,7 @@
4+
import net.minecraft.tileentity.TileEntity;
45
import net.minecraft.tileentity.TileEntityCommandBlock;
56
import net.minecraft.world.World;
6-
77
+import org.bukkit.event.block.BlockRedstoneEvent; // CraftBukkit
8-
+
8+
99
public class BlockCommandBlock extends BlockContainer
1010
{
11-
private static final String __OBFID = "CL_00000219";
12-
@@ -31,13 +33,20 @@
11+
@@ -31,13 +32,20 @@
1312
boolean flag = p_149695_1_.isBlockIndirectlyGettingPowered(p_149695_2_, p_149695_3_, p_149695_4_);
1413
int l = p_149695_1_.getBlockMetadata(p_149695_2_, p_149695_3_, p_149695_4_);
1514
boolean flag1 = (l & 1) != 0;

‎patches/net/minecraft/block/BlockDoor.java.patch

+4-5
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
11
--- ../src-base/minecraft/net/minecraft/block/BlockDoor.java
22
+++ ../src-work/minecraft/net/minecraft/block/BlockDoor.java
3-
@@ -16,6 +16,8 @@
3+
@@ -15,6 +15,7 @@
4+
import net.minecraft.util.Vec3;
45
import net.minecraft.world.IBlockAccess;
56
import net.minecraft.world.World;
6-
77
+import org.bukkit.event.block.BlockRedstoneEvent; // CraftBukkit
8-
+
8+
99
public class BlockDoor extends Block
1010
{
11-
@SideOnly(Side.CLIENT)
12-
@@ -329,15 +331,32 @@
11+
@@ -329,15 +330,32 @@
1312
{
1413
this.dropBlockAsItem(p_149695_1_, p_149695_2_, p_149695_3_, p_149695_4_, l, 0);
1514
}

‎patches/net/minecraft/block/BlockFalling.java.patch

+4-5
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
11
--- ../src-base/minecraft/net/minecraft/block/BlockFalling.java
22
+++ ../src-work/minecraft/net/minecraft/block/BlockFalling.java
3-
@@ -1,7 +1,7 @@
4-
package net.minecraft.block;
3+
@@ -2,6 +2,7 @@
54

65
import java.util.Random;
7-
-import net.minecraft.block.material.Material;
8-
+import net.minecraft.block.material.*;
6+
import net.minecraft.block.material.Material;
7+
+import net.minecraft.block.material.MaterialLiquid;
98
import net.minecraft.creativetab.CreativeTabs;
109
import net.minecraft.entity.item.EntityFallingBlock;
1110
import net.minecraft.init.Blocks;
12-
@@ -96,7 +96,7 @@
11+
@@ -96,7 +97,7 @@
1312
{
1413
//TODO: King, take a look here when doing liquids!
1514
Material material = block.blockMaterial;

‎patches/net/minecraft/command/CommandHandler.java.patch

+14-28
Original file line numberDiff line numberDiff line change
@@ -21,52 +21,38 @@
2121
{
2222
CommandEvent event = new CommandEvent(icommand, p_71556_1_, astring);
2323
if (MinecraftForge.EVENT_BUS.post(event))
24-
@@ -134,11 +139,30 @@
24+
@@ -134,9 +139,28 @@
2525

2626
public ICommand registerCommand(ICommand p_71560_1_)
2727
{
28-
- List list = p_71560_1_.getCommandAliases();
29-
- this.commandMap.put(p_71560_1_.getCommandName(), p_71560_1_);
30-
- this.commandSet.add(p_71560_1_);
3128
+ // Cauldron start - register commands with permission nodes, defaulting to class name
3229
+ return registerCommand(p_71560_1_, p_71560_1_.getClass().getName());
3330
+ }
34-
31+
+
3532
+ public ICommand registerCommand(String permissionGroup, ICommand par1ICommand)
3633
+ {
3734
+ return registerCommand(par1ICommand, permissionGroup + "." + par1ICommand.getCommandName());
3835
+ }
3936
+
40-
+ public ICommand registerCommand(ICommand par1ICommand, String permissionNode)
37+
+ public ICommand registerCommand(ICommand p_71560_1_, String permissionNode)
4138
+ {
42-
+ List list = par1ICommand.getCommandAliases();
43-
+ this.commandMap.put(par1ICommand.getCommandName(), par1ICommand);
44-
+ this.commandSet.add(par1ICommand);
39+
List list = p_71560_1_.getCommandAliases();
40+
this.commandMap.put(p_71560_1_.getCommandName(), p_71560_1_);
41+
this.commandSet.add(p_71560_1_);
4542
+ // register vanilla commands with Bukkit to support permissions.
4643
+ CraftSimpleCommandMap commandMap = FMLCommonHandler.instance().getMinecraftServerInstance().server.getCraftCommandMap();
47-
+ ModCustomCommand customCommand = new ModCustomCommand(par1ICommand.getCommandName());
44+
+ ModCustomCommand customCommand = new ModCustomCommand(p_71560_1_.getCommandName());
4845
+ customCommand.setPermission(permissionNode);
49-
if (list != null)
50-
+ customCommand.setAliases(list);
51-
+ commandMap.register(par1ICommand.getCommandName(), customCommand);
52-
+ LogManager.getLogger().info("Registered command " + par1ICommand.getCommandName() + " with permission node " + permissionNode);
53-
+
5446
+ if (list != null)
55-
{
56-
Iterator iterator = list.iterator();
57-
58-
@@ -149,13 +173,14 @@
47+
+ customCommand.setAliases(list);
48+
+ commandMap.register(p_71560_1_.getCommandName(), customCommand);
49+
+ LogManager.getLogger().info("Registered command " + p_71560_1_.getCommandName() + " with permission node " + permissionNode);
5950

60-
if (icommand1 == null || !icommand1.getCommandName().equals(s))
61-
{
62-
- this.commandMap.put(s, p_71560_1_);
63-
+ this.commandMap.put(s, par1ICommand);
64-
}
65-
}
66-
}
51+
if (list != null)
52+
{
53+
@@ -156,6 +180,7 @@
6754

68-
- return p_71560_1_;
69-
+ return par1ICommand;
55+
return p_71560_1_;
7056
}
7157
+ // Cauldron end
7258

‎patches/net/minecraft/command/ServerCommandManager.java.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
- this.registerCommand(new CommandMessageRaw());
4040
+ */
4141
+ // Cauldron start - add permission nodes for rest of vanilla commands
42-
+ this.registerCommand("vanilla.command", new CommandDebug());
42+
+ //this.registerCommand("vanilla.command", new CommandDebug());
4343
+ this.registerCommand("vanilla.command", new CommandSpreadPlayers());
4444
+ this.registerCommand("vanilla.command", new CommandPlaySound());
4545
+ this.registerCommand("vanilla.command", new CommandScoreboard());

‎patches/org/bukkit/command/defaults/VersionCommand.java.patch

+14-6
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,19 @@
11
--- ../src-base/minecraft/org/bukkit/command/defaults/VersionCommand.java
22
+++ ../src-work/minecraft/org/bukkit/command/defaults/VersionCommand.java
3-
@@ -29,43 +29,19 @@
3+
@@ -4,6 +4,7 @@
4+
import java.util.Arrays;
5+
import java.util.List;
6+
7+
+import net.minecraftforge.common.ForgeVersion;
8+
import org.apache.commons.lang.Validate;
9+
import org.bukkit.Bukkit;
10+
import org.bukkit.ChatColor;
11+
@@ -29,43 +30,19 @@
412
if (!testPermission(sender)) return true;
513

614
if (args.length == 0) {
715
- sender.sendMessage("This server is running " + Bukkit.getName() + " version " + Bukkit.getVersion() + " (Implementing API version " + Bukkit.getBukkitVersion() + ")");
8-
+ sender.sendMessage("This server is running Thermos | https://github.com/CyberdyneCC/Thermos | " + Bukkit.getBukkitVersion() + " | " + Bukkit.getVersion());
16+
+ sender.sendMessage("This server is running " + Bukkit.getName() + " version " + Bukkit.getVersion() + " (Implementing API version " + Bukkit.getBukkitVersion() + ", Forge version " + ForgeVersion.getVersion() + ")");
917
} else {
1018
- StringBuilder name = new StringBuilder();
1119

@@ -49,7 +57,7 @@
4957
PluginDescriptionFile desc = plugin.getDescription();
5058
sender.sendMessage(ChatColor.GREEN + desc.getName() + ChatColor.WHITE + " version " + ChatColor.GREEN + desc.getVersion());
5159

52-
@@ -84,12 +60,12 @@
60+
@@ -84,12 +61,12 @@
5361
sender.sendMessage("Authors: " + getAuthors(desc));
5462
}
5563
}
@@ -65,7 +73,7 @@
6573
for (int i = 0; i < authors.size(); i++) {
6674
if (result.length() > 0) {
6775
result.append(ChatColor.WHITE);
68-
@@ -105,7 +81,7 @@
76+
@@ -105,7 +82,7 @@
6977
result.append(authors.get(i));
7078
}
7179

@@ -74,7 +82,7 @@
7482
}
7583

7684
@Override
77-
@@ -113,9 +89,10 @@
85+
@@ -113,9 +90,10 @@
7886
Validate.notNull(sender, "Sender cannot be null");
7987
Validate.notNull(args, "Arguments cannot be null");
8088
Validate.notNull(alias, "Alias cannot be null");
@@ -87,7 +95,7 @@
8795
String toComplete = args[0].toLowerCase();
8896
for (Plugin plugin : Bukkit.getPluginManager().getPlugins()) {
8997
if (StringUtil.startsWithIgnoreCase(plugin.getName(), toComplete)) {
90-
@@ -124,6 +101,6 @@
98+
@@ -124,6 +102,6 @@
9199
}
92100
return completions;
93101
}

‎settings.gradle

+1
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
rootProject.name = 'Mohist'
2+
include 'eclipse/Cauldron'

‎src/main/java/org/bukkit/craftbukkit/CraftServer.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@
144144
public final class CraftServer implements Server {
145145
private static final Player[] EMPTY_PLAYER_ARRAY = new Player[0];
146146
public static Spigot spigot;
147-
private final String serverName = "Cauldron"; // Cauldron - temporarily keep MCPC-Plus name until plugins adapt
147+
private final String serverName = "Mohist";
148148
private final String serverVersion;
149149
private final String bukkitVersion = Versioning.getBukkitVersion();
150150
private final Logger logger = Logger.getLogger("Minecraft");

0 commit comments

Comments
 (0)