Fix package restrictions and invalid @Unique
This commit is contained in:
@@ -12,7 +12,7 @@
|
||||
//
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
package net.gensokyoreimagined.nitori.core.access;
|
||||
package net.gensokyoreimagined.nitori.access;
|
||||
|
||||
import com.destroystokyo.paper.util.maplist.EntityList;
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
//
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
package net.gensokyoreimagined.nitori.core.access;
|
||||
package net.gensokyoreimagined.nitori.access;
|
||||
|
||||
public interface IMixinChunkMapAccess {
|
||||
void gensouHacks$runOnTrackerMainThread(final Runnable runnable);
|
||||
@@ -12,7 +12,7 @@
|
||||
//
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
package net.gensokyoreimagined.nitori.core.access;
|
||||
package net.gensokyoreimagined.nitori.access;
|
||||
|
||||
import com.destroystokyo.paper.util.misc.PooledLinkedHashSets;
|
||||
import net.minecraft.server.level.ServerPlayer;
|
||||
@@ -12,7 +12,7 @@
|
||||
//
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
package net.gensokyoreimagined.nitori.core.access;
|
||||
package net.gensokyoreimagined.nitori.access;
|
||||
|
||||
public interface IMixinIteratorSafeOrderedReferenceSetAccess {
|
||||
@SuppressWarnings("EmptyMethod")
|
||||
@@ -20,8 +20,8 @@ import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
|
||||
import it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet;
|
||||
import it.unimi.dsi.fastutil.objects.ReferenceSets;
|
||||
//import net.gensokyoreimagined.nitori.plugins.NitoriConfig;
|
||||
import net.gensokyoreimagined.nitori.core.access.IMixinChunkMapAccess;
|
||||
import net.gensokyoreimagined.nitori.core.access.IMixinChunkMap_TrackedEntityAccess;
|
||||
import net.gensokyoreimagined.nitori.access.IMixinChunkMapAccess;
|
||||
import net.gensokyoreimagined.nitori.access.IMixinChunkMap_TrackedEntityAccess;
|
||||
import net.gensokyoreimagined.nitori.tracker.MultithreadedTracker;
|
||||
import net.minecraft.server.level.ChunkMap;
|
||||
import net.minecraft.server.level.ServerLevel;
|
||||
|
||||
@@ -16,7 +16,7 @@ package net.gensokyoreimagined.nitori.core;
|
||||
|
||||
import com.destroystokyo.paper.util.maplist.EntityList;
|
||||
import io.papermc.paper.world.ChunkEntitySlices;
|
||||
import net.gensokyoreimagined.nitori.core.access.IMixinChunkEntitySlicesAccess;
|
||||
import net.gensokyoreimagined.nitori.access.IMixinChunkEntitySlicesAccess;
|
||||
import org.spongepowered.asm.mixin.Final;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.gen.Accessor;
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
package net.gensokyoreimagined.nitori.core;
|
||||
|
||||
import io.papermc.paper.util.maplist.IteratorSafeOrderedReferenceSet;
|
||||
import net.gensokyoreimagined.nitori.core.access.IMixinIteratorSafeOrderedReferenceSetAccess;
|
||||
import net.gensokyoreimagined.nitori.access.IMixinIteratorSafeOrderedReferenceSetAccess;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.Unique;
|
||||
import org.spongepowered.asm.mixin.gen.Accessor;
|
||||
@@ -25,7 +25,6 @@ public abstract class MixinIteratorSafeOrderedReferenceSet implements IMixinIter
|
||||
// Implementation of 0107-Multithreaded-Tracker.patch
|
||||
// @Accessor happens to do exactly what is needed, making for nice shorthand
|
||||
@Override
|
||||
@Unique
|
||||
@Accessor
|
||||
public abstract int getListSize(); // Mirai - expose listSize
|
||||
}
|
||||
|
||||
@@ -16,7 +16,7 @@ package net.gensokyoreimagined.nitori.core;
|
||||
|
||||
import com.google.common.collect.Lists;
|
||||
import com.llamalad7.mixinextras.sugar.Local;
|
||||
import net.gensokyoreimagined.nitori.core.access.IMixinChunkMapAccess;
|
||||
import net.gensokyoreimagined.nitori.access.IMixinChunkMapAccess;
|
||||
import net.minecraft.network.protocol.Packet;
|
||||
import net.minecraft.network.protocol.game.ClientGamePacketListener;
|
||||
import net.minecraft.network.protocol.game.ClientboundBundlePacket;
|
||||
|
||||
@@ -21,9 +21,9 @@ package net.gensokyoreimagined.nitori.tracker;
|
||||
import com.google.common.util.concurrent.ThreadFactoryBuilder;
|
||||
import io.papermc.paper.util.maplist.IteratorSafeOrderedReferenceSet;
|
||||
import io.papermc.paper.world.ChunkEntitySlices;
|
||||
import net.gensokyoreimagined.nitori.core.access.IMixinChunkEntitySlicesAccess;
|
||||
import net.gensokyoreimagined.nitori.core.access.IMixinChunkMap_TrackedEntityAccess;
|
||||
import net.gensokyoreimagined.nitori.core.access.IMixinIteratorSafeOrderedReferenceSetAccess;
|
||||
import net.gensokyoreimagined.nitori.access.IMixinChunkEntitySlicesAccess;
|
||||
import net.gensokyoreimagined.nitori.access.IMixinChunkMap_TrackedEntityAccess;
|
||||
import net.gensokyoreimagined.nitori.access.IMixinIteratorSafeOrderedReferenceSetAccess;
|
||||
import net.minecraft.server.MinecraftServer;
|
||||
import net.minecraft.server.level.ChunkMap;
|
||||
import net.minecraft.world.entity.Entity;
|
||||
|
||||
Reference in New Issue
Block a user