refactor mixins

This commit is contained in:
dfsek 2022-06-16 16:17:12 -07:00
parent c96e908a1e
commit 01ba75a29b
36 changed files with 72 additions and 83 deletions

View File

@ -27,7 +27,8 @@ import com.dfsek.terra.api.world.chunk.generation.util.GeneratorWrapper;
import com.dfsek.terra.api.world.info.WorldProperties;
import com.dfsek.terra.fabric.config.PreLoadCompatibilityOptions;
import com.dfsek.terra.fabric.data.Codecs;
import com.dfsek.terra.fabric.entity.DelegateEntityHolder;
import com.dfsek.terra.fabric.mixin_ifaces.BiomeProviderHolder;
import com.dfsek.terra.fabric.mixin_ifaces.entity.DelegateEntityHolder;
import com.dfsek.terra.fabric.mixin.access.ChunkRegionAccessor;
import com.dfsek.terra.fabric.mixin.access.StructureAccessorAccessor;
import com.dfsek.terra.fabric.util.FabricAdapter;

View File

@ -1,8 +1,8 @@
package com.dfsek.terra.fabric.mixin.cache;
package com.dfsek.terra.fabric.mixin.implementations.cache;
import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
import com.dfsek.terra.api.world.chunk.Chunk;
import com.dfsek.terra.fabric.generation.BiomeProviderHolder;
import com.dfsek.terra.fabric.mixin_ifaces.BiomeProviderHolder;
import net.minecraft.server.world.ServerWorld;
import net.minecraft.world.ChunkRegion;

View File

@ -1,7 +1,7 @@
package com.dfsek.terra.fabric.mixin.cache;
package com.dfsek.terra.fabric.mixin.implementations.cache;
import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
import com.dfsek.terra.fabric.generation.BiomeProviderHolder;
import com.dfsek.terra.fabric.mixin_ifaces.BiomeProviderHolder;
import net.minecraft.world.chunk.ProtoChunk;
import org.spongepowered.asm.mixin.Implements;

View File

@ -1,6 +1,6 @@
package com.dfsek.terra.fabric.mixin.compat;
package com.dfsek.terra.fabric.mixin.implementations.compat;
import com.dfsek.terra.fabric.util.FloraFeatureHolder;
import com.dfsek.terra.fabric.mixin_ifaces.FloraFeatureHolder;
import net.minecraft.world.biome.GenerationSettings;
import net.minecraft.world.gen.feature.ConfiguredFeature;

View File

@ -1,16 +1,9 @@
package com.dfsek.terra.fabric.mixin.entity_holder;
package com.dfsek.terra.fabric.mixin.implementations.entity_holder;
import com.dfsek.terra.fabric.entity.DelegateEntity;
import com.dfsek.terra.fabric.entity.DelegateEntityHolder;
import com.dfsek.terra.fabric.mixin_ifaces.entity.DelegateEntity;
import com.dfsek.terra.fabric.mixin_ifaces.entity.DelegateEntityHolder;
import net.minecraft.util.math.ChunkPos;
import net.minecraft.util.registry.Registry;
import net.minecraft.world.HeightLimitView;
import net.minecraft.world.chunk.ChunkSection;
import net.minecraft.world.chunk.ProtoChunk;
import net.minecraft.world.chunk.UpgradeData;
import net.minecraft.world.gen.chunk.BlendingData;
import net.minecraft.world.tick.SimpleTickScheduler;
import org.spongepowered.asm.mixin.Implements;
import org.spongepowered.asm.mixin.Interface;
import org.spongepowered.asm.mixin.Mixin;

View File

@ -15,7 +15,7 @@
* along with Terra. If not, see <https://www.gnu.org/licenses/>.
*/
package com.dfsek.terra.fabric.mixin.implementations;
package com.dfsek.terra.fabric.mixin.implementations.terra;
import net.minecraft.world.biome.Biome;
import org.spongepowered.asm.mixin.Implements;

View File

@ -1,4 +1,4 @@
package com.dfsek.terra.fabric.mixin.implementations;
package com.dfsek.terra.fabric.mixin.implementations.terra;
import net.minecraft.block.Block;
import net.minecraft.block.BlockState;

View File

@ -15,7 +15,7 @@
* along with Terra. If not, see <https://www.gnu.org/licenses/>.
*/
package com.dfsek.terra.fabric.mixin.implementations.block;
package com.dfsek.terra.fabric.mixin.implementations.terra.block;
import net.minecraft.block.Block;
import net.minecraft.block.Blocks;

View File

