From 930ffac925b85c12a8f148f60e0633b60d529dbc Mon Sep 17 00:00:00 2001 From: Hexeption Date: Sun, 18 Aug 2019 21:43:45 +0100 Subject: [PATCH] Magma Branding --- build.gradle | 22 +++++++++---------- .../net/minecraft/block/BlockCake.java.patch | 2 +- .../net/minecraft/block/BlockSkull.java.patch | 2 +- .../net/minecraft/entity/Entity.java.patch | 4 ++-- .../entity/EntityLivingBase.java.patch | 6 ++--- .../entity/player/EntityPlayer.java.patch | 2 +- .../net/minecraft/nbt/NBTTagList.java.patch | 2 +- .../network/NetHandlerPlayServer.java.patch | 4 ++-- .../handshake/client/C00Handshake.java.patch | 2 +- .../server/MinecraftServer.java.patch | 4 ++-- .../server/management/PlayerList.java.patch | 6 ++--- .../tileentity/TileEntitySkull.java.patch | 2 +- .../net/minecraft/util/FoodStats.java.patch | 2 +- patches/net/minecraft/world/World.java.patch | 4 ++-- .../minecraft/world/WorldProvider.java.patch | 4 ++-- .../minecraft/world/WorldServer.java.patch | 2 +- .../world/gen/ChunkProviderServer.java.patch | 2 +- .../common/DimensionManager.java.patch | 6 ++--- .../common/ForgeHooks.java.patch | 2 +- .../internal/FMLNetworkHandler.java.patch | 4 ++-- .../relauncher/ServerLaunchWrapper.java.patch | 4 ++-- settings.gradle | 2 +- .../kettle/KettleVersionCommand.java | 22 ------------------- .../org/bukkit/craftbukkit/CraftServer.java | 2 +- .../bukkit/craftbukkit/block/CraftBlock.java | 4 ++-- .../craftbukkit/event/CraftEventFactory.java | 4 ++-- .../craftbukkit/inventory/CraftItemStack.java | 2 +- .../magma}/downloads/DownloadServerFiles.java | 4 ++-- 28 files changed, 53 insertions(+), 75 deletions(-) delete mode 100644 src/main/java/kettlefoundation/kettle/KettleVersionCommand.java rename src/main/java/{kettlefoundation/kettle => org/magmafoundation/magma}/downloads/DownloadServerFiles.java (95%) diff --git a/build.gradle b/build.gradle index d25e35cc..0dcbbc0f 100644 --- a/build.gradle +++ b/build.gradle @@ -32,7 +32,7 @@ apply plugin: 'net.minecraftforge.gradle.launch4j' apply plugin: 'net.nemerosa.versioning' apply plugin: "com.github.breadmoirai.github-release" -group 'kettlefoundation' +group 'magmafoundation' version 'git-' + versioning.info.branch + "-" + versioning.info.build repositories { @@ -55,8 +55,8 @@ repositories { url 'https://mvnrepository.com/artifact/' } maven { - name 'KettleFoundation' - url 'https://repo.hexeption.co.uk/artifactory/Kettle/' + name 'MagmaFoundation' + url 'https://repo.hexeption.co.uk/artifactory/Magma/' } flatDir { dirs 'src/main/resources' @@ -110,7 +110,7 @@ minecraft { with common } - kettle { + magma { rootDir "." patchDir "patches/" patchAfter "forge" @@ -174,7 +174,7 @@ outputJar { classifier = 'universal' manifest.attributes([ - "Implementation-Title": "Kettle", + "Implementation-Title": "Magma", "Implementation-Version": version, "Main-Class": "net.minecraftforge.fml.relauncher.ServerLaunchWrapper", "TweakClass": "net.minecraftforge.fml.common.launcher.FMLTweaker", @@ -187,8 +187,8 @@ processJson { addReplacements([ "@minecraft_version@": project.minecraft.version, "@version@": project.version, - "@project@": "kettle", - "@artifact@": "kf:kettle:${project.version}", + "@project@": "magma", + "@artifact@": "mf:magma:${project.version}", "@universal_jar@": { outputJar.archiveName }, "@timestamp@": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ"), ]) @@ -201,7 +201,7 @@ extractForgeSources { genGradleProjects { addCompileDep "junit:junit:4.12" addCompileDep "bukkit:bukkit:1.12.2-R0.1" - addRepo("KettleFoundation", "https://repo.hexeption.co.uk/artifactory/Kettle/") + addRepo("MagmaFoundation", "https://repo.hexeption.co.uk/artifactory/Magma/") } import groovy.json.JsonSlurper @@ -231,9 +231,9 @@ githubRelease { }else{ token "" } - owner "KettleFoundation" - repo "Kettle" - releaseName "Kettle Dev " + versioning.info.branch + "-" + versioning.info.build + owner "MagmaFoundation" + repo "Magma" + releaseName "Magma Dev " + versioning.info.branch + "-" + versioning.info.build body { """\ ## Setup Info diff --git a/patches/net/minecraft/block/BlockCake.java.patch b/patches/net/minecraft/block/BlockCake.java.patch index d168b176..71bf68cf 100644 --- a/patches/net/minecraft/block/BlockCake.java.patch +++ b/patches/net/minecraft/block/BlockCake.java.patch @@ -12,7 +12,7 @@ else { player.addStat(StatList.CAKE_SLICES_EATEN); -+ // Kettle Restore CraftBukkit changes for AppleCore recognition ++ // Magma Restore CraftBukkit changes for AppleCore recognition player.getFoodStats().addStats(2, 0.1F); + int oldFoodLevel = player.getFoodStats().foodLevel; + diff --git a/patches/net/minecraft/block/BlockSkull.java.patch b/patches/net/minecraft/block/BlockSkull.java.patch index ded3ed70..76cac7f1 100644 --- a/patches/net/minecraft/block/BlockSkull.java.patch +++ b/patches/net/minecraft/block/BlockSkull.java.patch @@ -45,7 +45,7 @@ worldIn.setBlockState(pos, state, 4); } - this.dropBlockAsItem(worldIn, pos, state, 0); -+ // this.dropBlockAsItem(worldIn, pos, state, 0); Kettle - prevents doubled and creative mode drops ++ // this.dropBlockAsItem(worldIn, pos, state, 0); Magma - prevents doubled and creative mode drops super.onBlockHarvested(worldIn, pos, state, player); } diff --git a/patches/net/minecraft/entity/Entity.java.patch b/patches/net/minecraft/entity/Entity.java.patch index 2d3cd55e..c6c7b330 100644 --- a/patches/net/minecraft/entity/Entity.java.patch +++ b/patches/net/minecraft/entity/Entity.java.patch @@ -147,7 +147,7 @@ this.entityInit(); - net.minecraftforge.common.MinecraftForge.EVENT_BUS.post(new net.minecraftforge.event.entity.EntityEvent.EntityConstructing(this)); - capabilities = net.minecraftforge.event.ForgeEventFactory.gatherCapabilities(this); -+ if(!(this instanceof EntityPlayer)) { // Kettle - move to EntityPlayer ++ if(!(this instanceof EntityPlayer)) { // Magma - move to EntityPlayer + net.minecraftforge.common.MinecraftForge.EVENT_BUS.post(new net.minecraftforge.event.entity.EntityEvent.EntityConstructing(this)); + capabilities = net.minecraftforge.event.ForgeEventFactory.gatherCapabilities(this); + } @@ -158,7 +158,7 @@ public boolean captureDrops = false; public java.util.ArrayList capturedDrops = new java.util.ArrayList(); - private net.minecraftforge.common.capabilities.CapabilityDispatcher capabilities; -+ public net.minecraftforge.common.capabilities.CapabilityDispatcher capabilities; // Kettle - private -> public ++ public net.minecraftforge.common.capabilities.CapabilityDispatcher capabilities; // Magma - private -> public public int getEntityId() { diff --git a/patches/net/minecraft/entity/EntityLivingBase.java.patch b/patches/net/minecraft/entity/EntityLivingBase.java.patch index f78d4922..80e52e9b 100644 --- a/patches/net/minecraft/entity/EntityLivingBase.java.patch +++ b/patches/net/minecraft/entity/EntityLivingBase.java.patch @@ -512,10 +512,10 @@ if (!net.minecraftforge.common.ForgeHooks.onLivingDrops(this, cause, capturedDrops, i, recentlyHit > 0)) { -+ // Kettle start - first allow forge to alter drops, then plugins and finally spawn items ++ // Magma start - first allow forge to alter drops, then plugins and finally spawn items + if (capturedDrops.size() > 0) { + this.drops = new ArrayList<>(); -+ // Kettle - don't use forceDrops ++ // Magma - don't use forceDrops + for(EntityItem item: capturedDrops) + { + this.drops.add(CraftItemStack.asCraftMirror(item.getItem())); @@ -523,7 +523,7 @@ + CraftEventFactory.callEntityDeathEvent(this, this.drops); + } else { + CraftEventFactory.callEntityDeathEvent(this); -+ // Kettle end ++ // Magma end + } + for (EntityItem item : capturedDrops) diff --git a/patches/net/minecraft/entity/player/EntityPlayer.java.patch b/patches/net/minecraft/entity/player/EntityPlayer.java.patch index 375c13bf..8f638122 100644 --- a/patches/net/minecraft/entity/player/EntityPlayer.java.patch +++ b/patches/net/minecraft/entity/player/EntityPlayer.java.patch @@ -26,7 +26,7 @@ public Container inventoryContainer; public Container openContainer; - protected FoodStats foodStats = new FoodStats(); -+ protected FoodStats foodStats = new FoodStats(); // Kettle - Restore CraftBukkit modifications, compatible with AppleCore and other mods that modify FoodStats ++ protected FoodStats foodStats = new FoodStats(); // Magma - Restore CraftBukkit modifications, compatible with AppleCore and other mods that modify FoodStats protected int flyToggleTimer; public float prevCameraYaw; public float cameraYaw; diff --git a/patches/net/minecraft/nbt/NBTTagList.java.patch b/patches/net/minecraft/nbt/NBTTagList.java.patch index a65926de..96bf8765 100644 --- a/patches/net/minecraft/nbt/NBTTagList.java.patch +++ b/patches/net/minecraft/nbt/NBTTagList.java.patch @@ -32,7 +32,7 @@ NBTTagList nbttaglist = new NBTTagList(); nbttaglist.tagType = this.tagType; - -+ if ( nbttaglist.tagList instanceof ArrayList) // Kettle, ensure we dont create arrays to then delete them ++ if ( nbttaglist.tagList instanceof ArrayList) // Magma, ensure we dont create arrays to then delete them + ((ArrayList)nbttaglist.tagList).ensureCapacity(this.tagList.size()); for (NBTBase nbtbase : this.tagList) { diff --git a/patches/net/minecraft/network/NetHandlerPlayServer.java.patch b/patches/net/minecraft/network/NetHandlerPlayServer.java.patch index 23ceb4a8..039f2665 100644 --- a/patches/net/minecraft/network/NetHandlerPlayServer.java.patch +++ b/patches/net/minecraft/network/NetHandlerPlayServer.java.patch @@ -1286,12 +1286,12 @@ + + InventoryView inventory = this.player.openContainer.getBukkitView(); + -+ // Kettle start ++ // Magma start + if(inventory == null){ + inventory = new CraftInventoryView(this.player.getBukkitEntity(), MinecraftServer.getServerInstance().server.createInventory(this.player.getBukkitEntity(), InventoryType.CHEST), this.player.openContainer); + this.player.openContainer.setBukkitView(inventory); + } -+ // Kettle end ++ // Magma end + + InventoryType.SlotType type = CraftInventoryView.getSlotType(inventory, packetIn.getSlotId()); + diff --git a/patches/net/minecraft/network/handshake/client/C00Handshake.java.patch b/patches/net/minecraft/network/handshake/client/C00Handshake.java.patch index c7a064f1..e388387a 100644 --- a/patches/net/minecraft/network/handshake/client/C00Handshake.java.patch +++ b/patches/net/minecraft/network/handshake/client/C00Handshake.java.patch @@ -24,7 +24,7 @@ + if(this.hasFMLMarker){ + this.ip = this.ip.replace("\0FML\0", ""); + }else if(this.ip.split("\0").length > 2){ -+ this.hasFMLMarker = true; // Kettle - Bungee Support ++ this.hasFMLMarker = true; // Magma - Bungee Support + } } diff --git a/patches/net/minecraft/server/MinecraftServer.java.patch b/patches/net/minecraft/server/MinecraftServer.java.patch index 58155c31..1333df91 100644 --- a/patches/net/minecraft/server/MinecraftServer.java.patch +++ b/patches/net/minecraft/server/MinecraftServer.java.patch @@ -384,7 +384,7 @@ + if (dim == 0) { + ISaveHandler idatamanager = new AnvilSaveHandler(server.getWorldContainer(), worldNameIn, true, this.dataFixer); + WorldInfo worlddata = idatamanager.loadWorldInfo(); -+ // Kettle start ++ // Magma start + for (Map.Entry entry : ForgeRegistries.ITEMS.getEntries()) { + ResourceLocation key = entry.getKey(); + Item item = entry.getValue(); @@ -454,7 +454,7 @@ + PotionEffectType.stopAcceptingRegistrations(); + server.loadPlugins(); + server.enablePlugins(org.bukkit.plugin.PluginLoadOrder.STARTUP); -+ // Kettle end ++ // Magma end + if (worlddata == null) { + worlddata = new WorldInfo(worldsettings, worldNameIn); + } diff --git a/patches/net/minecraft/server/management/PlayerList.java.patch b/patches/net/minecraft/server/management/PlayerList.java.patch index 41bb44ae..b5f1e63c 100644 --- a/patches/net/minecraft/server/management/PlayerList.java.patch +++ b/patches/net/minecraft/server/management/PlayerList.java.patch @@ -347,7 +347,7 @@ + // CraftBukkit start - Quitting must be before we do final save of data, in case plugins need to modify it + org.bukkit.craftbukkit.event.CraftEventFactory.handleInventoryCloseEvent(playerIn); + if(playerIn.connection != null) { -+ // Kettle CraftServer Changed to Bukkit ++ // Magma CraftServer Changed to Bukkit + PlayerQuitEvent playerQuitEvent = new PlayerQuitEvent(cserver.getPlayer(playerIn), "\u00A7e" + playerIn.getName() + " left the game"); + Bukkit.getPluginManager().callEvent(playerQuitEvent); + playerIn.getBukkitEntity().disconnect(playerQuitEvent.getQuitMessage()); @@ -584,7 +584,7 @@ - entityplayermp.connection.sendPacket(new SPacketRespawn(entityplayermp.dimension, entityplayermp.world.getDifficulty(), entityplayermp.world.getWorldInfo().getTerrainType(), entityplayermp.interactionManager.getGameType())); + int actualDimension = worldserver.provider.getDimension(); -+ // Kettle - change dim for bukkit added dimensions ++ // Magma - change dim for bukkit added dimensions + if (DimensionManager.isBukkitDimension(actualDimension)) + { + FMLEmbeddedChannel serverChannel = ForgeNetworkHandler.getServerChannel(); @@ -592,7 +592,7 @@ + serverChannel.attr(FMLOutboundHandler.FML_MESSAGETARGETARGS).set(entityplayermp); + serverChannel.writeOutbound(new DimensionRegisterMessage(actualDimension, DimensionManager.getProviderType(actualDimension).name())); + } -+ // Kettle end ++ // Magma end + + // entityplayermp.connection.sendPacket(new SPacketRespawn(entityplayermp.dimension, entityplayermp.world.getDifficulty(), entityplayermp.world.getWorldInfo().getTerrainType(), entityplayermp.interactionManager.getGameType())); + entityplayermp.connection.sendPacket(new SPacketRespawn(actualDimension, worldserver.getDifficulty(), worldserver.getWorldInfo().getTerrainType(), entityplayermp.interactionManager.getGameType())); diff --git a/patches/net/minecraft/tileentity/TileEntitySkull.java.patch b/patches/net/minecraft/tileentity/TileEntitySkull.java.patch index 34e93900..aeb593c6 100644 --- a/patches/net/minecraft/tileentity/TileEntitySkull.java.patch +++ b/patches/net/minecraft/tileentity/TileEntitySkull.java.patch @@ -206,7 +206,7 @@ { - return input; - } -+ return com.google.common.util.concurrent.Futures.getUnchecked(updateGameprofile(input, com.google.common.base.Predicates.alwaysTrue(), true)); // Kettle ++ return com.google.common.util.concurrent.Futures.getUnchecked(updateGameprofile(input, com.google.common.base.Predicates.alwaysTrue(), true)); // Magma } public int getSkullType() diff --git a/patches/net/minecraft/util/FoodStats.java.patch b/patches/net/minecraft/util/FoodStats.java.patch index d8d646fa..75a50938 100644 --- a/patches/net/minecraft/util/FoodStats.java.patch +++ b/patches/net/minecraft/util/FoodStats.java.patch @@ -28,7 +28,7 @@ + public int foodTimer; + public int prevFoodLevel = 20; -+ public EntityPlayer player; // CraftBukkit // Kettle private - public entityplayer - player Fix mcp duplicate naming causes AppleCore to recognize errors ++ public EntityPlayer player; // CraftBukkit // Magma private - public entityplayer - player Fix mcp duplicate naming causes AppleCore to recognize errors + + public FoodStats() { + } diff --git a/patches/net/minecraft/world/World.java.patch b/patches/net/minecraft/world/World.java.patch index bdd93698..da0534de 100644 --- a/patches/net/minecraft/world/World.java.patch +++ b/patches/net/minecraft/world/World.java.patch @@ -187,7 +187,7 @@ + this.isRemote = client; + this.worldBorder = providerIn.createWorldBorder(); + perWorldStorage = new MapStorage(null); -+ // Kettle start ++ // Magma start + if (DimensionManager.getWorld(0) != null) // if overworld has loaded, use its mapstorage + { + this.mapStorage = DimensionManager.getWorld(0).mapStorage; @@ -212,7 +212,7 @@ + generator = this.getServer().getGenerator(this.worldInfo.getWorldName()); + getWorld().generator = generator; + } -+ // Kettle end ++ // Magma end + // CraftBukkit start + getWorldBorder().world = (WorldServer) this; + // From PlayerList.setPlayerFileData diff --git a/patches/net/minecraft/world/WorldProvider.java.patch b/patches/net/minecraft/world/WorldProvider.java.patch index 6082f351..03aaa91a 100644 --- a/patches/net/minecraft/world/WorldProvider.java.patch +++ b/patches/net/minecraft/world/WorldProvider.java.patch @@ -52,9 +52,9 @@ return true; } + -+ // Kettle start ++ // Magma start + public static WorldProvider getProviderForDimension(int dimensionId){ + return DimensionManager.createProviderFor(dimensionId); + } -+ // Kettle end ++ // Magma end } diff --git a/patches/net/minecraft/world/WorldServer.java.patch b/patches/net/minecraft/world/WorldServer.java.patch index b1832a4a..d407a4c7 100644 --- a/patches/net/minecraft/world/WorldServer.java.patch +++ b/patches/net/minecraft/world/WorldServer.java.patch @@ -543,7 +543,7 @@ { IChunkLoader ichunkloader = this.saveHandler.getChunkLoader(this.provider); - return new ChunkProviderServer(this, ichunkloader, this.provider.createChunkGenerator()); -+ // Kettle - if provider is vanilla, proceed to create a bukkit compatible chunk generator ++ // Magma - if provider is vanilla, proceed to create a bukkit compatible chunk generator + if (this.provider.getClass().toString().length() <= 3 || this.provider.getClass().toString().contains("net.minecraft")) { + // CraftBukkit start + org.bukkit.craftbukkit.generator.InternalChunkGenerator gen; diff --git a/patches/net/minecraft/world/gen/ChunkProviderServer.java.patch b/patches/net/minecraft/world/gen/ChunkProviderServer.java.patch index 3a5c333b..73e616b1 100644 --- a/patches/net/minecraft/world/gen/ChunkProviderServer.java.patch +++ b/patches/net/minecraft/world/gen/ChunkProviderServer.java.patch @@ -72,7 +72,7 @@ } - if (this.id2ChunkMap.isEmpty()) net.minecraftforge.common.DimensionManager.unloadWorld(this.world.provider.getDimension()); -+ // Kettle - Stops forge automatically unloading world on startup. ++ // Magma - Stops forge automatically unloading world on startup. +// if (this.id2ChunkMap.isEmpty()) net.minecraftforge.common.DimensionManager.unloadWorld(this.world.provider.getDimension()); this.chunkLoader.chunkTick(); diff --git a/patches/net/minecraftforge/common/DimensionManager.java.patch b/patches/net/minecraftforge/common/DimensionManager.java.patch index 7cb5e105..a1f6842c 100644 --- a/patches/net/minecraftforge/common/DimensionManager.java.patch +++ b/patches/net/minecraftforge/common/DimensionManager.java.patch @@ -43,7 +43,7 @@ usedIds.add(id); } + -+ // Kettle - register Environment to Bukkit ++ // Magma - register Environment to Bukkit + if (id != -1 && id != 0 && id != 1) // ignore vanilla + { + registerBukkitDimension(id, type.getName()); @@ -64,7 +64,7 @@ } else { -+ FMLCommonHandler.instance().getMinecraftServerInstance().worldServerList.remove(getWorld(id)); // Kettle - remove world from our new world arraylist ++ FMLCommonHandler.instance().getMinecraftServerInstance().worldServerList.remove(getWorld(id)); // Magma - remove world from our new world arraylist worlds.remove(id); server.worldTickTimes.remove(id); FMLLog.log.info("Unloading dimension {}", id); @@ -130,7 +130,7 @@ - w.flush(); - setWorld(id, null, w.getMinecraftServer()); - } -+ FMLCommonHandler.instance().getMinecraftServerInstance().server.unloadWorld(w.getWorld(), true); // Kettle ++ FMLCommonHandler.instance().getMinecraftServerInstance().server.unloadWorld(w.getWorld(), true); // Magma } } diff --git a/patches/net/minecraftforge/common/ForgeHooks.java.patch b/patches/net/minecraftforge/common/ForgeHooks.java.patch index 05d69df3..830609f4 100644 --- a/patches/net/minecraftforge/common/ForgeHooks.java.patch +++ b/patches/net/minecraftforge/common/ForgeHooks.java.patch @@ -18,7 +18,7 @@ } LOGGER.warn("Picking on: [{}] {} gave null item", new Object[] {this.objectMouseOver.typeOfHit, s}); -@@ -993,7 +993,7 @@ +@@ -992,7 +992,7 @@ } /** diff --git a/patches/net/minecraftforge/fml/common/network/internal/FMLNetworkHandler.java.patch b/patches/net/minecraftforge/fml/common/network/internal/FMLNetworkHandler.java.patch index 8f717516..12dfa14b 100644 --- a/patches/net/minecraftforge/fml/common/network/internal/FMLNetworkHandler.java.patch +++ b/patches/net/minecraftforge/fml/common/network/internal/FMLNetworkHandler.java.patch @@ -29,7 +29,7 @@ Container remoteGuiContainer = NetworkRegistry.INSTANCE.getRemoteGuiContainer(mc, entityPlayerMP, modGuiId, world, x, y, z); if (remoteGuiContainer != null) { -+ // Kettle start ++ // Magma start + if(remoteGuiContainer.getBukkitView() == null){ + TileEntity te = entityPlayer.world.getTileEntity(new BlockPos(x,y,z)); + if(te instanceof IInventory){ @@ -42,7 +42,7 @@ + return; + } + } -+ // Kettle end ++ // Magma end entityPlayerMP.getNextWindowId(); entityPlayerMP.closeContainer(); int windowId = entityPlayerMP.currentWindowId; diff --git a/patches/net/minecraftforge/fml/relauncher/ServerLaunchWrapper.java.patch b/patches/net/minecraftforge/fml/relauncher/ServerLaunchWrapper.java.patch index 064049cd..c4021b1f 100644 --- a/patches/net/minecraftforge/fml/relauncher/ServerLaunchWrapper.java.patch +++ b/patches/net/minecraftforge/fml/relauncher/ServerLaunchWrapper.java.patch @@ -4,7 +4,7 @@ package net.minecraftforge.fml.relauncher; import java.lang.reflect.Method; -+import kettlefoundation.kettle.downloads.DownloadServerFiles; ++import org.magmafoundation.magma.downloads.DownloadServerFiles; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.core.LoggerContext; @@ -19,7 +19,7 @@ public static void main(String[] args) { - new ServerLaunchWrapper().run(args); -+ System.out.println("Starting Kettle"); ++ System.out.println("Starting Magma"); + DownloadServerFiles.downloadMinecraftServer(); + DownloadServerFiles.downloadServerLibraries(); + new ServerLaunchWrapper().run(args); diff --git a/settings.gradle b/settings.gradle index 93142792..80405c1e 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,2 +1,2 @@ -rootProject.name = 'kettle' +rootProject.name = 'Magma' diff --git a/src/main/java/kettlefoundation/kettle/KettleVersionCommand.java b/src/main/java/kettlefoundation/kettle/KettleVersionCommand.java deleted file mode 100644 index d7537eed..00000000 --- a/src/main/java/kettlefoundation/kettle/KettleVersionCommand.java +++ /dev/null @@ -1,22 +0,0 @@ -package kettlefoundation.kettle; - -import org.bukkit.command.Command; -import org.bukkit.command.CommandSender; - -/** - * KettleVersionCommand - * - * @author strezz - * @since 16/02/2019 - 04:53 PM - */ -public class KettleVersionCommand extends Command { - - protected KettleVersionCommand(String name) { - super(name); - } - - @Override - public boolean execute(CommandSender commandSender, String s, String[] strings) { - return false; - } -} diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java index 67007b0d..212545cf 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -182,7 +182,7 @@ import net.md_5.bungee.api.chat.BaseComponent; public final class CraftServer implements Server { - private final String serverName = "Kettle"; + private final String serverName = "Magma"; private final String serverVersion; private final String bukkitVersion = Versioning.getBukkitVersion(); private final Logger logger = Logger.getLogger("Minecraft"); diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java index ff40f51c..fcab1d7d 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java @@ -275,7 +275,7 @@ public static EnumFacing blockFaceToNotch(BlockFace face) { public BlockState getState() { Material material = getType(); - // Kettle start - if null, check for TE that implements IInventory (cauldron stuff) + // Magma start - if null, check for TE that implements IInventory (cauldron stuff) if (material == null) { TileEntity te = ((CraftWorld)this.getWorld()).getHandle().getTileEntity(new BlockPos(this.getX(), this.getY(), this.getZ())); @@ -288,7 +288,7 @@ public BlockState getState() { // pass default state return new CraftBlockState(this); } - // Kettle end + // Magma end switch (material) { case SIGN: diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java index 59728a12..1945e39d 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -428,7 +428,7 @@ public static EntityDeathEvent callEntityDeathEvent(EntityLivingBase victim, Lis Bukkit.getServer().getPluginManager().callEvent(event); victim.expToDrop = event.getDroppedExp(); - //Kettle start - clear captured drops to allow plugins make changes to them + //Magma start - clear captured drops to allow plugins make changes to them victim.capturedDrops.clear(); for (org.bukkit.inventory.ItemStack stack : event.getDrops()) { if (stack == null || stack.getType() == Material.AIR || stack.getAmount() == 0) continue; @@ -436,7 +436,7 @@ public static EntityDeathEvent callEntityDeathEvent(EntityLivingBase victim, Lis // world.dropItemNaturally(entity.getLocation(), stack); we don't want this, spawn items in EntityLivingBase.onDeath() (cauldron stuff) victim.capturedDrops.add(entityitem); } - //Kettle end + //Magma end return event; } diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java index a54d9d1d..be3a85f1 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java @@ -60,7 +60,7 @@ public static ItemStack asBukkitCopy(net.minecraft.item.ItemStack original) { if (original.isEmpty()) { return new ItemStack(Material.AIR); } - // Kettle start - don't use strict Bukkit stacks as we don't have Bukkit Materials for modded item stacks, create wrapper? (Cauldron) + // Magma start - don't use strict Bukkit stacks as we don't have Bukkit Materials for modded item stacks, create wrapper? (Cauldron) return asCraftMirror(copyNMSStack(original, original.getCount())); /* ItemStack stack = new ItemStack(CraftMagicNumbers.getMaterial(original.getItem()), original.getCount(), (short) original.getMetadata()); diff --git a/src/main/java/kettlefoundation/kettle/downloads/DownloadServerFiles.java b/src/main/java/org/magmafoundation/magma/downloads/DownloadServerFiles.java similarity index 95% rename from src/main/java/kettlefoundation/kettle/downloads/DownloadServerFiles.java rename to src/main/java/org/magmafoundation/magma/downloads/DownloadServerFiles.java index eff0eb6e..a0f947b6 100644 --- a/src/main/java/kettlefoundation/kettle/downloads/DownloadServerFiles.java +++ b/src/main/java/org/magmafoundation/magma/downloads/DownloadServerFiles.java @@ -1,4 +1,4 @@ -package kettlefoundation.kettle.downloads; +package org.magmafoundation.magma.downloads; import java.io.*; import java.net.URL; @@ -41,7 +41,7 @@ public static void downloadMinecraftServer() { */ public static void downloadServerLibraries() { String fileName = "libraries.zip"; - String downloadLink = "https://raw.githubusercontent.com/KettleFoundation/Kettle/master/release/libraries.zip"; + String downloadLink = "https://raw.githubusercontent.com/MagmaFoundation/Magma/master/release/libraries.zip"; File minecraftlibraries = new File(fileName); if (!minecraftlibraries.exists() && !minecraftlibraries.isDirectory()) {