Refactor, split out bootstrap and mod
Added missing AT ForgeInstaller no longer been translated
This commit is contained in:
parent
2bc5937db5
commit
abdda35369
|
@ -23,11 +23,15 @@ arclight {
|
|||
forgeVersion = project.ext.forgeVersion
|
||||
bukkitVersion = 'v1_17_R1'
|
||||
wipeVersion = true
|
||||
reobfVersion = false
|
||||
reobfVersion = true
|
||||
accessTransformer = project.file('bukkit.at')
|
||||
// packageName = 'spigot'
|
||||
}
|
||||
|
||||
configurations {
|
||||
embed
|
||||
}
|
||||
|
||||
java.toolchain.languageVersion = JavaLanguageVersion.of(16)
|
||||
|
||||
minecraft {
|
||||
|
@ -64,6 +68,32 @@ dependencies {
|
|||
implementation "io.izzel:tools:$toolsVersion"
|
||||
implementation "io.izzel.arclight:arclight-api:$apiVersion"
|
||||
implementation project(':i18n-config')
|
||||
embed 'net.md-5:bungeecord-chat:1.16-R0.4@jar'
|
||||
embed "org.spigotmc:spigot-api:$minecraftVersion-R0.1-SNAPSHOT@jar"
|
||||
}
|
||||
|
||||
jar {
|
||||
manifest.attributes 'MixinConnector': 'io.izzel.arclight.common.mod.ArclightConnector'
|
||||
manifest.attributes 'Implementation-Title': 'Arclight'
|
||||
manifest.attributes 'Implementation-Version': "arclight-$minecraftVersion-${project.version}-$gitHash"
|
||||
manifest.attributes 'Implementation-Vendor': 'Arclight Team'
|
||||
manifest.attributes 'Implementation-Timestamp': new Date().format("yyyy-MM-dd HH:mm:ss")
|
||||
from(configurations.embed.collect { it.isDirectory() ? it : zipTree(it) }) {
|
||||
exclude "META-INF/MANIFEST.MF"
|
||||
exclude "META-INF/*.SF"
|
||||
exclude "META-INF/*.DSA"
|
||||
exclude "META-INF/*.RSA"
|
||||
exclude "LICENSE.txt"
|
||||
exclude "META-INF/services/**"
|
||||
exclude "org/apache/commons/lang/enum/**"
|
||||
}
|
||||
duplicatesStrategy = DuplicatesStrategy.EXCLUDE
|
||||
}
|
||||
|
||||
processResources {
|
||||
filesMatching("**/mods.toml") {
|
||||
expand 'version': "$minecraftVersion-${project.version}-$gitHash"
|
||||
}
|
||||
}
|
||||
|
||||
remapSpigotJar {
|
||||
|
@ -71,12 +101,6 @@ remapSpigotJar {
|
|||
includes.add('net/minecraft/tileentity/LecternTileEntity$LecternInventory')
|
||||
}
|
||||
|
||||
generateArclightMeta {
|
||||
doFirst {
|
||||
throw new StopExecutionException()
|
||||
}
|
||||
}
|
||||
|
||||
mixin {
|
||||
add sourceSets.main, 'mixins.arclight.refmap.json'
|
||||
}
|
||||
|
|
|
@ -1,6 +0,0 @@
|
|||
package io.izzel.arclight.common.bridge.command;
|
||||
|
||||
public interface CommandNodeBridge {
|
||||
|
||||
void bridge$removeCommand(String name);
|
||||
}
|
|
@ -1,4 +1,4 @@
|
|||
package io.izzel.arclight.common.bridge.advancement;
|
||||
package io.izzel.arclight.common.bridge.core.advancement;
|
||||
|
||||
import org.bukkit.advancement.Advancement;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package io.izzel.arclight.common.bridge.block;
|
||||
package io.izzel.arclight.common.bridge.core.block;
|
||||
|
||||
import net.minecraft.core.BlockPos;
|
||||
import net.minecraft.server.level.ServerLevel;
|
|
@ -1,4 +1,4 @@
|
|||
package io.izzel.arclight.common.bridge.block;
|
||||
package io.izzel.arclight.common.bridge.core.block;
|
||||
|
||||
import net.minecraft.world.level.block.Block;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package io.izzel.arclight.common.bridge.block;
|
||||
package io.izzel.arclight.common.bridge.core.block;
|
||||
|
||||
import net.minecraft.core.BlockPos;
|
||||
import net.minecraft.world.level.Level;
|
|
@ -1,4 +1,4 @@
|
|||
package io.izzel.arclight.common.bridge.block;
|
||||
package io.izzel.arclight.common.bridge.core.block;
|
||||
|
||||
import net.minecraft.server.level.ServerLevel;
|
||||
import org.bukkit.craftbukkit.v.event.CraftPortalEvent;
|
|
@ -1,4 +1,4 @@
|
|||
package io.izzel.arclight.common.bridge.block;
|
||||
package io.izzel.arclight.common.bridge.core.block;
|
||||
|
||||
public interface PortalSizeBridge {
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package io.izzel.arclight.common.bridge.command;
|
||||
package io.izzel.arclight.common.bridge.core.command;
|
||||
|
||||
import com.mojang.brigadier.tree.CommandNode;
|
||||
import org.bukkit.command.CommandSender;
|
|
@ -1,4 +1,4 @@
|
|||
package io.izzel.arclight.common.bridge.command;
|
||||
package io.izzel.arclight.common.bridge.core.command;
|
||||
|
||||
import net.minecraft.commands.CommandSourceStack;
|
||||
import org.bukkit.command.CommandSender;
|
|
@ -1,4 +1,4 @@
|
|||
package io.izzel.arclight.common.bridge.command.arguments;
|
||||
package io.izzel.arclight.common.bridge.core.command.arguments;
|
||||
|
||||
import com.mojang.brigadier.StringReader;
|
||||
import com.mojang.brigadier.exceptions.CommandSyntaxException;
|
|
@ -1,4 +1,4 @@
|
|||
package io.izzel.arclight.common.bridge.command.arguments;
|
||||
package io.izzel.arclight.common.bridge.core.command.arguments;
|
||||
|
||||
import com.mojang.brigadier.exceptions.CommandSyntaxException;
|
||||
import net.minecraft.commands.arguments.selector.EntitySelector;
|
|
@ -1,4 +1,4 @@
|
|||
package io.izzel.arclight.common.bridge.entity;
|
||||
package io.izzel.arclight.common.bridge.core.entity;
|
||||
|
||||
public interface AgeableEntityBridge extends LivingEntityBridge {
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package io.izzel.arclight.common.bridge.entity;
|
||||
package io.izzel.arclight.common.bridge.core.entity;
|
||||
|
||||
public interface AreaEffectCloudEntityBridge {
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
package io.izzel.arclight.common.bridge.entity;
|
||||
package io.izzel.arclight.common.bridge.core.entity;
|
||||
|
||||
import io.izzel.arclight.common.bridge.command.ICommandSourceBridge;
|
||||
import io.izzel.arclight.common.bridge.core.command.ICommandSourceBridge;
|
||||
import org.bukkit.craftbukkit.v.entity.CraftEntity;
|
||||
import org.bukkit.projectiles.ProjectileSource;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package io.izzel.arclight.common.bridge.entity;
|
||||
package io.izzel.arclight.common.bridge.core.entity;
|
||||
|
||||
import org.bukkit.event.entity.CreatureSpawnEvent;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package io.izzel.arclight.common.bridge.entity;
|
||||
package io.izzel.arclight.common.bridge.core.entity;
|
||||
|
||||
import net.minecraft.core.BlockPos;
|
||||
import org.bukkit.craftbukkit.v.entity.CraftEntity;
|
|
@ -1,4 +1,4 @@
|
|||
package io.izzel.arclight.common.bridge.entity;
|
||||
package io.izzel.arclight.common.bridge.core.entity;
|
||||
|
||||
import org.bukkit.craftbukkit.v.entity.CraftLivingEntity;
|
||||
import org.bukkit.event.entity.EntityPotionEffectEvent;
|
|
@ -1,4 +1,4 @@
|
|||
package io.izzel.arclight.common.bridge.entity;
|
||||
package io.izzel.arclight.common.bridge.core.entity;
|
||||
|
||||
import net.minecraft.resources.ResourceLocation;
|
||||
import net.minecraft.world.entity.LivingEntity;
|
|
@ -1,4 +1,4 @@
|
|||
package io.izzel.arclight.common.bridge.entity.ai.attributes;
|
||||
package io.izzel.arclight.common.bridge.core.entity.ai.attributes;
|
||||
|
||||
public interface RangedAttributeBridge {
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package io.izzel.arclight.common.bridge.entity.merchant;
|
||||
package io.izzel.arclight.common.bridge.core.entity.merchant;
|
||||
|
||||
import org.bukkit.craftbukkit.v.inventory.CraftMerchant;
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
package io.izzel.arclight.common.bridge.core.entity.monster;
|
||||
|
||||
import io.izzel.arclight.common.bridge.core.entity.MobEntityBridge;
|
||||
|
||||
public interface CreeperEntityBridge extends MobEntityBridge {
|
||||
|
||||
void bridge$setPowered(boolean power);
|
||||
}
|
|
@ -1,4 +1,4 @@
|
|||
package io.izzel.arclight.common.bridge.entity.monster;
|
||||
package io.izzel.arclight.common.bridge.core.entity.monster;
|
||||
|
||||
import net.minecraft.world.entity.LivingEntity;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package io.izzel.arclight.common.bridge.entity.monster.piglin;
|
||||
package io.izzel.arclight.common.bridge.core.entity.monster.piglin;
|
||||
|
||||
import net.minecraft.world.item.Item;
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
package io.izzel.arclight.common.bridge.entity.passive;
|
||||
package io.izzel.arclight.common.bridge.core.entity.passive;
|
||||
|
||||
import io.izzel.arclight.common.bridge.entity.MobEntityBridge;
|
||||
import io.izzel.arclight.common.bridge.core.entity.MobEntityBridge;
|
||||
import net.minecraft.world.item.ItemStack;
|
||||
|
||||
public interface AnimalEntityBridge extends MobEntityBridge {
|
|
@ -1,4 +1,4 @@
|
|||
package io.izzel.arclight.common.bridge.entity.passive;
|
||||
package io.izzel.arclight.common.bridge.core.entity.passive;
|
||||
|
||||
import java.util.UUID;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package io.izzel.arclight.common.bridge.entity.passive;
|
||||
package io.izzel.arclight.common.bridge.core.entity.passive;
|
||||
|
||||
public interface TurtleEntityBridge extends AnimalEntityBridge {
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
package io.izzel.arclight.common.bridge.entity.player;
|
||||
package io.izzel.arclight.common.bridge.core.entity.player;
|
||||
|
||||
import com.mojang.datafixers.util.Either;
|
||||
import io.izzel.arclight.common.bridge.entity.LivingEntityBridge;
|
||||
import io.izzel.arclight.common.bridge.core.entity.LivingEntityBridge;
|
||||
import net.minecraft.core.BlockPos;
|
||||
import net.minecraft.util.Unit;
|
||||
import net.minecraft.world.entity.player.Player;
|
|
@ -1,4 +1,4 @@
|
|||
package io.izzel.arclight.common.bridge.entity.player;
|
||||
package io.izzel.arclight.common.bridge.core.entity.player;
|
||||
|
||||
import net.minecraft.world.item.ItemStack;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package io.izzel.arclight.common.bridge.entity.player;
|
||||
package io.izzel.arclight.common.bridge.core.entity.player;
|
||||
|
||||
import net.minecraft.core.BlockPos;
|
||||
import net.minecraft.network.chat.Component;
|
|
@ -1,6 +1,6 @@
|
|||
package io.izzel.arclight.common.bridge.entity.projectile;
|
||||
package io.izzel.arclight.common.bridge.core.entity.projectile;
|
||||
|
||||
import io.izzel.arclight.common.bridge.entity.EntityBridge;
|
||||
import io.izzel.arclight.common.bridge.core.entity.EntityBridge;
|
||||
|
||||
public interface ArrowEntityBridge extends EntityBridge {
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
package io.izzel.arclight.common.bridge.core.entity.projectile;
|
||||
|
||||
import io.izzel.arclight.common.bridge.core.entity.EntityBridge;
|
||||
|
||||
public interface DamagingProjectileEntityBridge extends EntityBridge {
|
||||
|
||||
void bridge$setBukkitYield(float yield);
|
||||
}
|
|
@ -1,4 +1,4 @@
|
|||
package io.izzel.arclight.common.bridge.entity.projectile;
|
||||
package io.izzel.arclight.common.bridge.core.entity.projectile;
|
||||
|
||||
import net.minecraft.world.item.ItemStack;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package io.izzel.arclight.common.bridge.inventory;
|
||||
package io.izzel.arclight.common.bridge.core.inventory;
|
||||
|
||||
import net.minecraft.world.Container;
|
||||
import net.minecraft.world.entity.player.Player;
|
|
@ -1,4 +1,4 @@
|
|||
package io.izzel.arclight.common.bridge.inventory;
|
||||
package io.izzel.arclight.common.bridge.core.inventory;
|
||||
|
||||
import io.izzel.arclight.common.mod.ArclightMod;
|
||||
import io.izzel.arclight.common.mod.util.WrappedContents;
|
|
@ -1,4 +1,4 @@
|
|||
package io.izzel.arclight.common.bridge.inventory.container;
|
||||
package io.izzel.arclight.common.bridge.core.inventory.container;
|
||||
|
||||
import net.minecraft.network.chat.Component;
|
||||
import net.minecraft.world.inventory.AbstractContainerMenu;
|
|
@ -1,4 +1,4 @@
|
|||
package io.izzel.arclight.common.bridge.inventory.container;
|
||||
package io.izzel.arclight.common.bridge.core.inventory.container;
|
||||
|
||||
import net.minecraft.world.entity.player.Inventory;
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
package io.izzel.arclight.common.bridge.inventory.container;
|
||||
package io.izzel.arclight.common.bridge.core.inventory.container;
|
||||
|
||||
import io.izzel.arclight.common.bridge.util.IWorldPosCallableBridge;
|
||||
import io.izzel.arclight.common.bridge.core.util.IWorldPosCallableBridge;
|
||||
import net.minecraft.world.inventory.ContainerLevelAccess;
|
||||
import org.bukkit.Location;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package io.izzel.arclight.common.bridge.inventory.container;
|
||||
package io.izzel.arclight.common.bridge.core.inventory.container;
|
||||
|
||||
public interface SlotBridge {
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package io.izzel.arclight.common.bridge.item;
|
||||
package io.izzel.arclight.common.bridge.core.item;
|
||||
|
||||
import net.minecraft.nbt.CompoundTag;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package io.izzel.arclight.common.bridge.item;
|
||||
package io.izzel.arclight.common.bridge.core.item;
|
||||
|
||||
import org.bukkit.craftbukkit.v.inventory.CraftMerchantRecipe;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package io.izzel.arclight.common.bridge.item.crafting;
|
||||
package io.izzel.arclight.common.bridge.core.item.crafting;
|
||||
|
||||
import org.bukkit.inventory.Recipe;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package io.izzel.arclight.common.bridge.item.crafting;
|
||||
package io.izzel.arclight.common.bridge.core.item.crafting;
|
||||
|
||||
public interface IngredientBridge {
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package io.izzel.arclight.common.bridge.item.crafting;
|
||||
package io.izzel.arclight.common.bridge.core.item.crafting;
|
||||
|
||||
import net.minecraft.world.item.crafting.Recipe;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package io.izzel.arclight.common.bridge.network;
|
||||
package io.izzel.arclight.common.bridge.core.network;
|
||||
|
||||
import com.mojang.authlib.properties.Property;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package io.izzel.arclight.common.bridge.network.datasync;
|
||||
package io.izzel.arclight.common.bridge.core.network.datasync;
|
||||
|
||||
import net.minecraft.network.syncher.EntityDataAccessor;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package io.izzel.arclight.common.bridge.network.login;
|
||||
package io.izzel.arclight.common.bridge.core.network.login;
|
||||
|
||||
public interface ServerLoginNetHandlerBridge {
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package io.izzel.arclight.common.bridge.network.play;
|
||||
package io.izzel.arclight.common.bridge.core.network.play;
|
||||
|
||||
import org.bukkit.Location;
|
||||
import org.bukkit.event.player.PlayerTeleportEvent;
|
|
@ -1,4 +1,4 @@
|
|||
package io.izzel.arclight.common.bridge.network.play;
|
||||
package io.izzel.arclight.common.bridge.core.network.play;
|
||||
|
||||
public interface TimestampedPacket {
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package io.izzel.arclight.common.bridge.network.rcon;
|
||||
package io.izzel.arclight.common.bridge.core.network.rcon;
|
||||
|
||||
public interface RConConsoleSourceBridge {
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package io.izzel.arclight.common.bridge.server;
|
||||
package io.izzel.arclight.common.bridge.core.server;
|
||||
|
||||
import org.bukkit.boss.KeyedBossBar;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package io.izzel.arclight.common.bridge.server;
|
||||
package io.izzel.arclight.common.bridge.core.server;
|
||||
|
||||
import net.minecraft.commands.Commands;
|
||||
import org.bukkit.command.ConsoleCommandSender;
|
|
@ -1,4 +1,4 @@
|
|||
package io.izzel.arclight.common.bridge.server.management;
|
||||
package io.izzel.arclight.common.bridge.core.server.management;
|
||||
|
||||
import java.util.Date;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package io.izzel.arclight.common.bridge.server.management;
|
||||
package io.izzel.arclight.common.bridge.core.server.management;
|
||||
|
||||
public interface PlayerInteractionManagerBridge {
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package io.izzel.arclight.common.bridge.server.management;
|
||||
package io.izzel.arclight.common.bridge.core.server.management;
|
||||
|
||||
import com.mojang.authlib.GameProfile;
|
||||
import org.bukkit.craftbukkit.v.CraftServer;
|
|
@ -1,4 +1,4 @@
|
|||
package io.izzel.arclight.common.bridge.server.management;
|
||||
package io.izzel.arclight.common.bridge.core.server.management;
|
||||
|
||||
import java.util.Collection;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package io.izzel.arclight.common.bridge.tags;
|
||||
package io.izzel.arclight.common.bridge.core.tags;
|
||||
|
||||
public interface NetworkTagCollectionBridge {
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package io.izzel.arclight.common.bridge.tileentity;
|
||||
package io.izzel.arclight.common.bridge.core.tileentity;
|
||||
|
||||
import net.minecraft.server.level.ServerPlayer;
|
||||
import net.minecraft.world.item.ItemStack;
|
|
@ -1,4 +1,4 @@
|
|||
package io.izzel.arclight.common.bridge.tileentity;
|
||||
package io.izzel.arclight.common.bridge.core.tileentity;
|
||||
|
||||
import org.bukkit.potion.PotionEffect;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package io.izzel.arclight.common.bridge.tileentity;
|
||||
package io.izzel.arclight.common.bridge.core.tileentity;
|
||||
|
||||
public interface SignTileEntityBridge {
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package io.izzel.arclight.common.bridge.tileentity;
|
||||
package io.izzel.arclight.common.bridge.core.tileentity;
|
||||
|
||||
import org.bukkit.inventory.InventoryHolder;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package io.izzel.arclight.common.bridge.util;
|
||||
package io.izzel.arclight.common.bridge.core.util;
|
||||
|
||||
import net.minecraft.world.damagesource.DamageSource;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package io.izzel.arclight.common.bridge.util;
|
||||
package io.izzel.arclight.common.bridge.core.util;
|
||||
|
||||
import net.minecraft.world.entity.player.Player;
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
package io.izzel.arclight.common.bridge.util;
|
||||
package io.izzel.arclight.common.bridge.core.util;
|
||||
|
||||
import io.izzel.arclight.common.bridge.world.WorldBridge;
|
||||
import io.izzel.arclight.common.bridge.core.world.WorldBridge;
|
||||
import net.minecraft.core.BlockPos;
|
||||
import net.minecraft.world.inventory.ContainerLevelAccess;
|
||||
import net.minecraft.world.level.Level;
|
|
@ -1,4 +1,4 @@
|
|||
package io.izzel.arclight.common.bridge.util;
|
||||
package io.izzel.arclight.common.bridge.core.util;
|
||||
|
||||
import net.minecraft.world.entity.Entity;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package io.izzel.arclight.common.bridge.util.text;
|
||||
package io.izzel.arclight.common.bridge.core.util.text;
|
||||
|
||||
import java.util.Iterator;
|
||||
import java.util.stream.Stream;
|
|
@ -1,4 +1,4 @@
|
|||
package io.izzel.arclight.common.bridge.world;
|
||||
package io.izzel.arclight.common.bridge.core.world;
|
||||
|
||||
import net.minecraft.world.entity.Entity;
|
||||
import net.minecraft.world.level.Explosion;
|
|
@ -1,4 +1,4 @@
|
|||
package io.izzel.arclight.common.bridge.world;
|
||||
package io.izzel.arclight.common.bridge.core.world;
|
||||
|
||||
import net.minecraft.core.BlockPos;
|
||||
import net.minecraft.world.level.ClipContext;
|
|
@ -1,4 +1,4 @@
|
|||
package io.izzel.arclight.common.bridge.world;
|
||||
package io.izzel.arclight.common.bridge.core.world;
|
||||
|
||||
import net.minecraft.server.level.ServerLevel;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package io.izzel.arclight.common.bridge.world;
|
||||
package io.izzel.arclight.common.bridge.core.world;
|
||||
|
||||
import net.minecraft.world.entity.Entity;
|
||||
import org.bukkit.event.entity.CreatureSpawnEvent;
|
|
@ -1,4 +1,4 @@
|
|||
package io.izzel.arclight.common.bridge.world;
|
||||
package io.izzel.arclight.common.bridge.core.world;
|
||||
|
||||
import java.util.Optional;
|
||||
import net.minecraft.BlockUtil;
|
|
@ -1,4 +1,4 @@
|
|||
package io.izzel.arclight.common.bridge.world;
|
||||
package io.izzel.arclight.common.bridge.core.world;
|
||||
|
||||
import java.util.Set;
|
||||
import net.minecraft.server.level.ServerPlayer;
|
|
@ -1,4 +1,4 @@
|
|||
package io.izzel.arclight.common.bridge.world;
|
||||
package io.izzel.arclight.common.bridge.core.world;
|
||||
|
||||
import net.minecraft.core.BlockPos;
|
||||
import net.minecraft.resources.ResourceKey;
|
|
@ -1,4 +1,4 @@
|
|||
package io.izzel.arclight.common.bridge.world.border;
|
||||
package io.izzel.arclight.common.bridge.core.world.border;
|
||||
|
||||
import net.minecraft.world.level.Level;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package io.izzel.arclight.common.bridge.world.chunk;
|
||||
package io.izzel.arclight.common.bridge.core.world.chunk;
|
||||
|
||||
import net.minecraft.core.BlockPos;
|
||||
import net.minecraft.world.level.block.state.BlockState;
|
|
@ -1,4 +1,4 @@
|
|||
package io.izzel.arclight.common.bridge.world.chunk.storage;
|
||||
package io.izzel.arclight.common.bridge.core.world.chunk.storage;
|
||||
|
||||
import java.io.IOException;
|
||||
import net.minecraft.world.level.ChunkPos;
|
|
@ -1,4 +1,4 @@
|
|||
package io.izzel.arclight.common.bridge.world.raid;
|
||||
package io.izzel.arclight.common.bridge.core.world.raid;
|
||||
|
||||
import java.util.Collection;
|
||||
import net.minecraft.world.entity.raid.Raider;
|
|
@ -1,4 +1,4 @@
|
|||
package io.izzel.arclight.common.bridge.world.server;
|
||||
package io.izzel.arclight.common.bridge.core.world.server;
|
||||
|
||||
import net.minecraft.world.level.chunk.LevelChunk;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package io.izzel.arclight.common.bridge.world.server;
|
||||
package io.izzel.arclight.common.bridge.core.world.server;
|
||||
|
||||
import io.izzel.arclight.common.mod.util.ArclightCallbackExecutor;
|
||||
import net.minecraft.server.level.ChunkHolder;
|
|
@ -1,4 +1,4 @@
|
|||
package io.izzel.arclight.common.bridge.world.server;
|
||||
package io.izzel.arclight.common.bridge.core.world.server;
|
||||
|
||||
import java.io.IOException;
|
||||
import net.minecraft.server.level.ThreadedLevelLightEngine;
|
|
@ -1,8 +1,8 @@
|
|||
package io.izzel.arclight.common.bridge.world.server;
|
||||
package io.izzel.arclight.common.bridge.core.world.server;
|
||||
|
||||
import org.bukkit.event.entity.CreatureSpawnEvent;
|
||||
import org.bukkit.event.weather.LightningStrikeEvent;
|
||||
import io.izzel.arclight.common.bridge.world.WorldBridge;
|
||||
import io.izzel.arclight.common.bridge.core.world.WorldBridge;
|
||||
import net.minecraft.core.BlockPos;
|
||||
import net.minecraft.core.particles.ParticleOptions;
|
||||
import net.minecraft.world.entity.Entity;
|
|
@ -1,4 +1,4 @@
|
|||
package io.izzel.arclight.common.bridge.world.server;
|
||||
package io.izzel.arclight.common.bridge.core.world.server;
|
||||
|
||||
import net.minecraft.server.level.Ticket;
|
||||
import net.minecraft.server.level.TicketType;
|
|
@ -1,4 +1,4 @@
|
|||
package io.izzel.arclight.common.bridge.world.server;
|
||||
package io.izzel.arclight.common.bridge.core.world.server;
|
||||
|
||||
public interface TicketTypeBridge {
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package io.izzel.arclight.common.bridge.world.spawner;
|
||||
package io.izzel.arclight.common.bridge.core.world.spawner;
|
||||
|
||||
import net.minecraft.core.BlockPos;
|
||||
import net.minecraft.world.entity.EntityType;
|
|
@ -1,4 +1,4 @@
|
|||
package io.izzel.arclight.common.bridge.world.storage;
|
||||
package io.izzel.arclight.common.bridge.core.world.storage;
|
||||
|
||||
import net.minecraft.resources.ResourceKey;
|
||||
import net.minecraft.world.level.dimension.DimensionType;
|
|
@ -1,4 +1,4 @@
|
|||
package io.izzel.arclight.common.bridge.world.storage;
|
||||
package io.izzel.arclight.common.bridge.core.world.storage;
|
||||
|
||||
import net.minecraft.world.level.saveddata.maps.MapItemSavedData;
|
||||
import org.bukkit.craftbukkit.v.map.CraftMapView;
|
|
@ -1,4 +1,4 @@
|
|||
package io.izzel.arclight.common.bridge.world.storage;
|
||||
package io.izzel.arclight.common.bridge.core.world.storage;
|
||||
|
||||
import java.io.File;
|
||||
import net.minecraft.nbt.CompoundTag;
|
|
@ -1,4 +1,4 @@
|
|||
package io.izzel.arclight.common.bridge.world.storage;
|
||||
package io.izzel.arclight.common.bridge.core.world.storage;
|
||||
|
||||
import java.io.IOException;
|
||||
import net.minecraft.resources.ResourceKey;
|
|
@ -1,4 +1,4 @@
|
|||
package io.izzel.arclight.common.bridge.world.storage;
|
||||
package io.izzel.arclight.common.bridge.core.world.storage;
|
||||
|
||||
import com.mojang.serialization.Lifecycle;
|
||||
import net.minecraft.server.level.ServerLevel;
|
|
@ -1,4 +1,4 @@
|
|||
package io.izzel.arclight.common.bridge.world.storage.loot;
|
||||
package io.izzel.arclight.common.bridge.core.world.storage.loot;
|
||||
|
||||
import net.minecraft.world.Container;
|
||||
import net.minecraft.world.level.storage.loot.LootContext;
|
|
@ -1,8 +0,0 @@
|
|||
package io.izzel.arclight.common.bridge.entity.monster;
|
||||
|
||||
import io.izzel.arclight.common.bridge.entity.MobEntityBridge;
|
||||
|
||||
public interface CreeperEntityBridge extends MobEntityBridge {
|
||||
|
||||
void bridge$setPowered(boolean power);
|
||||
}
|
|
@ -1,8 +0,0 @@
|
|||
package io.izzel.arclight.common.bridge.entity.projectile;
|
||||
|
||||
import io.izzel.arclight.common.bridge.entity.EntityBridge;
|
||||
|
||||
public interface DamagingProjectileEntityBridge extends EntityBridge {
|
||||
|
||||
void bridge$setBukkitYield(float yield);
|
||||
}
|
|
@ -1,4 +1,4 @@
|
|||
package io.izzel.arclight.impl.bridge;
|
||||
package io.izzel.arclight.common.bridge.optimization;
|
||||
|
||||
public interface EntityBridge_ActivationRange {
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
package io.izzel.arclight.common.mixin.bukkit;
|
||||
|
||||
import com.google.common.base.Function;
|
||||
import io.izzel.arclight.common.bridge.entity.EntityBridge;
|
||||
import io.izzel.arclight.common.bridge.core.entity.EntityBridge;
|
||||
import io.izzel.arclight.common.mod.ArclightMod;
|
||||
import io.izzel.arclight.common.mod.util.ArclightCaptures;
|
||||
import org.bukkit.Bukkit;
|
||||
|
|
|
@ -2,7 +2,7 @@ package io.izzel.arclight.common.mixin.bukkit;
|
|||
|
||||
import io.izzel.arclight.common.bridge.bukkit.CraftItemStackBridge;
|
||||
import io.izzel.arclight.common.bridge.bukkit.ItemMetaBridge;
|
||||
import io.izzel.arclight.common.bridge.item.ItemStackBridge;
|
||||
import io.izzel.arclight.common.bridge.core.item.ItemStackBridge;
|
||||
import net.minecraft.nbt.CompoundTag;
|
||||
import net.minecraft.world.item.ItemStack;
|
||||
import org.bukkit.Material;
|
||||
|
|
|
@ -3,7 +3,7 @@ package io.izzel.arclight.common.mixin.bukkit;
|
|||
import com.mojang.brigadier.ParseResults;
|
||||
import com.mojang.brigadier.StringReader;
|
||||
import io.izzel.arclight.common.bridge.bukkit.CraftServerBridge;
|
||||
import io.izzel.arclight.common.bridge.world.WorldBridge;
|
||||
import io.izzel.arclight.common.bridge.core.world.WorldBridge;
|
||||
import io.izzel.arclight.common.mod.server.ArclightServer;
|
||||
import jline.console.ConsoleReader;
|
||||
import net.minecraft.commands.CommandSourceStack;
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
package io.izzel.arclight.common.mixin.bukkit;
|
||||
|
||||
import io.izzel.arclight.common.bridge.bukkit.EntityTypeBridge;
|
||||
import io.izzel.arclight.common.bridge.world.server.ServerWorldBridge;
|
||||
import io.izzel.arclight.common.bridge.core.world.server.ServerWorldBridge;
|
||||
import org.bukkit.Location;
|
||||
import org.bukkit.craftbukkit.v.CraftWorld;
|
||||
import org.bukkit.entity.Entity;
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
package io.izzel.arclight.common.mixin.bukkit;
|
||||
|
||||
import com.google.common.collect.ImmutableMap;
|
||||
import io.izzel.arclight.common.bridge.block.FireBlockBridge;
|
||||
import io.izzel.arclight.common.bridge.core.block.FireBlockBridge;
|
||||
import io.izzel.arclight.common.bridge.bukkit.MaterialBridge;
|
||||
import io.izzel.arclight.common.mod.ArclightMod;
|
||||
import io.izzel.arclight.common.mod.server.block.ArclightTileInventory;
|
||||
|
|
|
@ -1,7 +1,6 @@
|
|||
package io.izzel.arclight.common.mixin.bukkit;
|
||||
|
||||
import com.google.common.io.ByteStreams;
|
||||
import io.izzel.arclight.common.asm.SwitchTableFixer;
|
||||
import io.izzel.arclight.common.bridge.bukkit.JavaPluginLoaderBridge;
|
||||
import io.izzel.arclight.common.mod.util.remapper.ArclightRemapper;
|
||||
import io.izzel.arclight.common.mod.util.remapper.ClassLoaderRemapper;
|
||||
|
@ -75,7 +74,7 @@ public class PluginClassLoaderMixin extends URLClassLoader implements RemappingC
|
|||
byteSource = () -> {
|
||||
try (InputStream is = connection.getInputStream()) {
|
||||
byte[] classBytes = ByteStreams.toByteArray(is);
|
||||
classBytes = SwitchTableFixer.INSTANCE.processClass(classBytes);
|
||||
classBytes = ArclightRemapper.SWITCH_TABLE_FIXER.apply(classBytes);
|
||||
classBytes = Bukkit.getUnsafe().processClass(description, path, classBytes);
|
||||
return classBytes;
|
||||
}
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
package io.izzel.arclight.common.mixin.bukkit;
|
||||
|
||||
import io.izzel.arclight.common.bridge.item.crafting.IRecipeBridge;
|
||||
import io.izzel.arclight.common.bridge.core.item.crafting.IRecipeBridge;
|
||||
import org.bukkit.craftbukkit.v.inventory.RecipeIterator;
|
||||
import org.bukkit.inventory.Recipe;
|
||||
import org.spongepowered.asm.mixin.Final;
|
||||
|
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user