mirrors/Create
0
0
Fork 0
mirror of https://github.com/Creators-of-Create/Create.git synced 2025-03-04 06:44:40 +01:00
Code Issues Projects Releases Packages Wiki Activity

some cleanup

Browse source
This commit is contained in:
TropheusJ 2025-01-24 06:30:20 -05:00
parent d7ad529a7d
commit beaeedb157
14 changed files with 23 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/com/simibubi/create/Create.java
View file

@ -2,8 +2,6 @@ package com.simibubi.create;
import java.util.Random;
import com.simibubi.create.impl.contraption.storage.MountedStorageTypeRegistryImpl;
import org.slf4j.Logger;
import com.google.gson.Gson;

2
src/main/java/com/simibubi/create/api/contraption/storage/MountedStorageTypeRegistry.java
View file

@ -3,9 +3,7 @@ package com.simibubi.create.api.contraption.storage;
import com.simibubi.create.Create;
import com.simibubi.create.api.contraption.storage.item.MountedItemStorageType;
import com.simibubi.create.api.lookup.BlockLookup;
import com.simibubi.create.impl.contraption.storage.MountedStorageTypeRegistryImpl;
import com.tterrag.registrate.builders.BlockBuilder;
import com.tterrag.registrate.util.entry.RegistryEntry;
import com.tterrag.registrate.util.nullness.NonNullUnaryOperator;

9
src/main/java/com/simibubi/create/api/contraption/storage/item/MountedItemStorage.java
View file