@ -15,7 +15,7 @@
* along with Terra. If not, see <https://www.gnu.org/licenses/>.
*/
package com.dfsek.terra.fabric.mixin.implementations.block.entity;
package com.dfsek.terra.fabric.mixin.implementations.terra.block.entity;
import org.spongepowered.asm.mixin.Implements;
import org.spongepowered.asm.mixin.Interface;

View File

@ -15,7 +15,7 @@
* along with Terra. If not, see <https://www.gnu.org/licenses/>.
*/
package com.dfsek.terra.fabric.mixin.implementations.block.entity;
package com.dfsek.terra.fabric.mixin.implementations.terra.block.entity;
import net.minecraft.block.entity.LootableContainerBlockEntity;
import org.spongepowered.asm.mixin.Implements;

View File

@ -15,7 +15,7 @@
* along with Terra. If not, see <https://www.gnu.org/licenses/>.
*/
package com.dfsek.terra.fabric.mixin.implementations.block.entity;
package com.dfsek.terra.fabric.mixin.implementations.terra.block.entity;
import net.minecraft.block.BlockState;
import net.minecraft.block.entity.BlockEntity;

View File

@ -15,7 +15,7 @@
* along with Terra. If not, see <https://www.gnu.org/licenses/>.
*/
package com.dfsek.terra.fabric.mixin.implementations.block.entity;
package com.dfsek.terra.fabric.mixin.implementations.terra.block.entity;
import net.minecraft.block.entity.SignBlockEntity;
import net.minecraft.text.Text;

View File

@ -1,4 +1,4 @@
package com.dfsek.terra.fabric.mixin.implementations.block.state;
package com.dfsek.terra.fabric.mixin.implementations.terra.block.state;
import com.google.common.collect.ImmutableMap;

View File

@ -1,4 +1,4 @@
package com.dfsek.terra.fabric.mixin.implementations.block.state;
package com.dfsek.terra.fabric.mixin.implementations.terra.block.state;
import org.spongepowered.asm.mixin.Final;
import org.spongepowered.asm.mixin.Implements;

View File

@ -15,7 +15,7 @@
* along with Terra. If not, see <https://www.gnu.org/licenses/>.
*/
package com.dfsek.terra.fabric.mixin.implementations.chunk;
package com.dfsek.terra.fabric.mixin.implementations.terra.chunk;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.ChunkRegion;

View File

@ -15,7 +15,7 @@
* along with Terra. If not, see <https://www.gnu.org/licenses/>.
*/
package com.dfsek.terra.fabric.mixin.implementations.chunk;
package com.dfsek.terra.fabric.mixin.implementations.terra.chunk;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.chunk.WorldChunk;

View File

@ -15,12 +15,10 @@
* along with Terra. If not, see <https://www.gnu.org/licenses/>.
*/
package com.dfsek.terra.fabric.mixin.implementations.chunk.data;
package com.dfsek.terra.fabric.mixin.implementations.terra.chunk.data;
import com.dfsek.terra.api.block.state.BlockState;
import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
import com.dfsek.terra.api.world.chunk.generation.ProtoChunk;
import com.dfsek.terra.fabric.generation.BiomeProviderHolder;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.HeightLimitView;

View File

@ -15,18 +15,15 @@
* along with Terra. If not, see <https://www.gnu.org/licenses/>.
*/
package com.dfsek.terra.fabric.mixin.implementations.entity;
package com.dfsek.terra.fabric.mixin.implementations.terra.entity;
import net.minecraft.entity.Entity;
import net.minecraft.text.Text;
import net.minecraft.util.math.BlockPos;
import org.spongepowered.asm.mixin.Implements;
import org.spongepowered.asm.mixin.Interface;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow;
import java.util.UUID;
import com.dfsek.terra.api.util.vector.Vector3;
import com.dfsek.terra.api.world.ServerWorld;
import com.dfsek.terra.fabric.util.FabricAdapter;

View File

@ -15,7 +15,7 @@
* along with Terra. If not, see <https://www.gnu.org/licenses/>.
*/
package com.dfsek.terra.fabric.mixin.implementations.entity;
package com.dfsek.terra.fabric.mixin.implementations.terra.entity;
import net.minecraft.entity.EntityType;
import org.spongepowered.asm.mixin.Implements;

View File

@ -15,7 +15,7 @@
* along with Terra. If not, see <https://www.gnu.org/licenses/>.
*/
package com.dfsek.terra.fabric.mixin.implementations.entity;
package com.dfsek.terra.fabric.mixin.implementations.terra.entity;
import net.minecraft.entity.player.PlayerEntity;
import org.spongepowered.asm.mixin.Implements;

View File

