Skip to content

Commit d00ec62

Browse files
TropheusJTropheusJ
committed
first misc pass
1 parent fa1b460 commit d00ec62

File tree

369 files changed

+2078
-1333
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

369 files changed

+2078
-1333
lines changed

‎.idea/misc.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎build.gradle.kts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -101,10 +101,7 @@ dependencies {
101101
// dependencies
102102
modImplementation("net.fabricmc.fabric-api:fabric-api:$fapiVersion")
103103

104-
modRuntimeOnly(include("com.tterrag.registrate_fabric:Registrate:$registrateVersion")!!)
105-
modCompileOnly("com.tterrag.registrate_fabric:Registrate:$registrateVersion") {
106-
exclude(group = "io.github.fabricators_of_create.Porting-Lib")
107-
}
104+
modApi(include("com.tterrag.registrate_fabric:Registrate:$registrateVersion")!!)
108105

109106
modApi(include("com.electronwill.night-config:core:$nightConfigVersion")!!)
110107
modApi(include("com.electronwill.night-config:toml:$nightConfigVersion")!!)

‎scripts/convert.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ for file in $(find ../src/main/java -type f -name "*.java"); do
55
-e 's/@OnlyIn/@Environment/g' \
66
-e 's/Dist\.CLIENT/EnvType\.CLIENT/g' \
77
-e 's/EnvType\.DEDICATED_SERVER/EnvType\.SERVER/g' \
8-
-e 's/import net\.minecraftforge\.api\.distmarker\.OnlyIn;/import net\.fabricmc\.api\.Environment;/g' \
9-
-e 's/import net\.minecraftforge\.api\.distmarker\.Dist;/import net\.fabricmc\.api\.EnvType;/g' \
8+
-e 's/import net\.neoforged\.api\.distmarker\.OnlyIn;/import net\.fabricmc\.api\.Environment;/g' \
9+
-e 's/import net\.neoforged\.api\.distmarker\.Dist;/import net\.fabricmc\.api\.EnvType;/g' \
1010
$file
1111

1212
echo "Converted $file"

‎src/main/java/com/simibubi/create/AllCreativeModeTabs.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ public static void register() {
8686
// fabric: just load the class
8787
}
8888

89-
private static class RegistrateDisplayItemsGenerator implements DisplayItemsGenerator {
89+
public static class RegistrateDisplayItemsGenerator implements DisplayItemsGenerator {
9090
private static final Predicate<Item> IS_ITEM_3D_PREDICATE;
9191

9292
static {
@@ -114,7 +114,7 @@ public RegistrateDisplayItemsGenerator(boolean addItems, Supplier<TabInfo> tabFi
114114
this.tabFilter = tabFilter;
115115
}
116116

117-
private static Predicate<Item> makeExclusionPredicate() {
117+
public static Predicate<Item> makeExclusionPredicate() {
118118
Set<Item> exclusions = new ReferenceOpenHashSet<>();
119119

120120
List<ItemProviderEntry<?, ?>> simpleExclusions = List.of(

‎src/main/java/com/simibubi/create/AllRecipeTypes.java

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,6 @@
4949
import net.minecraft.world.item.crafting.SimpleCraftingRecipeSerializer;
5050
import net.minecraft.world.level.Level;
5151

52-
import io.github.fabricators_of_create.porting_lib.util.ShapedRecipeUtil;
53-
5452
public enum AllRecipeTypes implements IRecipeTypeInfo, StringRepresentable {
5553

5654
CONVERSION(ConversionRecipe::new),
@@ -83,7 +81,6 @@ public enum AllRecipeTypes implements IRecipeTypeInfo, StringRepresentable {
8381
private final RecipeSerializer<?> serializerObject;
8482
@Nullable
8583
private final RecipeType<?> typeObject;
86-
private final Supplier<RecipeType<?>> type;
8784

8885
private boolean isProcessingRecipe;
8986

@@ -92,27 +89,21 @@ public enum AllRecipeTypes implements IRecipeTypeInfo, StringRepresentable {
9289
AllRecipeTypes(Supplier<RecipeSerializer<?>> serializerSupplier, Supplier<RecipeType<?>> typeSupplier, boolean registerType) {
9390
String name = Lang.asId(name());
9491
id = Create.asResource(name);
95-
this.serializerSupplier = serializerSupplier;
9692
serializerObject = Registry.register(BuiltInRegistries.RECIPE_SERIALIZER, id, serializerSupplier.get());
9793
if (registerType) {
9894
typeObject = typeSupplier.get();
9995
Registry.register(BuiltInRegistries.RECIPE_TYPE, id, typeObject);
100-
type = typeSupplier;
10196
} else {
102-
typeObject = null;
103-
type = typeSupplier;
97+
typeObject = typeSupplier.get();
10498
}
10599
isProcessingRecipe = false;
106100
}
107101

108102
AllRecipeTypes(Supplier<RecipeSerializer<?>> serializerSupplier) {
109103
String name = Lang.asId(name());
110104
id = Create.asResource(name);
111-
this.serializerSupplier = serializerSupplier;
112105
serializerObject = Registry.register(BuiltInRegistries.RECIPE_SERIALIZER, id, serializerSupplier.get());
113-
typeObject = simpleType(id);
114-
Registry.register(BuiltInRegistries.RECIPE_TYPE, id, typeObject);
115-
type = () -> typeObject;
106+
typeObject = Registry.register(BuiltInRegistries.RECIPE_TYPE, id, createType(id));
116107
isProcessingRecipe = false;
117108
}
118109

@@ -141,7 +132,7 @@ public <T extends RecipeSerializer<?>> T getSerializer() {
141132
@SuppressWarnings("unchecked")
142133
@Override
143134
public <I extends RecipeInput, R extends Recipe<I>> RecipeType<R> getType() {
144-
return (RecipeType<R>) type.get();
135+
return (RecipeType<R>) this.typeObject;
145136
}
146137

147138
public <I extends RecipeInput, R extends Recipe<I>> Optional<RecipeHolder<R>> find(I inv, Level world) {
@@ -161,6 +152,16 @@ public static boolean shouldIgnoreInAutomation(RecipeHolder<?> recipe) {
161152
return id.toString();
162153
}
163154

155+
private static <T extends Recipe<?>> RecipeType<T> createType(ResourceLocation id) {
156+
String string = id.toString();
157+
return new RecipeType<T>() {
158+
@Override
159+
public String toString() {
160+
return string;
161+
}
162+
};
163+
}
164+
164165
public <T extends ProcessingRecipe<?>> MapCodec<T> processingCodec() {
165166
if (!isProcessingRecipe)
166167
throw new AssertionError("AllRecipeTypes#processingCodec called on " + name() + ", which is not a processing recipe");

‎src/main/java/com/simibubi/create/CreateClient.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@
5858
import net.fabricmc.api.ClientModInitializer;
5959
import net.fabricmc.fabric.api.client.rendering.v1.HudRenderCallback;
6060

61-
@Mod(value = Create.ID, dist = Dist.CLIENT)
6261
public class CreateClient implements ClientModInitializer {
6362

6463
public static final ModelSwapper MODEL_SWAPPER = new ModelSwapper();
@@ -119,7 +118,6 @@ public void onInitializeClient() {
119118
registerOverlays();
120119
ClientEvents.register();
121120
InputEvents.register();
122-
AllPackets.getChannel().initClientListener();
123121
RenderTypes.init();
124122
// ArmorTextureRegistry.register(AllArmorMaterials.COPPER, CopperArmorItem.TEXTURE);
125123
AllFluids.initRendering();

‎src/main/java/com/simibubi/create/api/behaviour/movement/MovementBehaviour.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
import net.fabricmc.fabric.api.transfer.v1.item.ItemVariant;
2424
import net.fabricmc.fabric.api.transfer.v1.transaction.Transaction;
2525

26-
import io.github.fabricators_of_create.porting_lib.transfer.TransferUtil;
26+
import com.simibubi.create.infrastructure.fabric.transfer.TransferUtil;
2727

2828
/**
2929
* MovementBehaviors, also known as Actors, provide behavior to blocks mounted on contraptions.
@@ -72,7 +72,7 @@ default boolean mustTickWhileDisabled() {
7272
default void dropItem(MovementContext context, ItemStack stack) {
7373
ItemStack remainder;
7474
if (AllConfigs.server().kinetics.moveItemsToStorage.get()) {
75-
try (Transaction t = TransferUtil.getTransaction()) {
75+
try (Transaction t = Transaction.openOuter()) {
7676
long inserted = context.contraption.getStorage().getAllItems().insert(ItemVariant.of(stack), stack.getCount(), t);
7777
remainder = stack.copy();
7878
remainder.shrink((int) inserted);

‎src/main/java/com/simibubi/create/api/behaviour/spouting/BlockSpoutingBehaviour.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package com.simibubi.create.api.behaviour.spouting;
22

3+
import com.simibubi.create.infrastructure.fabric.transfer.fluid.FluidStack;
4+
35
import org.jetbrains.annotations.Nullable;
46

57
import com.simibubi.create.api.registry.SimpleRegistry;
@@ -11,7 +13,6 @@
1113
import net.minecraft.world.level.block.entity.BlockEntity;
1214
import net.minecraft.world.level.block.entity.BlockEntityType;
1315
import net.minecraft.world.level.block.state.BlockState;
14-
import net.neoforged.neoforge.fluids.FluidStack;
1516

1617
/**
1718
* Interface for custom block-filling behavior for spouts.

‎src/main/java/com/simibubi/create/api/behaviour/spouting/CauldronSpoutingBehavior.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
import net.minecraft.world.level.material.Fluid;
1313
import net.minecraft.world.level.material.Fluids;
1414

15-
import io.github.fabricators_of_create.porting_lib.fluids.FluidStack;
15+
import com.simibubi.create.infrastructure.fabric.transfer.fluid.FluidStack;
1616

1717
/**
1818
* {@link BlockSpoutingBehaviour} for empty cauldrons. Mods can register their fluids

‎src/main/java/com/simibubi/create/api/behaviour/spouting/StateChangingBehavior.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
import net.minecraft.world.level.block.state.properties.IntegerProperty;
1313
import net.minecraft.world.level.material.Fluid;
1414

15-
import io.github.fabricators_of_create.porting_lib.fluids.FluidStack;
15+
import com.simibubi.create.infrastructure.fabric.transfer.fluid.FluidStack;
1616

1717
/**
1818
* An implementation of {@link BlockSpoutingBehaviour} that allows for easily modifying a BlockState through spouting.

‎src/main/java/com/simibubi/create/api/connectivity/ConnectivityHandler.java

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
1111

1212
import javax.annotation.Nullable;
1313

14+
import com.simibubi.create.infrastructure.fabric.transfer.TransferUtil;
15+
1416
import org.apache.commons.lang3.tuple.Pair;
1517

1618
import com.simibubi.create.content.fluids.tank.CreativeFluidTankBlockEntity;
@@ -24,9 +26,8 @@
2426
import net.minecraft.world.level.block.entity.BlockEntity;
2527
import net.minecraft.world.level.block.entity.BlockEntityType;
2628

27-
import io.github.fabricators_of_create.porting_lib.fluids.FluidStack;
28-
import io.github.fabricators_of_create.porting_lib.transfer.TransferUtil;
29-
import io.github.fabricators_of_create.porting_lib.transfer.fluid.FluidTank;
29+
import com.simibubi.create.infrastructure.fabric.transfer.fluid.FluidStack;
30+
import com.simibubi.create.infrastructure.fabric.transfer.fluid.FluidTank;
3031

3132
public class ConnectivityHandler {
3233

@@ -257,10 +258,10 @@ private static <T extends BlockEntity & IMultiBlockEntityContainer> int tryToFor
257258
}
258259
if (be instanceof IMultiBlockEntityContainer.Fluid ifluidBE && ifluidBE.hasTank()
259260
&& beTank != null) {
260-
TransferUtil.insertFluid(beTank, fluidAt);
261+
TransferUtil.insert(beTank, fluidAt);
261262
}
262263
}
263-
TransferUtil.clearStorage(tankAt);
264+
TransferUtil.clear(tankAt);
264265
}
265266

266267
splitMultiAndInvalidate(part, cache, false);
@@ -347,7 +348,7 @@ private static <T extends BlockEntity & IMultiBlockEntityContainer> void splitMu
347348
copy.setAmount(split);
348349
toDistribute.shrink(split);
349350
if (tank != null)
350-
TransferUtil.insertFluid(tank, copy);
351+
TransferUtil.insert(tank, copy);
351352
}
352353
}
353354
if (tryReconnect) {

‎src/main/java/com/simibubi/create/api/contraption/storage/item/MountedItemStorage.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
import net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate.StructureBlockInfo;
3232
import net.minecraft.world.phys.Vec3;
3333

34-
import io.github.fabricators_of_create.porting_lib.transfer.item.SlottedStackStorage;
34+
import com.simibubi.create.infrastructure.fabric.transfer.item.SlottedStackStorage;
3535

3636
public abstract class MountedItemStorage implements SlottedStackStorage {
3737
public static final Codec<MountedItemStorage> CODEC = MountedItemStorageType.CODEC.dispatch(

‎src/main/java/com/simibubi/create/api/contraption/storage/item/WrapperMountedItemStorage.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
import net.fabricmc.fabric.api.transfer.v1.storage.base.SingleSlotStorage;
1414
import net.fabricmc.fabric.api.transfer.v1.transaction.TransactionContext;
1515

16-
import io.github.fabricators_of_create.porting_lib.transfer.TransferUtil;
17-
import io.github.fabricators_of_create.porting_lib.transfer.item.ItemStackHandler;
18-
import io.github.fabricators_of_create.porting_lib.transfer.item.SlottedStackStorage;
16+
import com.simibubi.create.infrastructure.fabric.transfer.TransferUtil;
17+
import com.simibubi.create.infrastructure.fabric.transfer.item.ItemStackHandler;
18+
import com.simibubi.create.infrastructure.fabric.transfer.item.SlottedStackStorage;
1919

2020
/**
2121
* Partial implementation of a MountedItemStorage that wraps an item handler.

‎src/main/java/com/simibubi/create/api/contraption/storage/item/chest/ChestMountedStorage.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@
2929
import net.fabricmc.fabric.api.transfer.v1.item.ItemVariant;
3030
import net.fabricmc.fabric.api.transfer.v1.storage.SlottedStorage;
3131

32-
import io.github.fabricators_of_create.porting_lib.transfer.item.ItemStackHandler;
33-
import io.github.fabricators_of_create.porting_lib.transfer.item.SlottedStackStorage;
32+
import com.simibubi.create.infrastructure.fabric.transfer.item.ItemStackHandler;
33+
import com.simibubi.create.infrastructure.fabric.transfer.item.SlottedStackStorage;
3434

3535
/**
3636
* Mounted storage that handles opening a combined GUI for double chests.

‎src/main/java/com/simibubi/create/api/contraption/storage/item/chest/ChestMountedStorageType.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,6 @@
1515
import net.fabricmc.fabric.api.transfer.v1.item.ItemVariant;
1616
import net.fabricmc.fabric.api.transfer.v1.storage.SlottedStorage;
1717

18-
import net.neoforged.neoforge.items.IItemHandler;
19-
import net.neoforged.neoforge.items.wrapper.InvWrapper;
20-
2118
public class ChestMountedStorageType extends SimpleMountedStorageType<ChestMountedStorage> {
2219
public ChestMountedStorageType() {
2320
super(ChestMountedStorage.CODEC);

‎src/main/java/com/simibubi/create/api/contraption/storage/item/menu/MountedStorageMenus.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
import net.minecraft.world.inventory.MenuConstructor;
1717
import net.minecraft.world.inventory.MenuType;
1818

19-
import io.github.fabricators_of_create.porting_lib.transfer.item.SlottedStackStorage;
19+
import com.simibubi.create.infrastructure.fabric.transfer.item.SlottedStackStorage;
2020

2121
/**
2222
* Methods for creating generic menus usable by mounted storages.

‎src/main/java/com/simibubi/create/api/contraption/storage/item/menu/StorageInteractionWrapper.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
import net.fabricmc.fabric.api.transfer.v1.item.ItemVariant;
1111

12-
import io.github.fabricators_of_create.porting_lib.transfer.item.SlottedStackStorage;
12+
import com.simibubi.create.infrastructure.fabric.transfer.item.SlottedStackStorage;
1313

1414
public class StorageInteractionWrapper implements Container {
1515
private final SlottedStackStorage storage;

‎src/main/java/com/simibubi/create/api/contraption/storage/item/simple/SimpleMountedStorage.java

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,17 @@
22

33
import java.util.function.Function;
44

5+
import com.mojang.serialization.MapCodec;
6+
7+
import com.simibubi.create.foundation.codec.CreateCodecs;
8+
59
import org.jetbrains.annotations.Nullable;
610

711
import com.mojang.serialization.Codec;
812
import com.simibubi.create.AllMountedStorageTypes;
913
import com.simibubi.create.AllTags;
1014
import com.simibubi.create.api.contraption.storage.item.MountedItemStorageType;
1115
import com.simibubi.create.api.contraption.storage.item.WrapperMountedItemStorage;
12-
import com.simibubi.create.foundation.utility.CreateCodecs;
1316

1417
import net.minecraft.core.BlockPos;
1518
import net.minecraft.world.item.ItemStack;
@@ -24,7 +27,7 @@
2427
import net.fabricmc.fabric.api.transfer.v1.storage.base.SingleSlotStorage;
2528
import net.fabricmc.fabric.api.transfer.v1.transaction.Transaction;
2629

27-
import io.github.fabricators_of_create.porting_lib.transfer.item.ItemStackHandler;
30+
import com.simibubi.create.infrastructure.fabric.transfer.item.ItemStackHandler;
2831

2932
/**
3033
* Widely-applicable mounted storage implementation.
@@ -82,7 +85,7 @@ protected boolean validate(SlottedStorage<ItemVariant> storage) {
8285
return this.getSlotCount() == storage.getSlotCount();
8386
}
8487

85-
public static <T extends SimpleMountedStorage> Codec<T> codec(Function<ItemStackHandler, T> factory) {
88+
public static <T extends SimpleMountedStorage> MapCodec<T> codec(Function<ItemStackHandler, T> factory) {
8689
return CreateCodecs.ITEM_STACK_HANDLER.xmap(factory, storage -> storage.wrapped).fieldOf("value");
8790
}
8891
}

‎src/main/java/com/simibubi/create/api/contraption/train/PortalTrackProvider.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,6 @@
1313
import net.minecraft.world.level.block.Block;
1414
import net.minecraft.world.level.block.Portal;
1515
import net.minecraft.world.level.block.state.BlockState;
16-
import net.minecraft.world.level.portal.PortalInfo;
17-
18-
import io.github.fabricators_of_create.porting_lib.entity.ITeleporter;
1916

2017
/**
2118
* A provider for portal track connections.

‎src/main/java/com/simibubi/create/api/effect/OpenPipeEffectHandler.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import net.minecraft.world.level.material.Fluid;
77
import net.minecraft.world.phys.AABB;
88

9-
import io.github.fabricators_of_create.porting_lib.fluids.FluidStack;
9+
import com.simibubi.create.infrastructure.fabric.transfer.fluid.FluidStack;
1010

1111
/**
1212
* Interface for custom behavior for fluids spilling out of open pipes. Examples:

0 commit comments

Comments
 (0)