Skip to content

Commit 7f1f67b

Browse files
IThundxrIThundxr
committed
porty mcport
1 parent 483f997 commit 7f1f67b

File tree

16 files changed

+24
-46
lines changed

16 files changed

+24
-46
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.

‎scripts/setup_local_ponder.sh

100644100755
File mode changed.

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

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -84,18 +84,8 @@ public int getSlotLimit(int slot) {
8484
}
8585

8686
@Override
87-
public boolean isItemValid(int slot, ItemVariant resource, int count) {
88-
return this.wrapped.isItemValid(slot, resource, count);
89-
}
90-
91-
@Override
92-
public long insertSlot(int slot, ItemVariant resource, long maxAmount, TransactionContext transaction) {
93-
return this.wrapped.insertSlot(slot, resource, maxAmount, transaction);
94-
}
95-
96-
@Override
97-
public long extractSlot(int slot, ItemVariant resource, long maxAmount, TransactionContext transaction) {
98-
return this.wrapped.extractSlot(slot, resource, maxAmount, transaction);
87+
public boolean isItemValid(int slot, ItemStack stack) {
88+
return this.wrapped.isItemValid(slot, stack);
9989
}
10090

10191
@Override

‎src/main/java/com/simibubi/create/compat/trainmap/TrainMapEvents.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@
1616
import net.fabricmc.fabric.api.client.screen.v1.ScreenEvents;
1717
import net.fabricmc.fabric.api.client.screen.v1.ScreenMouseEvents;
1818

19-
import io.github.fabricators_of_create.porting_lib.event.client.PreRenderTooltipCallback;
20-
2119
public class TrainMapEvents {
2220

2321
public static void tick(Minecraft mc) {

‎src/main/java/com/simibubi/create/compat/trainmap/TrainMapSyncPacket.java

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,18 @@
66

77
import com.simibubi.create.AllPackets;
88
import com.simibubi.create.compat.trainmap.TrainMapSync.TrainMapSyncEntry;
9-
import net.createmod.catnip.net.base.ClientboundPacketPayload;
9+
10+
import net.fabricmc.api.EnvType;
11+
import net.fabricmc.api.Environment;
1012

1113
import net.createmod.catnip.codecs.stream.CatnipStreamCodecBuilders;
14+
import net.createmod.catnip.data.Pair;
15+
import net.createmod.catnip.net.base.ClientboundPacketPayload;
1216
import net.minecraft.client.player.LocalPlayer;
1317
import net.minecraft.core.UUIDUtil;
14-
import net.createmod.catnip.data.Pair;
1518
import net.minecraft.network.FriendlyByteBuf;
19+
import net.minecraft.network.codec.ByteBufCodecs;
20+
import net.minecraft.network.codec.StreamCodec;
1621

1722
public class TrainMapSyncPacket implements ClientboundPacketPayload {
1823
public static final StreamCodec<FriendlyByteBuf, TrainMapSyncPacket> STREAM_CODEC = StreamCodec.composite(

‎src/main/java/com/simibubi/create/content/decoration/steamWhistle/WhistleExtenderBlock.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ public InteractionResult onWrenched(BlockState state, UseOnContext context) {
9494
}
9595

9696
@Override
97-
public ItemStack getCloneItemStack(BlockGetter level, BlockPos pos, BlockState state) {
97+
public ItemStack getCloneItemStack(LevelReader level, BlockPos pos, BlockState state) {
9898
return AllBlocks.STEAM_WHISTLE.asStack();
9999
}
100100

‎src/main/java/com/simibubi/create/content/equipment/armor/TrimmableArmorModelGenerator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
import net.minecraft.world.item.Item;
1818

1919
import io.github.fabricators_of_create.porting_lib.models.generators.ModelBuilder;
20-
import io.github.fabricators_of_create.porting_lib.models.generators.item.ItemModelBuilder;
20+
import io.github.fabricators_of_create.porting_lib.models.generators.ItemModelBuilder;
2121

2222
public class TrimmableArmorModelGenerator {
2323
public static final VarHandle TEXTURES_HANDLE;

‎src/main/java/com/simibubi/create/content/equipment/wrench/WrenchItem.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22

33
import javax.annotation.Nonnull;
44

5+
import net.fabricmc.api.EnvType;
6+
import net.fabricmc.api.Environment;
7+
58
import net.minecraft.world.phys.EntityHitResult;
69

710
import org.jetbrains.annotations.Nullable;
@@ -24,7 +27,6 @@
2427
import net.minecraft.world.level.Level;
2528
import net.minecraft.world.level.block.Block;
2629
import net.minecraft.world.level.block.state.BlockState;
27-
import net.minecraft.world.phys.EntityHitResult;
2830

2931
public class WrenchItem extends Item {
3032

‎src/main/java/com/simibubi/create/content/equipment/zapper/ZapperInteractionHandler.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@
88
import com.simibubi.create.foundation.utility.BlockHelper;
99

1010
import net.minecraft.core.BlockPos;
11+
import net.minecraft.core.Direction;
1112
import net.minecraft.nbt.CompoundTag;
13+
import net.minecraft.world.InteractionHand;
1214
import net.minecraft.world.InteractionResult;
1315
import net.minecraft.world.entity.player.Player;
1416
import net.minecraft.world.item.ItemStack;

‎src/main/java/com/simibubi/create/content/equipment/zapper/ZapperItem.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,12 +47,6 @@
4747
import net.minecraft.world.phys.BlockHitResult;
4848
import net.minecraft.world.phys.Vec3;
4949

50-
import net.fabricmc.api.EnvType;
51-
import net.fabricmc.api.Environment;
52-
53-
import io.github.fabricators_of_create.porting_lib.item.EntitySwingListenerItem;
54-
import io.github.fabricators_of_create.porting_lib.item.ReequipAnimationItem;
55-
5650
public abstract class ZapperItem extends Item implements CustomArmPoseItem, EntitySwingListenerItem, ReequipAnimationItem {
5751

5852
public ZapperItem(Properties properties) {

‎src/main/java/com/simibubi/create/content/kinetics/crank/ValveHandleBlock.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@
88
import com.simibubi.create.AllShapes;
99
import com.simibubi.create.foundation.utility.BlockHelper;
1010

11-
import io.github.fabricators_of_create.porting_lib.util.TagUtil;
12-
1311
import net.minecraft.core.BlockPos;
1412
import net.minecraft.world.InteractionHand;
1513
import net.minecraft.world.InteractionResult;
@@ -25,8 +23,6 @@
2523
import net.minecraft.world.phys.shapes.CollisionContext;
2624
import net.minecraft.world.phys.shapes.VoxelShape;
2725

28-
import io.github.fabricators_of_create.porting_lib.util.TagUtil;
29-
3026
@ParametersAreNonnullByDefault
3127
public class ValveHandleBlock extends HandCrankBlock {
3228

‎src/main/java/com/simibubi/create/content/kinetics/waterwheel/WaterWheelBlock.java

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,8 @@
44
import com.simibubi.create.AllBlocks;
55
import com.simibubi.create.content.kinetics.base.DirectionalKineticBlock;
66
import com.simibubi.create.foundation.block.IBE;
7-
87
import com.simibubi.create.foundation.utility.AdventureUtil;
98

10-
import net.createmod.catnip.data.Couple;
119
import net.createmod.catnip.data.Iterate;
1210
import net.createmod.catnip.levelWrappers.WrappedLevel;
1311
import net.minecraft.core.BlockPos;
@@ -17,12 +15,10 @@
1715
import net.minecraft.server.level.ServerLevel;
1816
import net.minecraft.util.RandomSource;
1917
import net.minecraft.world.InteractionHand;
20-
import net.minecraft.world.InteractionResult;
2118
import net.minecraft.world.ItemInteractionResult;
2219
import net.minecraft.world.entity.player.Player;
2320
import net.minecraft.world.item.ItemStack;
2421
import net.minecraft.world.item.context.BlockPlaceContext;
25-
import net.minecraft.world.level.BlockGetter;
2622
import net.minecraft.world.level.Level;
2723
import net.minecraft.world.level.LevelAccessor;
2824
import net.minecraft.world.level.LevelReader;
@@ -54,8 +50,8 @@ public boolean canSurvive(BlockState state, LevelReader worldIn, BlockPos pos) {
5450

5551
@Override
5652
protected ItemInteractionResult useItemOn(ItemStack stack, BlockState state, Level level, BlockPos pos, Player player, InteractionHand hand, BlockHitResult hitResult) {
57-
if (AdventureUtil.isAdventure(pPlayer))
58-
return InteractionResult.PASS;
53+
if (AdventureUtil.isAdventure(player))
54+
return ItemInteractionResult.PASS_TO_DEFAULT_BLOCK_INTERACTION;
5955
return onBlockEntityUseItemOn(level, pos, wwt -> wwt.applyMaterialIfValid(stack));
6056
}
6157

‎src/main/java/com/simibubi/create/content/trains/observer/TrackObserverBlock.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@
1515
import net.minecraft.world.level.block.state.properties.BlockStateProperties;
1616
import net.minecraft.world.level.block.state.properties.BooleanProperty;
1717

18-
import io.github.fabricators_of_create.porting_lib.block.ConnectableRedstoneBlock;
19-
2018
public class TrackObserverBlock extends Block implements IBE<TrackObserverBlockEntity>, IWrenchable, ConnectableRedstoneBlock {
2119

2220
public static final BooleanProperty POWERED = BlockStateProperties.POWERED;

‎src/main/java/com/simibubi/create/content/trains/track/TrackBlockOutline.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
import com.simibubi.create.AllShapes;
1212
import com.simibubi.create.AllTags;
1313
import com.simibubi.create.foundation.utility.RaycastHelper;
14-
import com.simibubi.create.foundation.utility.fabric.ReachUtil;
1514

1615
import dev.engine_room.flywheel.lib.transform.TransformStack;
1716
import net.createmod.catnip.animation.AnimationTickHolder;

‎src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/inventory/VersionedInventoryWrapper.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,14 @@
66
import org.jetbrains.annotations.NotNull;
77
import org.jetbrains.annotations.Nullable;
88

9-
import com.simibubi.create.foundation.utility.fabric.ListeningStorageView;
109
import com.simibubi.create.infrastructure.fabric.ProcessingIterator;
10+
import com.simibubi.create.infrastructure.fabric.transfer.TransactionSuccessCallback;
1111

1212
import net.fabricmc.fabric.api.transfer.v1.item.ItemVariant;
1313
import net.fabricmc.fabric.api.transfer.v1.storage.Storage;
1414
import net.fabricmc.fabric.api.transfer.v1.storage.StorageView;
1515
import net.fabricmc.fabric.api.transfer.v1.transaction.TransactionContext;
1616

17-
import io.github.fabricators_of_create.porting_lib.transfer.callbacks.TransactionCallback;
18-
1917
public class VersionedInventoryWrapper implements Storage<ItemVariant> {
2018

2119
public static final AtomicInteger idGenerator = new AtomicInteger();

‎src/main/java/com/simibubi/create/foundation/data/WindowGen.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ public static BlockBuilder<WindowBlock, CreateRegistrate> windowBlock(String nam
127127
.pattern(" # ")
128128
.pattern("#X#")
129129
.define('#', ingredient.get())
130-
.define('X', DataIngredient.tag(net.neoforged.neoforge.common.Tags.Items.GLASS_BLOCKS_COLORLESS).toVanilla())
130+
.define('X', DataIngredient.tag(Tags.Items.GLASS_BLOCKS_COLORLESS).toVanilla())
131131
.unlockedBy("has_ingredient", RegistrateRecipeProvider.has(ingredient.get()))
132132
.save(p))
133133
.initialProperties(() -> Blocks.GLASS)
@@ -148,12 +148,12 @@ public static BlockEntry<ConnectedGlassBlock> framedGlass(String name,
148148
.initialProperties(() -> Blocks.GLASS)
149149
.properties(WindowGen::glassProperties)
150150
.loot((t, g) -> t.dropWhenSilkTouch(g))
151-
.recipe((c, p) -> p.stonecutting(DataIngredient.tag(net.neoforged.neoforge.common.Tags.Items.GLASS_BLOCKS_COLORLESS),
151+
.recipe((c, p) -> p.stonecutting(DataIngredient.tag(Tags.Items.GLASS_BLOCKS_COLORLESS),
152152
RecipeCategory.BUILDING_BLOCKS, c::get))
153153
.blockstate((c, p) -> BlockStateGen.cubeAll(c, p, "palettes/", "framed_glass"))
154-
.tag(net.neoforged.neoforge.common.Tags.Blocks.GLASS_BLOCKS_COLORLESS, BlockTags.IMPERMEABLE)
154+
.tag(Tags.Blocks.GLASS_BLOCKS_COLORLESS, BlockTags.IMPERMEABLE)
155155
.item()
156-
.tag(net.neoforged.neoforge.common.Tags.Items.GLASS_BLOCKS_COLORLESS)
156+
.tag(Tags.Items.GLASS_BLOCKS_COLORLESS)
157157
.model((c, p) -> p.cubeColumn(c.getName(), p.modLoc(palettesDir() + c.getName()),
158158
p.modLoc("block/palettes/framed_glass")))
159159
.build()

0 commit comments

Comments
 (0)