@ -15,7 +15,7 @@
* along with Terra. If not, see <https://www.gnu.org/licenses/>.
*/
package com.dfsek.terra.fabric.mixin.implementations.entity;
package com.dfsek.terra.fabric.mixin.implementations.terra.entity;
import com.mojang.brigadier.exceptions.CommandSyntaxException;
import net.minecraft.server.command.ServerCommandSource;

View File

@ -15,7 +15,7 @@
* along with Terra. If not, see <https://www.gnu.org/licenses/>.
*/
package com.dfsek.terra.fabric.mixin.implementations.inventory;
package com.dfsek.terra.fabric.mixin.implementations.terra.inventory;
import net.minecraft.block.entity.LockableContainerBlockEntity;
import net.minecraft.item.Items;

View File

@ -15,7 +15,7 @@
* along with Terra. If not, see <https://www.gnu.org/licenses/>.
*/
package com.dfsek.terra.fabric.mixin.implementations.inventory.item;
package com.dfsek.terra.fabric.mixin.implementations.terra.inventory.item;
import net.minecraft.item.Item;
import org.spongepowered.asm.mixin.Implements;

View File

@ -15,7 +15,7 @@
* along with Terra. If not, see <https://www.gnu.org/licenses/>.
*/
package com.dfsek.terra.fabric.mixin.implementations.inventory.item;
package com.dfsek.terra.fabric.mixin.implementations.terra.inventory.item;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NbtCompound;

View File

@ -15,7 +15,7 @@
* along with Terra. If not, see <https://www.gnu.org/licenses/>.
*/
package com.dfsek.terra.fabric.mixin.implementations.inventory.meta;
package com.dfsek.terra.fabric.mixin.implementations.terra.inventory.meta;
import net.minecraft.enchantment.Enchantment;
import net.minecraft.util.registry.Registry;

View File

@ -15,7 +15,7 @@
* along with Terra. If not, see <https://www.gnu.org/licenses/>.
*/
package com.dfsek.terra.fabric.mixin.implementations.inventory.meta;
package com.dfsek.terra.fabric.mixin.implementations.terra.inventory.meta;
import net.minecraft.item.ItemStack;
import org.spongepowered.asm.mixin.Implements;

View File

@ -15,7 +15,7 @@
* along with Terra. If not, see <https://www.gnu.org/licenses/>.
*/
package com.dfsek.terra.fabric.mixin.implementations.inventory.meta;
package com.dfsek.terra.fabric.mixin.implementations.terra.inventory.meta;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NbtCompound;

View File

@ -20,4 +20,4 @@
* interfaces in Minecraft classes.
*/
package com.dfsek.terra.fabric.mixin.implementations;
package com.dfsek.terra.fabric.mixin.implementations.terra;

View File

@ -15,7 +15,7 @@
* along with Terra. If not, see <https://www.gnu.org/licenses/>.
*/
package com.dfsek.terra.fabric.mixin.implementations.world;
package com.dfsek.terra.fabric.mixin.implementations.terra.world;
import com.dfsek.terra.api.block.entity.BlockEntity;
import com.dfsek.terra.api.block.state.BlockState;
@ -28,9 +28,9 @@ import com.dfsek.terra.api.world.ServerWorld;
import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
import com.dfsek.terra.api.world.chunk.generation.ChunkGenerator;
import com.dfsek.terra.api.world.chunk.generation.ProtoWorld;
import com.dfsek.terra.fabric.entity.DelegateEntity;
import com.dfsek.terra.fabric.entity.DelegateEntityHolder;
import com.dfsek.terra.fabric.generation.BiomeProviderHolder;
import com.dfsek.terra.fabric.mixin_ifaces.entity.DelegateEntity;
import com.dfsek.terra.fabric.mixin_ifaces.entity.DelegateEntityHolder;
import com.dfsek.terra.fabric.mixin_ifaces.BiomeProviderHolder;
import com.dfsek.terra.fabric.generation.FabricChunkGeneratorWrapper;
import com.dfsek.terra.fabric.generation.TerraBiomeSource;
import com.dfsek.terra.fabric.util.FabricUtil;
@ -49,7 +49,6 @@ import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import java.util.ArrayList;
import java.util.List;

View File

@ -15,7 +15,7 @@
* along with Terra. If not, see <https://www.gnu.org/licenses/>.
*/
package com.dfsek.terra.fabric.mixin.implementations.world;
package com.dfsek.terra.fabric.mixin.implementations.terra.world;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.WorldAccess;

View File

@ -1,4 +1,4 @@
package com.dfsek.terra.fabric.generation;
package com.dfsek.terra.fabric.mixin_ifaces;
import com.dfsek.terra.api.world.biome.generation.BiomeProvider;

View File