@ -5,20 +5,16 @@ import java.util.OptionalInt;
import java.util.function.Consumer;
import java.util.function.Predicate;
import com.mojang.serialization.Codec;
import org.jetbrains.annotations.Nullable;
import com.mojang.serialization.Codec;
import com.simibubi.create.api.contraption.storage.item.menu.MountedStorageMenus;
import com.simibubi.create.content.contraptions.Contraption;
import com.simibubi.create.content.contraptions.MountedStorageManager;
import com.simibubi.create.content.contraptions.behaviour.MovementBehaviour;
import com.simibubi.create.content.contraptions.behaviour.MovementContext;
import com.simibubi.create.foundation.utility.CreateLang;
import net.minecraftforge.items.IItemHandlerModifiable;
import org.jetbrains.annotations.Nullable;
import net.minecraft.core.BlockPos;
import net.minecraft.network.chat.Component;
import net.minecraft.network.chat.MutableComponent;
@ -31,6 +27,7 @@ import net.minecraft.world.level.block.entity.BlockEntity;
import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate.StructureBlockInfo;
import net.minecraft.world.phys.Vec3;
import net.minecraftforge.items.IItemHandlerModifiable;
public abstract class MountedItemStorage implements IItemHandlerModifiable {
public static final Codec<MountedItemStorage> CODEC = MountedItemStorageType.CODEC.dispatch(

7
src/main/java/com/simibubi/create/api/contraption/storage/item/MountedItemStorageType.java
View file

@ -1,11 +1,10 @@
package com.simibubi.create.api.contraption.storage.item;
import com.mojang.serialization.Codec;
import com.simibubi.create.api.contraption.storage.MountedStorageTypeRegistry;
import org.jetbrains.annotations.Nullable;
import com.mojang.serialization.Codec;
import com.simibubi.create.api.contraption.storage.MountedStorageTypeRegistry;
import net.minecraft.core.BlockPos;
import net.minecraft.util.ExtraCodecs;
import net.minecraft.world.level.Level;

8
src/main/java/com/simibubi/create/api/contraption/storage/item/WrapperMountedItemStorage.java
View file

@ -1,13 +1,11 @@
package com.simibubi.create.api.contraption.storage.item;
import net.minecraftforge.items.IItemHandler;
import net.minecraftforge.items.IItemHandlerModifiable;
import net.minecraftforge.items.ItemStackHandler;
import org.jetbrains.annotations.NotNull;
import net.minecraft.world.item.ItemStack;
import net.minecraftforge.items.IItemHandler;
import net.minecraftforge.items.IItemHandlerModifiable;
import net.minecraftforge.items.ItemStackHandler;
public abstract class WrapperMountedItemStorage<T extends IItemHandlerModifiable> extends MountedItemStorage {
protected final T wrapped;

1
src/main/java/com/simibubi/create/api/lookup/BlockLookup.java
View file

@ -55,6 +55,7 @@ public interface BlockLookup<T> {
return lookup;
}
@FunctionalInterface
interface Provider<T> {
@Nullable
T get(Block block);

3
src/main/java/com/simibubi/create/content/equipment/toolbox/ToolboxInventory.java
View file

@ -2,7 +2,6 @@ package com.simibubi.create.content.equipment.toolbox;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.function.Consumer;
import javax.annotation.Nonnull;
@ -10,9 +9,7 @@ import javax.annotation.Nonnull;
import com.mojang.serialization.Codec;
import com.mojang.serialization.codecs.RecordCodecBuilder;
import com.simibubi.create.AllItems;
import com.simibubi.create.foundation.item.ItemSlots;
import com.simibubi.create.foundation.utility.CreateCodecs;
import net.createmod.catnip.utility.NBTHelper;
import net.minecraft.nbt.CompoundTag;

6
src/main/java/com/simibubi/create/content/equipment/toolbox/ToolboxMountedStorage.java
View file

@ -1,16 +1,14 @@
package com.simibubi.create.content.equipment.toolbox;
import org.jetbrains.annotations.Nullable;
import com.mojang.serialization.Codec;
import com.simibubi.create.AllMountedStorageTypes;
import com.simibubi.create.api.contraption.storage.item.MountedItemStorageType;
import com.simibubi.create.api.contraption.storage.item.WrapperMountedItemStorage;
import com.simibubi.create.content.contraptions.Contraption;
import com.simibubi.create.foundation.item.ItemHelper;
import org.jetbrains.annotations.Nullable;
import net.minecraft.core.BlockPos;
import net.minecraft.world.entity.player.Player;
import net.minecraft.world.item.ItemStack;

9
src/main/java/com/simibubi/create/content/logistics/vault/ItemVaultMountedStorage.java
View file

@ -1,21 +1,18 @@
package com.simibubi.create.content.logistics.vault;
import org.jetbrains.annotations.Nullable;
import com.mojang.serialization.Codec;
import com.simibubi.create.AllMountedStorageTypes;
import com.simibubi.create.api.contraption.storage.item.MountedItemStorageType;
import com.simibubi.create.api.contraption.storage.item.WrapperMountedItemStorage;
import com.simibubi.create.foundation.utility.CreateCodecs;
import net.minecraftforge.items.ItemStackHandler;
import org.jetbrains.annotations.Nullable;
import net.minecraft.core.BlockPos;
import net.minecraft.world.level.Level;
import net.minecraft.world.level.block.entity.BlockEntity;
import net.minecraft.world.level.block.state.BlockState;
import net.minecraftforge.items.ItemStackHandler;
public class ItemVaultMountedStorage extends WrapperMountedItemStorage<ItemStackHandler> {
public static final Codec<ItemVaultMountedStorage> CODEC = CreateCodecs.ITEM_STACK_HANDLER.xmap(

3
src/main/java/com/simibubi/create/foundation/data/BuilderTransformers.java
View file

@ -20,8 +20,6 @@ import com.simibubi.create.AllBlocks;
import com.simibubi.create.AllTags.AllBlockTags;
import com.simibubi.create.AllTags.AllItemTags;
import com.simibubi.create.Create;
import com.simibubi.create.api.contraption.storage.MountedStorageTypeRegistry;
import com.simibubi.create.api.contraption.storage.item.MountedItemStorageType;
import com.simibubi.create.content.contraptions.behaviour.DoorMovingInteraction;
import com.simibubi.create.content.contraptions.behaviour.TrapdoorMovingInteraction;
import com.simibubi.create.content.contraptions.piston.MechanicalPistonGenerator;
@ -93,7 +91,6 @@ import net.minecraft.world.level.storage.loot.providers.number.ConstantValue;
import net.minecraftforge.client.model.generators.ConfiguredModel;
import net.minecraftforge.client.model.generators.ModelFile;
import net.minecraftforge.common.Tags;
import net.minecraftforge.registries.RegistryObject;
public class BuilderTransformers {

3
src/main/java/com/simibubi/create/foundation/item/ItemSlots.java
View file

@ -5,9 +5,7 @@ import java.util.Map;
import java.util.function.IntFunction;
import com.mojang.serialization.Codec;
import com.mojang.serialization.DataResult;
import com.mojang.serialization.codecs.RecordCodecBuilder;
import com.simibubi.create.foundation.utility.CreateCodecs;
@ -107,6 +105,7 @@ public class ItemSlots {
return slots;
}
@FunctionalInterface
public interface SlotConsumer {
void accept(int slot, ItemStack stack);
}

1
src/main/java/com/simibubi/create/foundation/utility/CreateCodecs.java
View file

@ -1,7 +1,6 @@
package com.simibubi.create.foundation.utility;
import com.mojang.serialization.Codec;
import com.mojang.serialization.DataResult;
import com.simibubi.create.foundation.item.ItemSlots;

3
src/main/java/com/simibubi/create/impl/contraption/storage/FallbackMountedStorageType.java
View file

@ -5,6 +5,9 @@ import com.simibubi.create.api.contraption.storage.item.simple.SimpleMountedStor
import net.minecraftforge.items.IItemHandler;
import net.minecraft.world.level.block.entity.BlockEntity;
import org.jetbrains.annotations.ApiStatus;
@ApiStatus.Internal
public class FallbackMountedStorageType extends SimpleMountedStorageType<FallbackMountedStorage> {
public FallbackMountedStorageType() {
super(FallbackMountedStorage.CODEC);

6
src/main/java/com/simibubi/create/impl/contraption/storage/MountedStorageTypeRegistryImpl.java
View file

@ -2,20 +2,22 @@ package com.simibubi.create.impl.contraption.storage;
import java.util.Objects;
import org.jetbrains.annotations.ApiStatus;
import com.simibubi.create.AllMountedStorageTypes;
import com.simibubi.create.AllTags;
import com.simibubi.create.api.contraption.storage.MountedStorageTypeRegistry;
import com.simibubi.create.api.contraption.storage.item.MountedItemStorageType;
import com.simibubi.create.api.lookup.BlockLookup;
import net.minecraft.world.level.block.Block;
import net.minecraftforge.eventbus.api.SubscribeEvent;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.registries.IForgeRegistry;
import net.minecraftforge.registries.NewRegistryEvent;
import net.minecraftforge.registries.RegistryBuilder;
import net.minecraft.world.level.block.Block;
@ApiStatus.Internal
@Mod.EventBusSubscriber(bus = Mod.EventBusSubscriber.Bus.MOD)
public class MountedStorageTypeRegistryImpl {
public static final BlockLookup<MountedItemStorageType<?>> ITEM_LOOKUP = BlockLookup.create(MountedStorageTypeRegistryImpl::itemFallback);