@ -1,4 +1,4 @@
package com.dfsek.terra.fabric.util;
package com.dfsek.terra.fabric.mixin_ifaces;
import net.minecraft.world.gen.feature.ConfiguredFeature;

View File

@ -1,4 +1,4 @@
package com.dfsek.terra.fabric.entity;
package com.dfsek.terra.fabric.mixin_ifaces.entity;
import com.dfsek.terra.api.entity.Entity;
import com.dfsek.terra.api.entity.EntityType;

View File

@ -1,4 +1,4 @@
package com.dfsek.terra.fabric.entity;
package com.dfsek.terra.fabric.mixin_ifaces.entity;
import java.util.List;

View File

@ -6,6 +6,7 @@ import com.dfsek.terra.fabric.FabricEntryPoint;
import com.dfsek.terra.fabric.config.PreLoadCompatibilityOptions;
import com.dfsek.terra.fabric.config.VanillaBiomeProperties;
import com.dfsek.terra.fabric.mixin_ifaces.FloraFeatureHolder;
import net.minecraft.util.Identifier;
import net.minecraft.util.registry.BuiltinRegistries;
import net.minecraft.util.registry.Registry;

View File

@ -8,35 +8,35 @@
"access.MobSpawnerLogicAccessor",
"access.StateAccessor",
"access.StructureAccessorAccessor",
"cache.ChunkRegionMixin",
"cache.ProtoChunkMixin",
"compat.GenerationSettingsFloraFeaturesMixin",
"entity_holder.ProtoChunkMixin",
"implementations.cache.ChunkRegionMixin",
"implementations.cache.ProtoChunkMixin",
"implementations.compat.GenerationSettingsFloraFeaturesMixin",
"implementations.entity_holder.ProtoChunkMixin",
"fix.NetherFossilOptimization",
"implementations.BiomeMixin",
"implementations.HandleImplementationMixin",
"implementations.block.BlockMixin",
"implementations.block.entity.BlockEntityMixin",
"implementations.block.entity.LootableContainerBlockEntityMixin",
"implementations.block.entity.MobSpawnerBlockEntityMixin",
"implementations.block.entity.SignBlockEntityMixin",
"implementations.block.state.BlockStateMixin",
"implementations.block.state.PropertyMixin",
"implementations.chunk.ChunkRegionMixin",
"implementations.chunk.WorldChunkMixin",
"implementations.chunk.data.ProtoChunkMixin",
"implementations.entity.EntityMixin",
"implementations.entity.EntityTypeMixin",
"implementations.entity.PlayerEntityMixin",
"implementations.entity.ServerCommandSourceMixin",
"implementations.inventory.LockableContainerBlockEntityMixin",
"implementations.inventory.item.ItemMixin",
"implementations.inventory.item.ItemStackMixin",
"implementations.inventory.meta.EnchantmentMixin",
"implementations.inventory.meta.ItemStackDamageableMixin",
"implementations.inventory.meta.ItemStackMetaMixin",
"implementations.world.ChunkRegionMixin",
"implementations.world.ServerWorldMixin",
"implementations.terra.BiomeMixin",
"implementations.terra.HandleImplementationMixin",
"implementations.terra.block.BlockMixin",
"implementations.terra.block.entity.BlockEntityMixin",
"implementations.terra.block.entity.LootableContainerBlockEntityMixin",
"implementations.terra.block.entity.MobSpawnerBlockEntityMixin",
"implementations.terra.block.entity.SignBlockEntityMixin",
"implementations.terra.block.state.BlockStateMixin",
"implementations.terra.block.state.PropertyMixin",
"implementations.terra.chunk.ChunkRegionMixin",
"implementations.terra.chunk.WorldChunkMixin",
"implementations.terra.chunk.data.ProtoChunkMixin",
"implementations.terra.entity.EntityMixin",
"implementations.terra.entity.EntityTypeMixin",
"implementations.terra.entity.PlayerEntityMixin",
"implementations.terra.entity.ServerCommandSourceMixin",
"implementations.terra.inventory.LockableContainerBlockEntityMixin",
"implementations.terra.inventory.item.ItemMixin",
"implementations.terra.inventory.item.ItemStackMixin",
"implementations.terra.inventory.meta.EnchantmentMixin",
"implementations.terra.inventory.meta.ItemStackDamageableMixin",
"implementations.terra.inventory.meta.ItemStackMetaMixin",
"implementations.terra.world.ChunkRegionMixin",
"implementations.terra.world.ServerWorldMixin",
"lifecycle.DataPackContentsMixin",
"lifecycle.MinecraftServerMixin",
"lifecycle.NoiseConfigMixin",