From 5f9a8ab8ff0154dc8d4b9974140a536a323678d0 Mon Sep 17 00:00:00 2001 From: TropheusJ Date: Thu, 13 Jul 2023 19:56:48 -0400 Subject: [PATCH] ton of trivial fixes --- .../java/com/simibubi/create/AllBlocks.java | 7 ++++--- src/main/java/com/simibubi/create/AllTags.java | 18 ++++++++++-------- .../compat/emi/GhostIngredientHandler.java | 2 +- .../AbstractContraptionEntity.java | 17 +++-------------- .../content/contraptions/Contraption.java | 3 ++- .../contraptions/ContraptionCollider.java | 15 ++++++++------- .../harvester/HarvesterMovementBehaviour.java | 3 ++- .../actors/roller/RollerBlock.java | 2 -- .../contraptions/actors/seat/SeatBlock.java | 1 - .../CapabilityMinecartController.java | 2 +- .../capability/MinecartController.java | 2 +- .../piston/MechanicalPistonGenerator.java | 5 +++-- .../contraptions/render/FlwContraption.java | 1 - .../decoration/MetalScaffoldingBlock.java | 1 - .../decoration/bracket/BracketGenerator.java | 5 +++-- .../decoration/copycat/CopycatModel.java | 2 -- .../copycat/SpecialCopycatPanelBlockState.java | 11 ++++++----- .../girder/GirderBlockStateGenerator.java | 3 ++- .../palettes/PaletteBlockPartial.java | 6 +++--- .../palettes/PaletteBlockPattern.java | 2 +- .../steamWhistle/WhistleGenerator.java | 5 +++-- .../equipment/armor/DivingBootsItem.java | 3 ++- .../equipment/armor/DivingHelmetItem.java | 2 -- .../equipment/blueprint/BlueprintScreen.java | 5 +++-- .../clipboard/ClipboardOverrides.java | 4 ++-- .../equipment/goggles/GogglesModel.java | 3 +-- .../BuiltinPotatoProjectileTypes.java | 8 ++++---- .../equipment/sandPaper/SandPaperItem.java | 4 +--- .../zapper/ZapperInteractionHandler.java | 1 + .../fluids/pipes/SmartFluidPipeGenerator.java | 5 +++-- .../fluids/pipes/VanillaFluidTargets.java | 8 +++----- .../fluids/potion/PotionMixingRecipes.java | 8 +++----- .../content/fluids/spout/SpoutBlockEntity.java | 3 +-- .../fluids/tank/FluidTankGenerator.java | 5 +++-- .../transfer/FluidDrainingBehaviour.java | 2 +- .../content/kinetics/belt/BeltGenerator.java | 5 +++-- .../content/kinetics/belt/BeltModel.java | 1 - .../chainDrive/ChainDriveGenerator.java | 3 ++- .../kinetics/clock/CuckooClockBlockEntity.java | 1 - .../crusher/CrushingWheelBlockEntity.java | 5 ++--- .../CrushingWheelControllerBlockEntity.java | 3 ++- .../kinetics/deployer/DeployerFakePlayer.java | 2 -- .../kinetics/deployer/DeployerHandler.java | 18 +++++++++--------- .../content/kinetics/drill/DrillBlock.java | 10 ++++------ .../content/kinetics/fan/AirCurrent.java | 5 +++-- .../content/kinetics/fan/FanProcessing.java | 1 - .../kinetics/motor/CreativeMotorGenerator.java | 5 +++-- .../create/content/kinetics/saw/SawBlock.java | 10 ++++------ .../content/kinetics/saw/SawGenerator.java | 5 +++-- .../sequencer/SequencedGearshiftGenerator.java | 5 +++-- .../waterwheel/WaterWheelStructuralBlock.java | 2 -- .../content/legacy/ChromaticCompoundItem.java | 3 ++- .../logistics/chute/ChuteGenerator.java | 5 +++-- .../crate/CreativeCrateBlockEntity.java | 3 --- .../logistics/funnel/BeltFunnelGenerator.java | 5 +++-- .../logistics/funnel/FunnelGenerator.java | 7 ++++--- .../processing/basin/BasinGenerator.java | 5 +++-- .../burner/BlazeBurnerBlockItem.java | 5 +---- .../sequenced/SequencedAssemblyRecipe.java | 1 + .../diodes/AbstractDiodeGenerator.java | 9 +++++---- .../redstone/diodes/BrassDiodeGenerator.java | 5 +++-- .../redstone/diodes/PoweredLatchGenerator.java | 5 +++-- .../redstone/diodes/ToggleLatchGenerator.java | 5 +++-- .../redstone/link/RedstoneLinkGenerator.java | 5 +++-- .../controller/LinkedControllerScreen.java | 3 ++- .../redstone/nixieTube/NixieTubeGenerator.java | 5 +++-- .../redstone/rail/ControllerRailGenerator.java | 5 +++-- .../smartObserver/SmartObserverGenerator.java | 5 +++-- .../ThresholdSwitchGenerator.java | 5 +++-- .../content/schematics/SchematicProcessor.java | 3 ++- .../cannon/SchematicannonRenderer.java | 5 ++--- .../schematics/client/SchematicRenderer.java | 3 --- .../trains/display/FlapDisplayRenderer.java | 3 ++- .../schedule/DestinationSuggestions.java | 4 ++-- .../content/trains/schedule/ScheduleItem.java | 1 - .../trains/schedule/ScheduleScreen.java | 2 -- .../trains/schedule/TrainHatArmorLayer.java | 4 ++-- .../trains/station/NoShadowFontWrapper.java | 15 ++++++++------- .../content/trains/track/TrackBlock.java | 9 ++++----- .../trains/track/TrackBlockStateGenerator.java | 5 +++-- .../trains/track/TrackMaterialFactory.java | 3 ++- .../foundation/block/CopperBlockSet.java | 6 +++--- .../blockEntity/SyncedBlockEntity.java | 3 +-- .../create/foundation/collision/Matrix3d.java | 3 +-- .../config/ui/ConfigModListScreen.java | 8 +++++--- .../config/ui/SubMenuConfigScreen.java | 3 ++- .../ui/compat/flywheel/FlwBooleanEntry.java | 3 ++- .../flywheel/FlwSubMenuConfigScreen.java | 2 +- .../config/ui/entries/BooleanEntry.java | 2 +- .../config/ui/entries/NumberEntry.java | 3 +-- .../config/ui/entries/SubMenuEntry.java | 2 +- .../config/ui/entries/ValueEntry.java | 3 ++- .../create/foundation/data/AssetLookup.java | 9 +++++---- .../create/foundation/data/BlockStateGen.java | 16 +++++++++------- .../foundation/data/BuilderTransformers.java | 5 +++-- .../data/DirectionalAxisBlockStateGen.java | 5 +++-- .../create/foundation/data/MetalBarsGen.java | 3 ++- .../create/foundation/data/ModelGen.java | 5 +++-- .../foundation/data/SpecialBlockStateGen.java | 7 ++++--- .../create/foundation/data/WindowGen.java | 2 +- .../data/recipe/LogStrippingFakeRecipes.java | 6 ++++-- .../create/foundation/events/ClientEvents.java | 4 +--- .../create/foundation/events/CommonEvents.java | 17 ++--------------- .../foundation/gui/AbstractSimiScreen.java | 3 ++- .../create/foundation/gui/RemovedGuiUtils.java | 3 ++- .../create/foundation/gui/UIRenderHelper.java | 4 ++-- .../foundation/gui/element/GuiGameElement.java | 2 +- .../foundation/gui/element/ScreenElement.java | 3 +-- .../gui/menu/AbstractSimiContainerScreen.java | 3 ++- .../create/foundation/item/SmartInventory.java | 2 +- .../item/render/CustomRenderedItemModel.java | 5 ++--- .../foundation/mixin/fabric/EntityMixin.java | 3 ++- .../mixin/fabric/StructureUtilsMixin.java | 1 - .../ponder/element/TextWindowElement.java | 2 -- .../ponder/element/WorldSectionElement.java | 2 -- .../create/foundation/ponder/ui/PonderUI.java | 12 +++++++----- .../foundation/recipe/AllIngredients.java | 2 -- .../foundation/recipe/BlockTagIngredient.java | 3 --- .../foundation/recipe/RecipeApplier.java | 1 + .../render/MultiRenderTypeModel.java | 3 +-- .../create/foundation/render/RenderTypes.java | 7 +++---- .../utility/AnimationTickHolder.java | 3 ++- .../create/foundation/utility/BlockHelper.java | 3 +-- .../create/foundation/utility/FontHelper.java | 4 ++-- .../foundation/utility/ModelSwapper.java | 4 ---- .../create/foundation/utility/VecHelper.java | 1 - .../utility/ghost/GhostBlockRenderer.java | 4 ---- .../worldWrappers/WrappedClientWorld.java | 6 ++---- .../worldWrappers/WrappedServerWorld.java | 4 +--- .../command/FlySpeedCommand.java | 2 +- .../infrastructure/config/AllConfigs.java | 4 ++-- .../gui/CreateMainMenuScreen.java | 5 ++--- .../gui/OpenCreateMenuButton.java | 2 ++ .../infrastructure/worldgen/LayerPattern.java | 2 ++ 134 files changed, 295 insertions(+), 325 deletions(-) diff --git a/src/main/java/com/simibubi/create/AllBlocks.java b/src/main/java/com/simibubi/create/AllBlocks.java index c7eb1ccf9a..cea9ed0796 100644 --- a/src/main/java/com/simibubi/create/AllBlocks.java +++ b/src/main/java/com/simibubi/create/AllBlocks.java @@ -270,6 +270,8 @@ import com.tterrag.registrate.util.DataIngredient; import com.tterrag.registrate.util.entry.BlockEntry; +import io.github.fabricators_of_create.porting_lib.models.generators.ConfiguredModel; +import io.github.fabricators_of_create.porting_lib.models.generators.ModelFile; import me.alphamode.forgetags.Tags; import net.minecraft.client.renderer.RenderType; import net.minecraft.core.Direction.Axis; @@ -306,12 +308,10 @@ import net.minecraft.world.level.storage.loot.predicates.LootItemCondition; import net.minecraft.world.level.storage.loot.providers.nbt.ContextNbtProvider; import net.minecraft.world.level.storage.loot.providers.number.ConstantValue; -import net.minecraftforge.client.model.generators.ConfiguredModel; -import net.minecraftforge.client.model.generators.ModelFile; public class AllBlocks { - static { REGISTRATE.useCreativeTab(AllCreativeModeTabs.MAIN_TAB); } + static { REGISTRATE.useCreativeTab(AllCreativeModeTabs.MAIN_TAB.key()); } // Schematics @@ -1551,6 +1551,7 @@ public class AllBlocks { .properties(p -> p.mapColor(MapColor.METAL) .strength(0.8F) .sound(SoundType.METAL) + .pushReaction(PushReaction.BLOCK) // fabric: moved from TrackBLock .noOcclusion()) .addLayer(() -> RenderType::cutoutMipped) .transform(pickaxeOnly()) diff --git a/src/main/java/com/simibubi/create/AllTags.java b/src/main/java/com/simibubi/create/AllTags.java index aea657132e..ef855c1b6d 100644 --- a/src/main/java/com/simibubi/create/AllTags.java +++ b/src/main/java/com/simibubi/create/AllTags.java @@ -7,6 +7,8 @@ import com.simibubi.create.foundation.utility.Lang; +import net.minecraft.core.Registry; +import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.core.registries.Registries; import net.minecraft.resources.ResourceLocation; import net.minecraft.tags.TagKey; @@ -22,7 +24,7 @@ public class AllTags { public static TagKey optionalTag(Registry registry, - ResourceLocation id) { + ResourceLocation id) { return TagKey.create(registry.key(), id); } @@ -31,15 +33,15 @@ public static TagKey forgeTag(Registry registry, String path) { } public static TagKey forgeBlockTag(String path) { - return forgeTag(Registry.BLOCK, path); + return forgeTag(BuiltInRegistries.BLOCK, path); } public static TagKey forgeItemTag(String path) { - return forgeTag(Registry.ITEM, path); + return forgeTag(BuiltInRegistries.ITEM, path); } public static TagKey forgeFluidTag(String path) { - return forgeTag(Registry.FLUID, path); + return forgeTag(BuiltInRegistries.FLUID, path); } public enum NameSpace { @@ -117,7 +119,7 @@ public enum AllBlockTags { AllBlockTags(NameSpace namespace, String path, boolean optional, boolean alwaysDatagen) { ResourceLocation id = new ResourceLocation(namespace.id, path == null ? Lang.asId(name()) : path); - tag = optionalTag(Registry.BLOCK, id); + tag = optionalTag(BuiltInRegistries.BLOCK, id); this.alwaysDatagen = alwaysDatagen; } @@ -188,7 +190,7 @@ public enum AllItemTags { AllItemTags(NameSpace namespace, String path, boolean optional, boolean alwaysDatagen) { ResourceLocation id = new ResourceLocation(namespace.id, path == null ? Lang.asId(name()) : path); - tag = optionalTag(Registry.ITEM, id); + tag = optionalTag(BuiltInRegistries.ITEM, id); this.alwaysDatagen = alwaysDatagen; } @@ -239,7 +241,7 @@ public enum AllFluidTags { AllFluidTags(NameSpace namespace, String path, boolean optional, boolean alwaysDatagen) { ResourceLocation id = new ResourceLocation(namespace.id, path == null ? Lang.asId(name()) : path); - tag = optionalTag(Registry.FLUID, id); + tag = optionalTag(BuiltInRegistries.FLUID, id); this.alwaysDatagen = alwaysDatagen; } @@ -284,7 +286,7 @@ public enum AllEntityTags { AllEntityTags(NameSpace namespace, String path, boolean optional, boolean alwaysDatagen) { ResourceLocation id = new ResourceLocation(namespace.id, path == null ? Lang.asId(name()) : path); if (optional) { - tag = optionalTag(Registry.ENTITY_TYPE, id); + tag = optionalTag(BuiltInRegistries.ENTITY_TYPE, id); } else { tag = TagKey.create(Registries.ENTITY_TYPE, id); } diff --git a/src/main/java/com/simibubi/create/compat/emi/GhostIngredientHandler.java b/src/main/java/com/simibubi/create/compat/emi/GhostIngredientHandler.java index 4aaa818631..a5aeb0baa8 100644 --- a/src/main/java/com/simibubi/create/compat/emi/GhostIngredientHandler.java +++ b/src/main/java/com/simibubi/create/compat/emi/GhostIngredientHandler.java @@ -13,7 +13,7 @@ import dev.emi.emi.api.EmiDragDropHandler; import dev.emi.emi.api.stack.EmiIngredient; import dev.emi.emi.api.stack.EmiStack; -import io.github.fabricators_of_create.porting_lib.mixin.client.accessor.AbstractContainerScreenAccessor; +import io.github.fabricators_of_create.porting_lib.mixin.accessors.client.accessor.AbstractContainerScreenAccessor; import io.github.fabricators_of_create.porting_lib.transfer.item.ItemHandlerHelper; import net.minecraft.MethodsReturnNonnullByDefault; import net.minecraft.client.renderer.Rect2i; diff --git a/src/main/java/com/simibubi/create/content/contraptions/AbstractContraptionEntity.java b/src/main/java/com/simibubi/create/content/contraptions/AbstractContraptionEntity.java index 893485ccc1..e45845dde9 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/AbstractContraptionEntity.java +++ b/src/main/java/com/simibubi/create/content/contraptions/AbstractContraptionEntity.java @@ -10,8 +10,7 @@ import com.simibubi.create.foundation.utility.AdventureUtil; -import io.github.fabricators_of_create.porting_lib.entity.RemovalFromWorldListener; - +import io.github.fabricators_of_create.porting_lib.mixin.accessors.common.accessor.EntityAccessor; import io.github.fabricators_of_create.porting_lib.util.EnvExecutor; import org.apache.commons.lang3.mutable.MutableInt; @@ -44,7 +43,6 @@ import com.simibubi.create.foundation.utility.AngleHelper; import com.simibubi.create.foundation.utility.VecHelper; import io.github.fabricators_of_create.porting_lib.entity.ExtraSpawnDataEntity; -import io.github.fabricators_of_create.porting_lib.mixin.common.accessor.EntityAccessor; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; @@ -58,6 +56,7 @@ import net.minecraft.network.chat.Component; import net.minecraft.network.protocol.Packet; import net.minecraft.network.protocol.game.ClientGamePacketListener; +import net.minecraft.network.protocol.game.ClientboundAddEntityPacket; import net.minecraft.network.syncher.EntityDataAccessor; import net.minecraft.network.syncher.EntityDataSerializers; import net.minecraft.network.syncher.SynchedEntityData; @@ -85,7 +84,7 @@ import org.jetbrains.annotations.Nullable; -public abstract class AbstractContraptionEntity extends Entity implements ExtraSpawnDataEntity, RemovalFromWorldListener { +public abstract class AbstractContraptionEntity extends Entity implements ExtraSpawnDataEntity { private static final EntityDataAccessor STALLED = SynchedEntityData.defineId(AbstractContraptionEntity.class, EntityDataSerializers.BOOLEAN); @@ -599,11 +598,6 @@ protected void defineSynchedData() { this.entityData.define(CONTROLLED_BY, Optional.empty()); } - @Override - public Packet getAddEntityPacket() { - return ExtraSpawnDataEntity.createExtraDataSpawnPacket(this, new ClientboundAddEntityPacket(this, getId())); - } - @Override public void writeSpawnData(FriendlyByteBuf buffer) { CompoundTag compound = new CompoundTag(); @@ -722,11 +716,6 @@ protected void onBelowWorld() { super.onBelowWorld(); } - @Override - public void onRemovedFromWorld() { -// super.onRemovedFromWorld(); - } - @Override protected void doWaterSplashEffect() {} diff --git a/src/main/java/com/simibubi/create/content/contraptions/Contraption.java b/src/main/java/com/simibubi/create/content/contraptions/Contraption.java index 65fd1f3f97..5f919155ed 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/Contraption.java +++ b/src/main/java/com/simibubi/create/content/contraptions/Contraption.java @@ -21,6 +21,8 @@ import javax.annotation.Nullable; +import io.github.fabricators_of_create.porting_lib.mixin.accessors.common.accessor.HashMapPaletteAccessor; + import org.apache.commons.lang3.tuple.MutablePair; import org.apache.commons.lang3.tuple.Pair; @@ -82,7 +84,6 @@ import com.simibubi.create.foundation.utility.UniqueLinkedList; import com.simibubi.create.infrastructure.config.AllConfigs; -import io.github.fabricators_of_create.porting_lib.mixin.common.accessor.HashMapPaletteAccessor; import io.github.fabricators_of_create.porting_lib.util.FluidStack; import io.github.fabricators_of_create.porting_lib.util.StickinessUtil; import net.fabricmc.api.EnvType; diff --git a/src/main/java/com/simibubi/create/content/contraptions/ContraptionCollider.java b/src/main/java/com/simibubi/create/content/contraptions/ContraptionCollider.java index ad2cc04b82..5616456708 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/ContraptionCollider.java +++ b/src/main/java/com/simibubi/create/content/contraptions/ContraptionCollider.java @@ -11,6 +11,8 @@ import com.simibubi.create.AllDamageTypes; +import com.simibubi.create.foundation.mixin.fabric.ServerGamePacketListenerImplAccessor; + import org.apache.commons.lang3.mutable.MutableBoolean; import org.apache.commons.lang3.mutable.MutableFloat; import org.apache.commons.lang3.mutable.MutableObject; @@ -37,7 +39,6 @@ import com.simibubi.create.foundation.utility.VecHelper; import com.simibubi.create.infrastructure.config.AllConfigs; -import io.github.fabricators_of_create.porting_lib.mixin.common.accessor.ServerGamePacketListenerImplAccessor; import io.github.fabricators_of_create.porting_lib.util.EnvExecutor; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; @@ -119,7 +120,7 @@ static void collideEntities(AbstractContraptionEntity contraptionEntity) { entity.getSelfAndPassengers() .forEach(e -> { if (e instanceof ServerPlayer) - ((ServerGamePacketListenerImplAccessor) ((ServerPlayer) e).connection).port_lib$setAboveGroundTickCount(0); + ((ServerGamePacketListenerImplAccessor) ((ServerPlayer) e).connection).create$setAboveGroundTickCount(0); }); if (playerType == PlayerType.SERVER) continue; @@ -206,7 +207,7 @@ static void collideEntities(AbstractContraptionEntity contraptionEntity) { Vec3 collisionPosition = intersect.getCollisionPosition(); if (!isTemporal) { - Vec3 separation = intersect.asSeparationVec(entity.maxUpStep); + Vec3 separation = intersect.asSeparationVec(entity.maxUpStep()); if (separation != null && !separation.equals(Vec3.ZERO)) { collisionResponse.setValue(currentResponse.add(separation)); timeOfImpact = 0; @@ -620,12 +621,12 @@ static Vec3 collide(Vec3 p_20273_, Entity e) { boolean flag1 = p_20273_.y != vec3.y; boolean flag2 = p_20273_.z != vec3.z; boolean flag3 = flag1 && p_20273_.y < 0.0D; - if (e.maxUpStep > 0.0F && flag3 && (flag || flag2)) { - Vec3 vec31 = collideBoundingBox(e, new Vec3(p_20273_.x, e.maxUpStep, p_20273_.z), aabb, + if (e.maxUpStep() > 0.0F && flag3 && (flag || flag2)) { + Vec3 vec31 = collideBoundingBox(e, new Vec3(p_20273_.x, e.maxUpStep(), p_20273_.z), aabb, e.level(), list); - Vec3 vec32 = collideBoundingBox(e, new Vec3(0.0D, e.maxUpStep, 0.0D), + Vec3 vec32 = collideBoundingBox(e, new Vec3(0.0D, e.maxUpStep(), 0.0D), aabb.expandTowards(p_20273_.x, 0.0D, p_20273_.z), e.level(), list); - if (vec32.y < (double) e.maxUpStep) { + if (vec32.y < (double) e.maxUpStep()) { Vec3 vec33 = collideBoundingBox(e, new Vec3(p_20273_.x, 0.0D, p_20273_.z), aabb.move(vec32), e.level(), list) .add(vec32); diff --git a/src/main/java/com/simibubi/create/content/contraptions/actors/harvester/HarvesterMovementBehaviour.java b/src/main/java/com/simibubi/create/content/contraptions/actors/harvester/HarvesterMovementBehaviour.java index 65509edfe2..534d1950f0 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/actors/harvester/HarvesterMovementBehaviour.java +++ b/src/main/java/com/simibubi/create/content/contraptions/actors/harvester/HarvesterMovementBehaviour.java @@ -2,6 +2,8 @@ import javax.annotation.Nullable; +import io.github.fabricators_of_create.porting_lib.common.util.PlantUtil; + import org.apache.commons.lang3.mutable.MutableBoolean; import com.jozufozu.flywheel.api.MaterialManager; @@ -16,7 +18,6 @@ import com.simibubi.create.foundation.utility.VecHelper; import com.simibubi.create.infrastructure.config.AllConfigs; -import io.github.fabricators_of_create.porting_lib.util.PlantUtil; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.core.BlockPos; import net.minecraft.tags.BlockTags; diff --git a/src/main/java/com/simibubi/create/content/contraptions/actors/roller/RollerBlock.java b/src/main/java/com/simibubi/create/content/contraptions/actors/roller/RollerBlock.java index 528dc74ee2..4e191d0c99 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/actors/roller/RollerBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/actors/roller/RollerBlock.java @@ -10,12 +10,10 @@ import com.simibubi.create.foundation.placement.PlacementHelpers; import com.simibubi.create.foundation.placement.PoleHelper; -import io.github.fabricators_of_create.porting_lib.mixin.common.accessor.DamageSourceAccessor; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.world.InteractionHand; import net.minecraft.world.InteractionResult; -import net.minecraft.world.damagesource.DamageSource; import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.BlockItem; diff --git a/src/main/java/com/simibubi/create/content/contraptions/actors/seat/SeatBlock.java b/src/main/java/com/simibubi/create/content/contraptions/actors/seat/SeatBlock.java index 757a400ec3..1089769643 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/actors/seat/SeatBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/actors/seat/SeatBlock.java @@ -11,7 +11,6 @@ import com.simibubi.create.foundation.block.ProperWaterloggedBlock; import com.simibubi.create.foundation.utility.BlockHelper; import com.simibubi.create.infrastructure.config.AllConfigs; -import io.github.fabricators_of_create.porting_lib.block.CustomPathNodeTypeBlock; import io.github.fabricators_of_create.porting_lib.util.TagUtil; import net.fabricmc.fabric.api.registry.LandPathNodeTypesRegistry; import net.minecraft.MethodsReturnNonnullByDefault; diff --git a/src/main/java/com/simibubi/create/content/contraptions/minecart/capability/CapabilityMinecartController.java b/src/main/java/com/simibubi/create/content/contraptions/minecart/capability/CapabilityMinecartController.java index 9da3691258..83da369d02 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/minecart/capability/CapabilityMinecartController.java +++ b/src/main/java/com/simibubi/create/content/contraptions/minecart/capability/CapabilityMinecartController.java @@ -17,7 +17,7 @@ import com.simibubi.create.foundation.utility.WorldAttached; import com.simibubi.create.foundation.utility.fabric.AbstractMinecartExtensions; -import io.github.fabricators_of_create.porting_lib.extensions.INBTSerializable; +import io.github.fabricators_of_create.porting_lib.core.util.INBTSerializable; import io.github.fabricators_of_create.porting_lib.util.LazyOptional; import it.unimi.dsi.fastutil.objects.ObjectArrayList; diff --git a/src/main/java/com/simibubi/create/content/contraptions/minecart/capability/MinecartController.java b/src/main/java/com/simibubi/create/content/contraptions/minecart/capability/MinecartController.java index 0828e99808..c30e31a4d6 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/minecart/capability/MinecartController.java +++ b/src/main/java/com/simibubi/create/content/contraptions/minecart/capability/MinecartController.java @@ -8,7 +8,7 @@ import javax.annotation.Nullable; -import io.github.fabricators_of_create.porting_lib.extensions.INBTSerializable; +import io.github.fabricators_of_create.porting_lib.core.util.INBTSerializable; import org.apache.commons.lang3.mutable.MutableBoolean; diff --git a/src/main/java/com/simibubi/create/content/contraptions/piston/MechanicalPistonGenerator.java b/src/main/java/com/simibubi/create/content/contraptions/piston/MechanicalPistonGenerator.java index f28a426d00..8201906ace 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/piston/MechanicalPistonGenerator.java +++ b/src/main/java/com/simibubi/create/content/contraptions/piston/MechanicalPistonGenerator.java @@ -5,13 +5,14 @@ import com.tterrag.registrate.providers.DataGenContext; import com.tterrag.registrate.providers.RegistrateBlockstateProvider; +import io.github.fabricators_of_create.porting_lib.models.generators.ModelFile; + import net.minecraft.core.Direction; import net.minecraft.core.Direction.Axis; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.piston.PistonBaseBlock; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.properties.PistonType; -import net.minecraftforge.client.model.generators.ModelFile; public class MechanicalPistonGenerator extends SpecialBlockStateGen { @@ -37,7 +38,7 @@ protected int getYRotation(BlockState state) { @Override public ModelFile getModel(DataGenContext ctx, RegistrateBlockstateProvider prov, - BlockState state) { + BlockState state) { Direction facing = state.getValue(PistonBaseBlock.FACING); boolean axisAlongFirst = state.getValue(MechanicalPistonBlock.AXIS_ALONG_FIRST_COORDINATE); PistonState pistonState = state.getValue(MechanicalPistonBlock.STATE); diff --git a/src/main/java/com/simibubi/create/content/contraptions/render/FlwContraption.java b/src/main/java/com/simibubi/create/content/contraptions/render/FlwContraption.java index 579fb7e292..b0cfbc4fd1 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/render/FlwContraption.java +++ b/src/main/java/com/simibubi/create/content/contraptions/render/FlwContraption.java @@ -20,7 +20,6 @@ import com.jozufozu.flywheel.core.virtual.VirtualRenderWorld; import com.jozufozu.flywheel.event.BeginFrameEvent; import com.jozufozu.flywheel.event.RenderLayerEvent; -import com.jozufozu.flywheel.fabric.helper.Matrix4fHelper; import com.mojang.blaze3d.vertex.PoseStack; import com.simibubi.create.content.contraptions.AbstractContraptionEntity; import com.simibubi.create.content.contraptions.Contraption; diff --git a/src/main/java/com/simibubi/create/content/decoration/MetalScaffoldingBlock.java b/src/main/java/com/simibubi/create/content/decoration/MetalScaffoldingBlock.java index 040313ef1c..e73465abff 100644 --- a/src/main/java/com/simibubi/create/content/decoration/MetalScaffoldingBlock.java +++ b/src/main/java/com/simibubi/create/content/decoration/MetalScaffoldingBlock.java @@ -3,7 +3,6 @@ import com.simibubi.create.AllShapes; import com.simibubi.create.content.equipment.wrench.IWrenchable; -import io.github.fabricators_of_create.porting_lib.block.CustomScaffoldingBlock; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.core.Direction.Axis; diff --git a/src/main/java/com/simibubi/create/content/decoration/bracket/BracketGenerator.java b/src/main/java/com/simibubi/create/content/decoration/bracket/BracketGenerator.java index 30a2b01426..f827eb76d9 100644 --- a/src/main/java/com/simibubi/create/content/decoration/bracket/BracketGenerator.java +++ b/src/main/java/com/simibubi/create/content/decoration/bracket/BracketGenerator.java @@ -6,10 +6,11 @@ import com.tterrag.registrate.providers.RegistrateBlockstateProvider; import com.tterrag.registrate.util.nullness.NonNullFunction; +import io.github.fabricators_of_create.porting_lib.models.generators.ModelFile; + import net.minecraft.world.item.BlockItem; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.state.BlockState; -import net.minecraftforge.client.model.generators.ModelFile; public class BracketGenerator extends DirectionalAxisBlockStateGen { @@ -27,7 +28,7 @@ public String getModelPrefix(DataGenContext ctx, Reg @Override public ModelFile getModel(DataGenContext ctx, RegistrateBlockstateProvider prov, - BlockState state) { + BlockState state) { String type = state.getValue(BracketBlock.TYPE) .getSerializedName(); boolean vertical = state.getValue(BracketBlock.FACING) diff --git a/src/main/java/com/simibubi/create/content/decoration/copycat/CopycatModel.java b/src/main/java/com/simibubi/create/content/decoration/copycat/CopycatModel.java index 28d20ca368..ee8ae7f11b 100644 --- a/src/main/java/com/simibubi/create/content/decoration/copycat/CopycatModel.java +++ b/src/main/java/com/simibubi/create/content/decoration/copycat/CopycatModel.java @@ -1,12 +1,10 @@ package com.simibubi.create.content.decoration.copycat; -import java.util.Random; import java.util.function.Supplier; import com.simibubi.create.AllBlocks; import com.simibubi.create.foundation.utility.Iterate; -import io.github.fabricators_of_create.porting_lib.model.CustomParticleIconModel; import net.fabricmc.fabric.api.renderer.v1.model.ForwardingBakedModel; import net.fabricmc.fabric.api.renderer.v1.render.RenderContext; import net.fabricmc.fabric.api.rendering.data.v1.RenderAttachedBlockView; diff --git a/src/main/java/com/simibubi/create/content/decoration/copycat/SpecialCopycatPanelBlockState.java b/src/main/java/com/simibubi/create/content/decoration/copycat/SpecialCopycatPanelBlockState.java index 3cf375ace1..7e6071802f 100644 --- a/src/main/java/com/simibubi/create/content/decoration/copycat/SpecialCopycatPanelBlockState.java +++ b/src/main/java/com/simibubi/create/content/decoration/copycat/SpecialCopycatPanelBlockState.java @@ -4,13 +4,14 @@ import com.tterrag.registrate.providers.DataGenContext; import com.tterrag.registrate.providers.RegistrateBlockstateProvider; +import io.github.fabricators_of_create.porting_lib.models.generators.ModelFile; +import io.github.fabricators_of_create.porting_lib.models.generators.block.BlockModelProvider; + import net.minecraft.core.Direction; import net.minecraft.core.Direction.Axis; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.DirectionalBlock; import net.minecraft.world.level.block.state.BlockState; -import net.minecraftforge.client.model.generators.BlockModelProvider; -import net.minecraftforge.client.model.generators.ModelFile; public class SpecialCopycatPanelBlockState extends SpecialBlockStateGen { @@ -19,7 +20,7 @@ public class SpecialCopycatPanelBlockState extends SpecialBlockStateGen { public SpecialCopycatPanelBlockState(String name) { this.name = name; } - + @Override protected int getXRotation(BlockState state) { return facing(state) == Direction.UP ? 0 : facing(state) == Direction.DOWN ? 180 : 0; @@ -36,11 +37,11 @@ private Direction facing(BlockState state) { @Override public ModelFile getModel(DataGenContext ctx, RegistrateBlockstateProvider prov, - BlockState state) { + BlockState state) { BlockModelProvider models = prov.models(); return facing(state).getAxis() == Axis.Y ? models.getExistingFile(prov.modLoc("block/copycat_panel/" + name + "_vertical")) : models.getExistingFile(prov.modLoc("block/copycat_panel/" + name)); } -} \ No newline at end of file +} diff --git a/src/main/java/com/simibubi/create/content/decoration/girder/GirderBlockStateGenerator.java b/src/main/java/com/simibubi/create/content/decoration/girder/GirderBlockStateGenerator.java index 72f3a181ca..3066e50ef2 100644 --- a/src/main/java/com/simibubi/create/content/decoration/girder/GirderBlockStateGenerator.java +++ b/src/main/java/com/simibubi/create/content/decoration/girder/GirderBlockStateGenerator.java @@ -5,9 +5,10 @@ import com.tterrag.registrate.providers.DataGenContext; import com.tterrag.registrate.providers.RegistrateBlockstateProvider; +import io.github.fabricators_of_create.porting_lib.models.generators.block.MultiPartBlockStateBuilder; + import net.minecraft.core.Direction.Axis; import net.minecraft.world.level.block.Block; -import net.minecraftforge.client.model.generators.MultiPartBlockStateBuilder; public class GirderBlockStateGenerator { diff --git a/src/main/java/com/simibubi/create/content/decoration/palettes/PaletteBlockPartial.java b/src/main/java/com/simibubi/create/content/decoration/palettes/PaletteBlockPartial.java index d5311884d8..c43d6ee9b2 100644 --- a/src/main/java/com/simibubi/create/content/decoration/palettes/PaletteBlockPartial.java +++ b/src/main/java/com/simibubi/create/content/decoration/palettes/PaletteBlockPartial.java @@ -8,7 +8,6 @@ import com.simibubi.create.Create; import com.simibubi.create.foundation.data.CreateRegistrate; import com.simibubi.create.foundation.utility.Lang; -import io.github.fabricators_of_create.porting_lib.util.StairsBlockHelper; import com.tterrag.registrate.builders.BlockBuilder; import com.tterrag.registrate.builders.ItemBuilder; import com.tterrag.registrate.providers.DataGenContext; @@ -18,6 +17,8 @@ import com.tterrag.registrate.util.entry.BlockEntry; import com.tterrag.registrate.util.nullness.NonnullType; +import io.github.fabricators_of_create.porting_lib.models.generators.ModelFile; + import net.minecraft.data.recipes.RecipeCategory; import net.minecraft.data.recipes.ShapedRecipeBuilder; import net.minecraft.data.recipes.ShapelessRecipeBuilder; @@ -32,7 +33,6 @@ import net.minecraft.world.level.block.StairBlock; import net.minecraft.world.level.block.WallBlock; import net.minecraft.world.level.block.state.BlockBehaviour.Properties; -import net.minecraftforge.client.model.generators.ModelFile; public abstract class PaletteBlockPartial { @@ -111,7 +111,7 @@ public Stairs() { @Override protected StairBlock createBlock(Supplier block) { - return StairsBlockHelper.init(block.get().defaultBlockState(), Properties.copy(block.get())); + return new StairBlock(block.get().defaultBlockState(), Properties.copy(block.get())); } @Override diff --git a/src/main/java/com/simibubi/create/content/decoration/palettes/PaletteBlockPattern.java b/src/main/java/com/simibubi/create/content/decoration/palettes/PaletteBlockPattern.java index de4ff61770..143660c599 100644 --- a/src/main/java/com/simibubi/create/content/decoration/palettes/PaletteBlockPattern.java +++ b/src/main/java/com/simibubi/create/content/decoration/palettes/PaletteBlockPattern.java @@ -25,6 +25,7 @@ import com.tterrag.registrate.util.nullness.NonNullFunction; import com.tterrag.registrate.util.nullness.NonNullSupplier; +import io.github.fabricators_of_create.porting_lib.models.generators.ConfiguredModel; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.minecraft.client.renderer.RenderType; @@ -35,7 +36,6 @@ import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.state.BlockBehaviour.Properties; import net.minecraft.world.level.block.state.properties.BlockStateProperties; -import net.minecraftforge.client.model.generators.ConfiguredModel; public class PaletteBlockPattern { diff --git a/src/main/java/com/simibubi/create/content/decoration/steamWhistle/WhistleGenerator.java b/src/main/java/com/simibubi/create/content/decoration/steamWhistle/WhistleGenerator.java index 2923980a79..3999346b05 100644 --- a/src/main/java/com/simibubi/create/content/decoration/steamWhistle/WhistleGenerator.java +++ b/src/main/java/com/simibubi/create/content/decoration/steamWhistle/WhistleGenerator.java @@ -6,10 +6,11 @@ import com.tterrag.registrate.providers.DataGenContext; import com.tterrag.registrate.providers.RegistrateBlockstateProvider; +import io.github.fabricators_of_create.porting_lib.models.generators.ModelFile; + import net.minecraft.resources.ResourceLocation; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.state.BlockState; -import net.minecraftforge.client.model.generators.ModelFile; public class WhistleGenerator extends SpecialBlockStateGen { @@ -25,7 +26,7 @@ protected int getYRotation(BlockState state) { @Override public ModelFile getModel(DataGenContext ctx, RegistrateBlockstateProvider prov, - BlockState state) { + BlockState state) { String wall = state.getValue(WhistleBlock.WALL) ? "wall" : "floor"; String size = state.getValue(WhistleBlock.SIZE) .getSerializedName(); diff --git a/src/main/java/com/simibubi/create/content/equipment/armor/DivingBootsItem.java b/src/main/java/com/simibubi/create/content/equipment/armor/DivingBootsItem.java index ab57c22cd3..da5e9cb240 100644 --- a/src/main/java/com/simibubi/create/content/equipment/armor/DivingBootsItem.java +++ b/src/main/java/com/simibubi/create/content/equipment/armor/DivingBootsItem.java @@ -2,7 +2,8 @@ import com.simibubi.create.foundation.utility.NBTHelper; -import io.github.fabricators_of_create.porting_lib.mixin.common.accessor.LivingEntityAccessor; +import io.github.fabricators_of_create.porting_lib.mixin.accessors.common.accessor.LivingEntityAccessor; + import net.minecraft.resources.ResourceLocation; import net.minecraft.tags.FluidTags; import net.minecraft.world.entity.Entity; diff --git a/src/main/java/com/simibubi/create/content/equipment/armor/DivingHelmetItem.java b/src/main/java/com/simibubi/create/content/equipment/armor/DivingHelmetItem.java index d00153bf55..21e6a5cb62 100644 --- a/src/main/java/com/simibubi/create/content/equipment/armor/DivingHelmetItem.java +++ b/src/main/java/com/simibubi/create/content/equipment/armor/DivingHelmetItem.java @@ -8,8 +8,6 @@ import com.simibubi.create.foundation.advancement.AllAdvancements; import io.github.fabricators_of_create.porting_lib.enchant.CustomEnchantingBehaviorItem; -import io.github.fabricators_of_create.porting_lib.item.CustomEnchantmentLevelItem; -import io.github.fabricators_of_create.porting_lib.item.CustomEnchantmentsItem; import net.minecraft.resources.ResourceLocation; import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.effect.MobEffectInstance; diff --git a/src/main/java/com/simibubi/create/content/equipment/blueprint/BlueprintScreen.java b/src/main/java/com/simibubi/create/content/equipment/blueprint/BlueprintScreen.java index e0c21333d6..e33e1d8179 100644 --- a/src/main/java/com/simibubi/create/content/equipment/blueprint/BlueprintScreen.java +++ b/src/main/java/com/simibubi/create/content/equipment/blueprint/BlueprintScreen.java @@ -17,8 +17,9 @@ import com.simibubi.create.foundation.gui.menu.AbstractSimiContainerScreen; import com.simibubi.create.foundation.gui.widget.IconButton; import com.simibubi.create.foundation.utility.Lang; -import io.github.fabricators_of_create.porting_lib.mixin.common.accessor.PlayerAccessor; -import io.github.fabricators_of_create.porting_lib.mixin.common.accessor.SlotAccessor; + +import io.github.fabricators_of_create.porting_lib.mixin.accessors.common.accessor.PlayerAccessor; +import io.github.fabricators_of_create.porting_lib.mixin.accessors.common.accessor.SlotAccessor; import net.minecraft.ChatFormatting; import net.minecraft.client.gui.GuiGraphics; diff --git a/src/main/java/com/simibubi/create/content/equipment/clipboard/ClipboardOverrides.java b/src/main/java/com/simibubi/create/content/equipment/clipboard/ClipboardOverrides.java index 008cdb0e64..8655e49a85 100644 --- a/src/main/java/com/simibubi/create/content/equipment/clipboard/ClipboardOverrides.java +++ b/src/main/java/com/simibubi/create/content/equipment/clipboard/ClipboardOverrides.java @@ -9,10 +9,10 @@ import net.minecraft.resources.ResourceLocation; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; +import io.github.fabricators_of_create.porting_lib.models.generators.ModelFile.UncheckedModelFile; +import io.github.fabricators_of_create.porting_lib.models.generators.item.ItemModelBuilder; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; -import net.minecraftforge.client.model.generators.ItemModelBuilder; -import net.minecraftforge.client.model.generators.ModelFile.UncheckedModelFile; public class ClipboardOverrides { diff --git a/src/main/java/com/simibubi/create/content/equipment/goggles/GogglesModel.java b/src/main/java/com/simibubi/create/content/equipment/goggles/GogglesModel.java index 4a78edb0ec..bd60617fb6 100644 --- a/src/main/java/com/simibubi/create/content/equipment/goggles/GogglesModel.java +++ b/src/main/java/com/simibubi/create/content/equipment/goggles/GogglesModel.java @@ -2,11 +2,10 @@ import com.mojang.blaze3d.vertex.PoseStack; import com.simibubi.create.AllPartialModels; -import io.github.fabricators_of_create.porting_lib.render.TransformTypeDependentItemBakedModel; import net.fabricmc.fabric.api.renderer.v1.model.ForwardingBakedModel; -import net.minecraft.client.renderer.block.model.ItemTransforms.TransformType; import net.minecraft.client.resources.model.BakedModel; +import net.minecraft.world.item.ItemDisplayContext; public class GogglesModel extends ForwardingBakedModel implements TransformTypeDependentItemBakedModel { diff --git a/src/main/java/com/simibubi/create/content/equipment/potatoCannon/BuiltinPotatoProjectileTypes.java b/src/main/java/com/simibubi/create/content/equipment/potatoCannon/BuiltinPotatoProjectileTypes.java index 068e7413b2..2812813de1 100644 --- a/src/main/java/com/simibubi/create/content/equipment/potatoCannon/BuiltinPotatoProjectileTypes.java +++ b/src/main/java/com/simibubi/create/content/equipment/potatoCannon/BuiltinPotatoProjectileTypes.java @@ -14,10 +14,10 @@ import com.simibubi.create.infrastructure.config.AllConfigs; -import io.github.fabricators_of_create.porting_lib.event.common.EntityEvents; -import io.github.fabricators_of_create.porting_lib.event.common.EntityEvents.Teleport.EntityTeleportEvent; +import io.github.fabricators_of_create.porting_lib.common.util.PlantUtil; +import io.github.fabricators_of_create.porting_lib.entity.events.EntityMoveEvents; +import io.github.fabricators_of_create.porting_lib.entity.events.EntityMoveEvents.EntityTeleportEvent; import io.github.fabricators_of_create.porting_lib.fake_players.FakePlayer; -import io.github.fabricators_of_create.porting_lib.util.PlantUtil; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.server.level.ServerLevel; @@ -410,7 +410,7 @@ private static Predicate chorusTeleport(double teleportDiameter .nextDouble() - 0.5D) * teleportDiameter; EntityTeleportEvent event = new EntityTeleportEvent(livingEntity, teleportX, teleportY, teleportZ); - EntityEvents.TELEPORT.invoker().onTeleport(event); + EntityMoveEvents.TELEPORT.invoker().onTeleport(event); if (event.isCanceled()) return false; if (livingEntity.randomTeleport(teleportX, teleportY, teleportZ, true)) { diff --git a/src/main/java/com/simibubi/create/content/equipment/sandPaper/SandPaperItem.java b/src/main/java/com/simibubi/create/content/equipment/sandPaper/SandPaperItem.java index b1bba7edfe..66ee547774 100644 --- a/src/main/java/com/simibubi/create/content/equipment/sandPaper/SandPaperItem.java +++ b/src/main/java/com/simibubi/create/content/equipment/sandPaper/SandPaperItem.java @@ -10,10 +10,8 @@ import com.simibubi.create.foundation.mixin.accessor.LivingEntityAccessor; import com.simibubi.create.foundation.utility.VecHelper; -import io.github.fabricators_of_create.porting_lib.mixin.common.accessor.AxeItemAccessor; +import io.github.fabricators_of_create.porting_lib.mixin.accessors.common.accessor.AxeItemAccessor; import io.github.fabricators_of_create.porting_lib.util.NBTSerializer; -import io.github.fabricators_of_create.porting_lib.util.ToolAction; -import io.github.fabricators_of_create.porting_lib.util.ToolActions; import net.minecraft.MethodsReturnNonnullByDefault; import net.minecraft.core.BlockPos; import net.minecraft.core.particles.ItemParticleOption; diff --git a/src/main/java/com/simibubi/create/content/equipment/zapper/ZapperInteractionHandler.java b/src/main/java/com/simibubi/create/content/equipment/zapper/ZapperInteractionHandler.java index 5e30bea5be..365a20fea5 100644 --- a/src/main/java/com/simibubi/create/content/equipment/zapper/ZapperInteractionHandler.java +++ b/src/main/java/com/simibubi/create/content/equipment/zapper/ZapperInteractionHandler.java @@ -7,6 +7,7 @@ import com.simibubi.create.foundation.utility.BlockHelper; import net.minecraft.core.BlockPos; +import net.minecraft.core.Direction; import net.minecraft.core.registries.Registries; import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.NbtUtils; diff --git a/src/main/java/com/simibubi/create/content/fluids/pipes/SmartFluidPipeGenerator.java b/src/main/java/com/simibubi/create/content/fluids/pipes/SmartFluidPipeGenerator.java index 30c39a1dee..7573231b1b 100644 --- a/src/main/java/com/simibubi/create/content/fluids/pipes/SmartFluidPipeGenerator.java +++ b/src/main/java/com/simibubi/create/content/fluids/pipes/SmartFluidPipeGenerator.java @@ -5,10 +5,11 @@ import com.tterrag.registrate.providers.DataGenContext; import com.tterrag.registrate.providers.RegistrateBlockstateProvider; +import io.github.fabricators_of_create.porting_lib.models.generators.ModelFile; + import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.properties.AttachFace; -import net.minecraftforge.client.model.generators.ModelFile; public class SmartFluidPipeGenerator extends SpecialBlockStateGen { @@ -27,7 +28,7 @@ protected int getYRotation(BlockState state) { @Override public ModelFile getModel(DataGenContext ctx, RegistrateBlockstateProvider prov, - BlockState state) { + BlockState state) { return AssetLookup.partialBaseModel(ctx, prov); } diff --git a/src/main/java/com/simibubi/create/content/fluids/pipes/VanillaFluidTargets.java b/src/main/java/com/simibubi/create/content/fluids/pipes/VanillaFluidTargets.java index 22debf8b63..61217ae1bc 100644 --- a/src/main/java/com/simibubi/create/content/fluids/pipes/VanillaFluidTargets.java +++ b/src/main/java/com/simibubi/create/content/fluids/pipes/VanillaFluidTargets.java @@ -4,8 +4,6 @@ import com.simibubi.create.AllFluids; -import io.github.fabricators_of_create.porting_lib.extensions.LevelExtensions; -import io.github.fabricators_of_create.porting_lib.transfer.callbacks.TransactionCallback; import io.github.fabricators_of_create.porting_lib.util.FluidStack; import net.fabricmc.fabric.api.transfer.v1.fluid.FluidConstants; @@ -30,20 +28,20 @@ public static boolean shouldPipesConnectTo(BlockState state) { public static FluidStack drainBlock(Level level, BlockPos pos, BlockState state, TransactionContext ctx) { if (state.hasProperty(BlockStateProperties.LEVEL_HONEY) && state.getValue(LEVEL_HONEY) >= 5) { - ((LevelExtensions) level).updateSnapshots(ctx); + level.updateSnapshots(ctx); level.setBlock(pos, state.setValue(LEVEL_HONEY, 0), 3); return new FluidStack(AllFluids.HONEY.get() .getSource(), FluidConstants.BOTTLE); } if (state.getBlock() == Blocks.LAVA_CAULDRON) { - ((LevelExtensions) level).updateSnapshots(ctx); + level.updateSnapshots(ctx); level.setBlock(pos, Blocks.CAULDRON.defaultBlockState(), 3); return new FluidStack(Fluids.LAVA, FluidConstants.BUCKET); } if (state.getBlock() == Blocks.WATER_CAULDRON) { - ((LevelExtensions) level).updateSnapshots(ctx); + level.updateSnapshots(ctx); level.setBlock(pos, Blocks.CAULDRON.defaultBlockState(), 3); return new FluidStack(Fluids.WATER, FluidConstants.BUCKET); } diff --git a/src/main/java/com/simibubi/create/content/fluids/potion/PotionMixingRecipes.java b/src/main/java/com/simibubi/create/content/fluids/potion/PotionMixingRecipes.java index 01d95a6c74..bec9ba69be 100644 --- a/src/main/java/com/simibubi/create/content/fluids/potion/PotionMixingRecipes.java +++ b/src/main/java/com/simibubi/create/content/fluids/potion/PotionMixingRecipes.java @@ -15,12 +15,10 @@ import com.simibubi.create.content.processing.recipe.ProcessingRecipeBuilder; import com.simibubi.create.foundation.fluid.FluidIngredient; -import io.github.fabricators_of_create.porting_lib.brewing.BrewingRecipe; -import io.github.fabricators_of_create.porting_lib.brewing.BrewingRecipeRegistry; -import io.github.fabricators_of_create.porting_lib.brewing.IBrewingRecipe; -import io.github.fabricators_of_create.porting_lib.mixin.common.accessor.PotionBrewing$MixAccessor; -import io.github.fabricators_of_create.porting_lib.mixin.common.accessor.PotionBrewingAccessor; +import io.github.fabricators_of_create.porting_lib.mixin.accessors.common.accessor.PotionBrewing$MixAccessor; +import io.github.fabricators_of_create.porting_lib.mixin.accessors.common.accessor.PotionBrewingAccessor; import io.github.fabricators_of_create.porting_lib.util.FluidStack; +import me.shedaniel.rei.plugin.common.displays.brewing.BrewingRecipe; import net.fabricmc.fabric.api.transfer.v1.fluid.FluidConstants; import net.minecraft.core.Registry; import net.minecraft.resources.ResourceKey; diff --git a/src/main/java/com/simibubi/create/content/fluids/spout/SpoutBlockEntity.java b/src/main/java/com/simibubi/create/content/fluids/spout/SpoutBlockEntity.java index c83b1f4ac4..f765b31066 100644 --- a/src/main/java/com/simibubi/create/content/fluids/spout/SpoutBlockEntity.java +++ b/src/main/java/com/simibubi/create/content/fluids/spout/SpoutBlockEntity.java @@ -27,7 +27,6 @@ import com.simibubi.create.foundation.utility.VecHelper; import io.github.fabricators_of_create.porting_lib.block.CustomRenderBoundingBoxBlockEntity; -import io.github.fabricators_of_create.porting_lib.extensions.BlockEntityExtensions; import io.github.fabricators_of_create.porting_lib.util.FluidStack; import net.fabricmc.fabric.api.transfer.v1.fluid.FluidConstants; import net.fabricmc.fabric.api.transfer.v1.fluid.FluidVariant; @@ -44,7 +43,7 @@ import net.minecraft.world.phys.AABB; import net.minecraft.world.phys.Vec3; -public class SpoutBlockEntity extends SmartBlockEntity implements IHaveGoggleInformation, BlockEntityExtensions, SidedStorageBlockEntity, CustomRenderBoundingBoxBlockEntity { +public class SpoutBlockEntity extends SmartBlockEntity implements IHaveGoggleInformation, SidedStorageBlockEntity, CustomRenderBoundingBoxBlockEntity { public static final int FILLING_TIME = 20; protected BeltProcessingBehaviour beltProcessing; diff --git a/src/main/java/com/simibubi/create/content/fluids/tank/FluidTankGenerator.java b/src/main/java/com/simibubi/create/content/fluids/tank/FluidTankGenerator.java index 183dff0deb..9a72032f20 100644 --- a/src/main/java/com/simibubi/create/content/fluids/tank/FluidTankGenerator.java +++ b/src/main/java/com/simibubi/create/content/fluids/tank/FluidTankGenerator.java @@ -6,9 +6,10 @@ import com.tterrag.registrate.providers.DataGenContext; import com.tterrag.registrate.providers.RegistrateBlockstateProvider; +import io.github.fabricators_of_create.porting_lib.models.generators.ModelFile; + import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.state.BlockState; -import net.minecraftforge.client.model.generators.ModelFile; public class FluidTankGenerator extends SpecialBlockStateGen { @@ -34,7 +35,7 @@ protected int getYRotation(BlockState state) { @Override public ModelFile getModel(DataGenContext ctx, RegistrateBlockstateProvider prov, - BlockState state) { + BlockState state) { Boolean top = state.getValue(FluidTankBlock.TOP); Boolean bottom = state.getValue(FluidTankBlock.BOTTOM); Shape shape = state.getValue(FluidTankBlock.SHAPE); diff --git a/src/main/java/com/simibubi/create/content/fluids/transfer/FluidDrainingBehaviour.java b/src/main/java/com/simibubi/create/content/fluids/transfer/FluidDrainingBehaviour.java index b94047f335..b24f16fabf 100644 --- a/src/main/java/com/simibubi/create/content/fluids/transfer/FluidDrainingBehaviour.java +++ b/src/main/java/com/simibubi/create/content/fluids/transfer/FluidDrainingBehaviour.java @@ -15,7 +15,7 @@ import com.simibubi.create.foundation.utility.BBHelper; import com.simibubi.create.foundation.utility.Iterate; -import io.github.fabricators_of_create.porting_lib.mixin.common.accessor.LiquidBlockAccessor; +import io.github.fabricators_of_create.porting_lib.mixin.accessors.common.accessor.LiquidBlockAccessor; import io.github.fabricators_of_create.porting_lib.transfer.TransferUtil; import io.github.fabricators_of_create.porting_lib.transfer.callbacks.TransactionCallback; import io.github.fabricators_of_create.porting_lib.util.FluidStack; diff --git a/src/main/java/com/simibubi/create/content/kinetics/belt/BeltGenerator.java b/src/main/java/com/simibubi/create/content/kinetics/belt/BeltGenerator.java index 1240b92287..03f3e4605d 100644 --- a/src/main/java/com/simibubi/create/content/kinetics/belt/BeltGenerator.java +++ b/src/main/java/com/simibubi/create/content/kinetics/belt/BeltGenerator.java @@ -4,12 +4,13 @@ import com.tterrag.registrate.providers.DataGenContext; import com.tterrag.registrate.providers.RegistrateBlockstateProvider; +import io.github.fabricators_of_create.porting_lib.models.generators.ModelFile; + import net.minecraft.core.Direction; import net.minecraft.core.Direction.AxisDirection; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.state.BlockState; -import net.minecraftforge.client.model.generators.ModelFile; public class BeltGenerator extends SpecialBlockStateGen { @@ -34,7 +35,7 @@ protected int getYRotation(BlockState state) { @Override public ModelFile getModel(DataGenContext ctx, RegistrateBlockstateProvider prov, - BlockState state) { + BlockState state) { Boolean casing = state.getValue(BeltBlock.CASING); if (!casing) diff --git a/src/main/java/com/simibubi/create/content/kinetics/belt/BeltModel.java b/src/main/java/com/simibubi/create/content/kinetics/belt/BeltModel.java index 477948644a..d4e02b1160 100644 --- a/src/main/java/com/simibubi/create/content/kinetics/belt/BeltModel.java +++ b/src/main/java/com/simibubi/create/content/kinetics/belt/BeltModel.java @@ -8,7 +8,6 @@ import com.simibubi.create.content.kinetics.belt.BeltBlockEntity.RenderData; import com.simibubi.create.foundation.block.render.SpriteShiftEntry; -import io.github.fabricators_of_create.porting_lib.model.CustomParticleIconModel; import net.fabricmc.fabric.api.renderer.v1.model.FabricBakedModel; import net.fabricmc.fabric.api.renderer.v1.model.ForwardingBakedModel; import net.fabricmc.fabric.api.renderer.v1.model.SpriteFinder; diff --git a/src/main/java/com/simibubi/create/content/kinetics/chainDrive/ChainDriveGenerator.java b/src/main/java/com/simibubi/create/content/kinetics/chainDrive/ChainDriveGenerator.java index 8518ef0cc0..fe19b4677d 100644 --- a/src/main/java/com/simibubi/create/content/kinetics/chainDrive/ChainDriveGenerator.java +++ b/src/main/java/com/simibubi/create/content/kinetics/chainDrive/ChainDriveGenerator.java @@ -7,10 +7,11 @@ import com.tterrag.registrate.providers.DataGenContext; import com.tterrag.registrate.providers.RegistrateBlockstateProvider; +import io.github.fabricators_of_create.porting_lib.models.generators.ModelFile; + import net.minecraft.core.Direction.Axis; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.state.BlockState; -import net.minecraftforge.client.model.generators.ModelFile; public class ChainDriveGenerator extends SpecialBlockStateGen { diff --git a/src/main/java/com/simibubi/create/content/kinetics/clock/CuckooClockBlockEntity.java b/src/main/java/com/simibubi/create/content/kinetics/clock/CuckooClockBlockEntity.java index bd7e0dffcb..ea0c863065 100644 --- a/src/main/java/com/simibubi/create/content/kinetics/clock/CuckooClockBlockEntity.java +++ b/src/main/java/com/simibubi/create/content/kinetics/clock/CuckooClockBlockEntity.java @@ -11,7 +11,6 @@ import com.simibubi.create.foundation.utility.VecHelper; import com.simibubi.create.foundation.utility.animation.LerpedFloat; import com.simibubi.create.foundation.utility.animation.LerpedFloat.Chaser; -import io.github.fabricators_of_create.porting_lib.util.DamageSourceHelper; import net.minecraft.core.BlockPos; import net.minecraft.core.particles.ParticleTypes; diff --git a/src/main/java/com/simibubi/create/content/kinetics/crusher/CrushingWheelBlockEntity.java b/src/main/java/com/simibubi/create/content/kinetics/crusher/CrushingWheelBlockEntity.java index 3f466c2e7a..9b9d2d98df 100644 --- a/src/main/java/com/simibubi/create/content/kinetics/crusher/CrushingWheelBlockEntity.java +++ b/src/main/java/com/simibubi/create/content/kinetics/crusher/CrushingWheelBlockEntity.java @@ -8,7 +8,6 @@ import com.simibubi.create.foundation.advancement.AllAdvancements; import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour; import com.simibubi.create.foundation.utility.Iterate; -import io.github.fabricators_of_create.porting_lib.util.DamageSourceHelper; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; @@ -56,13 +55,13 @@ public void lazyTick() { } public static int crushingIsFortunate(DamageSource source, LivingEntity target, int currentLevel, boolean recentlyHit) { - if (!AllDamageTypes.CRUSH.is(event.getDamageSource())) + if (!AllDamageTypes.CRUSH.is(source)) return 0; return 2; //This does not currently increase mob drops. It seems like this only works for damage done by an entity. } public static boolean handleCrushedMobDrops(LivingEntity target, DamageSource source, Collection drops, int lootingLevel, boolean recentlyHit) { - if (!AllDamageTypes.CRUSH.is(event.getSource())) + if (!AllDamageTypes.CRUSH.is(source)) return false; Vec3 outSpeed = Vec3.ZERO; for (ItemEntity outputItem : drops) { diff --git a/src/main/java/com/simibubi/create/content/kinetics/crusher/CrushingWheelControllerBlockEntity.java b/src/main/java/com/simibubi/create/content/kinetics/crusher/CrushingWheelControllerBlockEntity.java index 50a5308f9f..f07c294662 100644 --- a/src/main/java/com/simibubi/create/content/kinetics/crusher/CrushingWheelControllerBlockEntity.java +++ b/src/main/java/com/simibubi/create/content/kinetics/crusher/CrushingWheelControllerBlockEntity.java @@ -5,6 +5,8 @@ import java.util.Optional; import java.util.UUID; +import com.simibubi.create.AllDamageTypes; + import org.jetbrains.annotations.Nullable; import com.simibubi.create.AllRecipeTypes; @@ -20,7 +22,6 @@ import com.simibubi.create.foundation.utility.VecHelper; import com.simibubi.create.infrastructure.config.AllConfigs; -import io.github.fabricators_of_create.porting_lib.transfer.item.ItemTransferable; import io.github.fabricators_of_create.porting_lib.util.EnvExecutor; import io.github.fabricators_of_create.porting_lib.util.ItemStackUtil; import io.github.fabricators_of_create.porting_lib.util.NBTSerializer; diff --git a/src/main/java/com/simibubi/create/content/kinetics/deployer/DeployerFakePlayer.java b/src/main/java/com/simibubi/create/content/kinetics/deployer/DeployerFakePlayer.java index 9bb1bc19ac..581a07cafd 100644 --- a/src/main/java/com/simibubi/create/content/kinetics/deployer/DeployerFakePlayer.java +++ b/src/main/java/com/simibubi/create/content/kinetics/deployer/DeployerFakePlayer.java @@ -7,8 +7,6 @@ import javax.annotation.Nullable; -import io.github.fabricators_of_create.porting_lib.util.UsernameCache; - import org.apache.commons.lang3.tuple.Pair; import com.mojang.authlib.GameProfile; diff --git a/src/main/java/com/simibubi/create/content/kinetics/deployer/DeployerHandler.java b/src/main/java/com/simibubi/create/content/kinetics/deployer/DeployerHandler.java index b8348b4e79..1126372c32 100644 --- a/src/main/java/com/simibubi/create/content/kinetics/deployer/DeployerHandler.java +++ b/src/main/java/com/simibubi/create/content/kinetics/deployer/DeployerHandler.java @@ -6,6 +6,8 @@ import javax.annotation.Nullable; +import io.github.fabricators_of_create.porting_lib.mixin.accessors.common.accessor.BucketItemAccessor; + import org.apache.commons.lang3.tuple.Pair; import com.google.common.collect.Multimap; @@ -22,7 +24,6 @@ import com.simibubi.create.foundation.utility.worldWrappers.WrappedWorld; import io.github.fabricators_of_create.porting_lib.item.UseFirstBehaviorItem; -import io.github.fabricators_of_create.porting_lib.mixin.common.accessor.BucketItemAccessor; import net.fabricmc.fabric.api.event.player.PlayerBlockBreakEvents; import net.fabricmc.fabric.api.event.player.UseBlockCallback; import net.fabricmc.fabric.api.event.player.UseEntityCallback; @@ -154,15 +155,14 @@ private static void activateInner(DeployerFakePlayer player, Vec3 vec, BlockPos InteractionHand hand = InteractionHand.MAIN_HAND; if (!entities.isEmpty()) { Entity entity = entities.get(world.random.nextInt(entities.size())); - List capturedDrops = new ArrayList<>(); boolean success = false; - entity.captureDrops(capturedDrops); + entity.startCapturingDrops(); // Use on entity if (mode == Mode.USE) { InteractionResult cancelResult = UseEntityCallback.EVENT.invoker().interact(player, world, hand, entity, new EntityHitResult(entity)); if (cancelResult == InteractionResult.FAIL) { - entity.captureDrops(null); + entity.finishCapturingDrops(); return; } if (cancelResult == null || cancelResult == InteractionResult.PASS) { @@ -203,7 +203,7 @@ private static void activateInner(DeployerFakePlayer player, Vec3 vec, BlockPos success = true; } - entity.captureDrops(null); + List capturedDrops = entity.finishCapturingDrops(); capturedDrops.forEach(e -> player.getInventory() .placeItemBackInInventory(e.getItem())); if (success) @@ -231,13 +231,13 @@ private static void activateInner(DeployerFakePlayer player, Vec3 vec, BlockPos player.blockBreakingProgress = null; return; } - InteractionResult actionResult = UseBlockCallback.EVENT.invoker().interact(player, player.level, player.getUsedItemHand(), result); + InteractionResult actionResult = UseBlockCallback.EVENT.invoker().interact(player, player.level(), player.getUsedItemHand(), result); if (actionResult == InteractionResult.FAIL) return; if (BlockHelper.extinguishFire(world, player, clickedPos, face)) return; -// if (actionResult != InteractionResult.FAIL) - clickedState.attack(world, clickedPos, player); +// if (actionResult != InteractionResult.FAIL) // fabric: checked above + clickedState.attack(world, clickedPos, player); if (stack.isEmpty()) return; @@ -273,7 +273,7 @@ private static void activateInner(DeployerFakePlayer player, Vec3 vec, BlockPos InteractionResult useItem = InteractionResult.PASS; if (!clickedState.getShape(world, clickedPos) .isEmpty()) { - useBlock = UseBlockCallback.EVENT.invoker().interact(player, player.level, hand, result); + useBlock = UseBlockCallback.EVENT.invoker().interact(player, player.level(), hand, result); useItem = useBlock; } diff --git a/src/main/java/com/simibubi/create/content/kinetics/drill/DrillBlock.java b/src/main/java/com/simibubi/create/content/kinetics/drill/DrillBlock.java index 33cb775d35..46d0b0171f 100644 --- a/src/main/java/com/simibubi/create/content/kinetics/drill/DrillBlock.java +++ b/src/main/java/com/simibubi/create/content/kinetics/drill/DrillBlock.java @@ -14,7 +14,6 @@ import com.simibubi.create.foundation.placement.IPlacementHelper; import com.simibubi.create.foundation.placement.PlacementHelpers; import com.simibubi.create.foundation.placement.PlacementOffset; -import io.github.fabricators_of_create.porting_lib.util.DamageSourceHelper; import net.minecraft.MethodsReturnNonnullByDefault; import net.minecraft.core.BlockPos; @@ -23,7 +22,6 @@ import net.minecraft.util.Mth; import net.minecraft.world.InteractionHand; import net.minecraft.world.InteractionResult; -import net.minecraft.world.damagesource.DamageSource; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.item.ItemEntity; import net.minecraft.world.entity.player.Player; @@ -96,10 +94,10 @@ public boolean hasShaftTowards(LevelReader world, BlockPos pos, BlockState state .getOpposite(); } - @Override - public PushReaction getPistonPushReaction(BlockState state) { - return PushReaction.NORMAL; - } + // fabric: unnecessary +// public PushReaction getPistonPushReaction(BlockState state) { +// return PushReaction.NORMAL; +// } @Override public boolean isPathfindable(BlockState state, BlockGetter reader, BlockPos pos, PathComputationType type) { diff --git a/src/main/java/com/simibubi/create/content/kinetics/fan/AirCurrent.java b/src/main/java/com/simibubi/create/content/kinetics/fan/AirCurrent.java index 6002e5814a..fa35d27ac9 100644 --- a/src/main/java/com/simibubi/create/content/kinetics/fan/AirCurrent.java +++ b/src/main/java/com/simibubi/create/content/kinetics/fan/AirCurrent.java @@ -4,6 +4,8 @@ import java.util.Iterator; import java.util.List; +import com.simibubi.create.foundation.mixin.fabric.ServerGamePacketListenerImplAccessor; + import org.apache.commons.lang3.tuple.Pair; import com.simibubi.create.AllTags; @@ -17,7 +19,6 @@ import com.simibubi.create.foundation.utility.VecHelper; import com.simibubi.create.infrastructure.config.AllConfigs; -import io.github.fabricators_of_create.porting_lib.mixin.common.accessor.ServerGamePacketListenerImplAccessor; import io.github.fabricators_of_create.porting_lib.util.EnvExecutor; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; @@ -108,7 +109,7 @@ protected void tickAffectedEntities(Level world, Direction facing) { () -> () -> enableClientPlayerSound(entity, Mth.clamp(speed / 128f * .4f, 0.01f, .4f))); if (entity instanceof ServerPlayer) - ((ServerGamePacketListenerImplAccessor) ((ServerPlayer) entity).connection).port_lib$setAboveGroundTickCount(0); + ((ServerGamePacketListenerImplAccessor) ((ServerPlayer) entity).connection).create$setAboveGroundTickCount(0); entityDistance -= .5f; FanProcessing.Type processingType = getSegmentAt((float) entityDistance); diff --git a/src/main/java/com/simibubi/create/content/kinetics/fan/FanProcessing.java b/src/main/java/com/simibubi/create/content/kinetics/fan/FanProcessing.java index 2524e420c2..d7045aa85e 100644 --- a/src/main/java/com/simibubi/create/content/kinetics/fan/FanProcessing.java +++ b/src/main/java/com/simibubi/create/content/kinetics/fan/FanProcessing.java @@ -23,7 +23,6 @@ import com.simibubi.create.infrastructure.config.AllConfigs; import io.github.fabricators_of_create.porting_lib.transfer.item.ItemStackHandlerContainer; -import io.github.fabricators_of_create.porting_lib.util.DamageSourceHelper; import io.github.fabricators_of_create.porting_lib.util.NBTSerializer; import net.minecraft.core.BlockPos; import net.minecraft.core.RegistryAccess; diff --git a/src/main/java/com/simibubi/create/content/kinetics/motor/CreativeMotorGenerator.java b/src/main/java/com/simibubi/create/content/kinetics/motor/CreativeMotorGenerator.java index d62a2bbbe6..3a61a92463 100644 --- a/src/main/java/com/simibubi/create/content/kinetics/motor/CreativeMotorGenerator.java +++ b/src/main/java/com/simibubi/create/content/kinetics/motor/CreativeMotorGenerator.java @@ -5,10 +5,11 @@ import com.tterrag.registrate.providers.DataGenContext; import com.tterrag.registrate.providers.RegistrateBlockstateProvider; +import io.github.fabricators_of_create.porting_lib.models.generators.ModelFile; + import net.minecraft.core.Direction; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.state.BlockState; -import net.minecraftforge.client.model.generators.ModelFile; public class CreativeMotorGenerator extends SpecialBlockStateGen { @@ -26,7 +27,7 @@ protected int getYRotation(BlockState state) { @Override public ModelFile getModel(DataGenContext ctx, RegistrateBlockstateProvider prov, - BlockState state) { + BlockState state) { return state.getValue(CreativeMotorBlock.FACING) .getAxis() .isVertical() ? AssetLookup.partialBaseModel(ctx, prov, "vertical") diff --git a/src/main/java/com/simibubi/create/content/kinetics/saw/SawBlock.java b/src/main/java/com/simibubi/create/content/kinetics/saw/SawBlock.java index d90a53870e..6f6a94ac84 100644 --- a/src/main/java/com/simibubi/create/content/kinetics/saw/SawBlock.java +++ b/src/main/java/com/simibubi/create/content/kinetics/saw/SawBlock.java @@ -15,7 +15,6 @@ import com.simibubi.create.foundation.placement.IPlacementHelper; import com.simibubi.create.foundation.placement.PlacementHelpers; import com.simibubi.create.foundation.placement.PlacementOffset; -import io.github.fabricators_of_create.porting_lib.util.DamageSourceHelper; import net.minecraft.MethodsReturnNonnullByDefault; import net.minecraft.core.BlockPos; @@ -24,7 +23,6 @@ import net.minecraft.core.Direction.AxisDirection; import net.minecraft.world.InteractionHand; import net.minecraft.world.InteractionResult; -import net.minecraft.world.damagesource.DamageSource; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.item.ItemEntity; import net.minecraft.world.entity.player.Player; @@ -183,10 +181,10 @@ public void updateEntityAfterFallOn(BlockGetter worldIn, Entity entityIn) { }); } - @Override - public PushReaction getPistonPushReaction(BlockState state) { - return PushReaction.NORMAL; - } + // fabric: unnecessary +// public PushReaction getPistonPushReaction(BlockState state) { +// return PushReaction.NORMAL; +// } public static boolean isHorizontal(BlockState state) { return state.getValue(FACING) diff --git a/src/main/java/com/simibubi/create/content/kinetics/saw/SawGenerator.java b/src/main/java/com/simibubi/create/content/kinetics/saw/SawGenerator.java index 90e90dfb19..9166602aed 100644 --- a/src/main/java/com/simibubi/create/content/kinetics/saw/SawGenerator.java +++ b/src/main/java/com/simibubi/create/content/kinetics/saw/SawGenerator.java @@ -4,10 +4,11 @@ import com.tterrag.registrate.providers.DataGenContext; import com.tterrag.registrate.providers.RegistrateBlockstateProvider; +import io.github.fabricators_of_create.porting_lib.models.generators.ModelFile; + import net.minecraft.core.Direction; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.state.BlockState; -import net.minecraftforge.client.model.generators.ModelFile; public class SawGenerator extends SpecialBlockStateGen { @@ -28,7 +29,7 @@ protected int getYRotation(BlockState state) { @Override public ModelFile getModel(DataGenContext ctx, RegistrateBlockstateProvider prov, - BlockState state) { + BlockState state) { String path = "block/" + ctx.getName() + "/"; String orientation = state.getValue(SawBlock.FACING) .getAxis() diff --git a/src/main/java/com/simibubi/create/content/kinetics/transmission/sequencer/SequencedGearshiftGenerator.java b/src/main/java/com/simibubi/create/content/kinetics/transmission/sequencer/SequencedGearshiftGenerator.java index c27cc05a5a..fd6c694fc0 100644 --- a/src/main/java/com/simibubi/create/content/kinetics/transmission/sequencer/SequencedGearshiftGenerator.java +++ b/src/main/java/com/simibubi/create/content/kinetics/transmission/sequencer/SequencedGearshiftGenerator.java @@ -4,10 +4,11 @@ import com.tterrag.registrate.providers.DataGenContext; import com.tterrag.registrate.providers.RegistrateBlockstateProvider; +import io.github.fabricators_of_create.porting_lib.models.generators.ModelFile; + import net.minecraft.core.Direction.Axis; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.state.BlockState; -import net.minecraftforge.client.model.generators.ModelFile; public class SequencedGearshiftGenerator extends SpecialBlockStateGen { @@ -23,7 +24,7 @@ protected int getYRotation(BlockState state) { @Override public ModelFile getModel(DataGenContext ctx, RegistrateBlockstateProvider prov, - BlockState state) { + BlockState state) { String variant = "idle"; int seq = state.getValue(SequencedGearshiftBlock.STATE); if (seq > 0) diff --git a/src/main/java/com/simibubi/create/content/kinetics/waterwheel/WaterWheelStructuralBlock.java b/src/main/java/com/simibubi/create/content/kinetics/waterwheel/WaterWheelStructuralBlock.java index 02f6191158..b929fd0a98 100644 --- a/src/main/java/com/simibubi/create/content/kinetics/waterwheel/WaterWheelStructuralBlock.java +++ b/src/main/java/com/simibubi/create/content/kinetics/waterwheel/WaterWheelStructuralBlock.java @@ -5,8 +5,6 @@ import com.simibubi.create.foundation.utility.AdventureUtil; -import io.github.fabricators_of_create.porting_lib.block.CustomHitEffectsBlock; - import org.jetbrains.annotations.Nullable; import com.simibubi.create.AllBlocks; diff --git a/src/main/java/com/simibubi/create/content/legacy/ChromaticCompoundItem.java b/src/main/java/com/simibubi/create/content/legacy/ChromaticCompoundItem.java index f7dabbbba7..c3485ad1a4 100644 --- a/src/main/java/com/simibubi/create/content/legacy/ChromaticCompoundItem.java +++ b/src/main/java/com/simibubi/create/content/legacy/ChromaticCompoundItem.java @@ -2,6 +2,8 @@ import java.util.Random; +import io.github.fabricators_of_create.porting_lib.mixin.accessors.common.accessor.BeaconBlockEntityAccessor; + import org.apache.commons.lang3.mutable.MutableBoolean; import com.simibubi.create.AllItems; @@ -17,7 +19,6 @@ import io.github.fabricators_of_create.porting_lib.block.LightEmissiveBlock; import io.github.fabricators_of_create.porting_lib.item.CustomMaxCountItem; import io.github.fabricators_of_create.porting_lib.item.EntityTickListenerItem; -import io.github.fabricators_of_create.porting_lib.mixin.common.accessor.BeaconBlockEntityAccessor; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.core.particles.ParticleTypes; diff --git a/src/main/java/com/simibubi/create/content/logistics/chute/ChuteGenerator.java b/src/main/java/com/simibubi/create/content/logistics/chute/ChuteGenerator.java index 6c7098f237..629d52ab0e 100644 --- a/src/main/java/com/simibubi/create/content/logistics/chute/ChuteGenerator.java +++ b/src/main/java/com/simibubi/create/content/logistics/chute/ChuteGenerator.java @@ -6,10 +6,11 @@ import com.tterrag.registrate.providers.DataGenContext; import com.tterrag.registrate.providers.RegistrateBlockstateProvider; +import io.github.fabricators_of_create.porting_lib.models.generators.ModelFile; + import net.minecraft.core.Direction; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.state.BlockState; -import net.minecraftforge.client.model.generators.ModelFile; public class ChuteGenerator extends SpecialBlockStateGen { @@ -25,7 +26,7 @@ protected int getYRotation(BlockState state) { @Override public ModelFile getModel(DataGenContext ctx, RegistrateBlockstateProvider prov, - BlockState state) { + BlockState state) { boolean horizontal = state.getValue(ChuteBlock.FACING) != Direction.DOWN; ChuteBlock.Shape shape = state.getValue(ChuteBlock.SHAPE); diff --git a/src/main/java/com/simibubi/create/content/logistics/crate/CreativeCrateBlockEntity.java b/src/main/java/com/simibubi/create/content/logistics/crate/CreativeCrateBlockEntity.java index f5399a09b6..da7a37dc75 100644 --- a/src/main/java/com/simibubi/create/content/logistics/crate/CreativeCrateBlockEntity.java +++ b/src/main/java/com/simibubi/create/content/logistics/crate/CreativeCrateBlockEntity.java @@ -8,7 +8,6 @@ import com.simibubi.create.foundation.utility.Lang; -import io.github.fabricators_of_create.porting_lib.transfer.item.ItemTransferable; import net.fabricmc.fabric.api.transfer.v1.item.ItemVariant; import net.fabricmc.fabric.api.transfer.v1.storage.Storage; @@ -17,8 +16,6 @@ import com.jozufozu.flywheel.util.transform.TransformStack; import com.mojang.blaze3d.vertex.PoseStack; -import net.fabricmc.fabric.api.transfer.v1.item.ItemVariant; -import net.fabricmc.fabric.api.transfer.v1.storage.Storage; import net.fabricmc.fabric.api.transfer.v1.storage.base.SidedStorageBlockEntity; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; diff --git a/src/main/java/com/simibubi/create/content/logistics/funnel/BeltFunnelGenerator.java b/src/main/java/com/simibubi/create/content/logistics/funnel/BeltFunnelGenerator.java index 3f3468d530..fc7029d1a4 100644 --- a/src/main/java/com/simibubi/create/content/logistics/funnel/BeltFunnelGenerator.java +++ b/src/main/java/com/simibubi/create/content/logistics/funnel/BeltFunnelGenerator.java @@ -6,11 +6,12 @@ import com.tterrag.registrate.providers.DataGenContext; import com.tterrag.registrate.providers.RegistrateBlockstateProvider; +import io.github.fabricators_of_create.porting_lib.models.generators.ModelFile; + import net.minecraft.resources.ResourceLocation; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.properties.BlockStateProperties; -import net.minecraftforge.client.model.generators.ModelFile; public class BeltFunnelGenerator extends SpecialBlockStateGen { @@ -34,7 +35,7 @@ protected int getYRotation(BlockState state) { @Override public ModelFile getModel(DataGenContext ctx, RegistrateBlockstateProvider prov, - BlockState state) { + BlockState state) { String prefix = "block/funnel/"; Shape shape = state.getValue(BeltFunnelBlock.SHAPE); String shapeName = shape.getSerializedName(); diff --git a/src/main/java/com/simibubi/create/content/logistics/funnel/FunnelGenerator.java b/src/main/java/com/simibubi/create/content/logistics/funnel/FunnelGenerator.java index 67d130ff6c..20b187c42a 100644 --- a/src/main/java/com/simibubi/create/content/logistics/funnel/FunnelGenerator.java +++ b/src/main/java/com/simibubi/create/content/logistics/funnel/FunnelGenerator.java @@ -7,13 +7,14 @@ import com.tterrag.registrate.providers.RegistrateItemModelProvider; import com.tterrag.registrate.util.nullness.NonNullBiConsumer; +import io.github.fabricators_of_create.porting_lib.models.generators.ModelFile; +import io.github.fabricators_of_create.porting_lib.models.generators.block.BlockModelBuilder; + import net.minecraft.core.Direction; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.item.Item; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.state.BlockState; -import net.minecraftforge.client.model.generators.BlockModelBuilder; -import net.minecraftforge.client.model.generators.ModelFile; public class FunnelGenerator extends SpecialBlockStateGen { @@ -39,7 +40,7 @@ protected int getYRotation(BlockState state) { @Override public ModelFile getModel(DataGenContext c, RegistrateBlockstateProvider p, - BlockState s) { + BlockState s) { String prefix = "block/funnel/"; String powered = s.getValue(FunnelBlock.POWERED) ? "_powered" : "_unpowered"; String closed = s.getValue(FunnelBlock.POWERED) ? "_closed" : "_open"; diff --git a/src/main/java/com/simibubi/create/content/processing/basin/BasinGenerator.java b/src/main/java/com/simibubi/create/content/processing/basin/BasinGenerator.java index 1683a5ebad..d895b5f6b3 100644 --- a/src/main/java/com/simibubi/create/content/processing/basin/BasinGenerator.java +++ b/src/main/java/com/simibubi/create/content/processing/basin/BasinGenerator.java @@ -5,9 +5,10 @@ import com.tterrag.registrate.providers.DataGenContext; import com.tterrag.registrate.providers.RegistrateBlockstateProvider; +import io.github.fabricators_of_create.porting_lib.models.generators.ModelFile; + import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.state.BlockState; -import net.minecraftforge.client.model.generators.ModelFile; public class BasinGenerator extends SpecialBlockStateGen { @@ -23,7 +24,7 @@ protected int getYRotation(BlockState state) { @Override public ModelFile getModel(DataGenContext ctx, RegistrateBlockstateProvider prov, - BlockState state) { + BlockState state) { if (state.getValue(BasinBlock.FACING).getAxis().isVertical()) return AssetLookup.partialBaseModel(ctx, prov); return AssetLookup.partialBaseModel(ctx, prov, "directional"); diff --git a/src/main/java/com/simibubi/create/content/processing/burner/BlazeBurnerBlockItem.java b/src/main/java/com/simibubi/create/content/processing/burner/BlazeBurnerBlockItem.java index 416628b83e..cab00fe97a 100644 --- a/src/main/java/com/simibubi/create/content/processing/burner/BlazeBurnerBlockItem.java +++ b/src/main/java/com/simibubi/create/content/processing/burner/BlazeBurnerBlockItem.java @@ -10,13 +10,10 @@ import com.simibubi.create.foundation.utility.RegisteredObjects; import com.simibubi.create.foundation.utility.VecHelper; -import io.github.fabricators_of_create.porting_lib.mixin.common.accessor.BaseSpawnerAccessor; -import io.github.fabricators_of_create.porting_lib.util.AbstractSpawnerHelper; +import io.github.fabricators_of_create.porting_lib.mixin.accessors.common.accessor.BaseSpawnerAccessor; import net.minecraft.MethodsReturnNonnullByDefault; import net.minecraft.core.BlockPos; -import net.minecraft.core.NonNullList; -import net.minecraft.core.Registry; import net.minecraft.core.particles.ParticleTypes; import net.minecraft.resources.ResourceLocation; import net.minecraft.sounds.SoundEvents; diff --git a/src/main/java/com/simibubi/create/content/processing/sequenced/SequencedAssemblyRecipe.java b/src/main/java/com/simibubi/create/content/processing/sequenced/SequencedAssemblyRecipe.java index 9779949896..7a4d4a1154 100644 --- a/src/main/java/com/simibubi/create/content/processing/sequenced/SequencedAssemblyRecipe.java +++ b/src/main/java/com/simibubi/create/content/processing/sequenced/SequencedAssemblyRecipe.java @@ -23,6 +23,7 @@ import net.minecraft.ChatFormatting; import net.minecraft.client.Minecraft; import net.minecraft.core.NonNullList; +import net.minecraft.core.RegistryAccess; import net.minecraft.nbt.CompoundTag; import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; diff --git a/src/main/java/com/simibubi/create/content/redstone/diodes/AbstractDiodeGenerator.java b/src/main/java/com/simibubi/create/content/redstone/diodes/AbstractDiodeGenerator.java index e5abcfb3cb..a7f894b75d 100644 --- a/src/main/java/com/simibubi/create/content/redstone/diodes/AbstractDiodeGenerator.java +++ b/src/main/java/com/simibubi/create/content/redstone/diodes/AbstractDiodeGenerator.java @@ -8,15 +8,16 @@ import com.tterrag.registrate.providers.RegistrateBlockstateProvider; import com.tterrag.registrate.providers.RegistrateItemModelProvider; +import io.github.fabricators_of_create.porting_lib.models.generators.ModelFile; +import io.github.fabricators_of_create.porting_lib.models.generators.ModelFile.ExistingModelFile; +import io.github.fabricators_of_create.porting_lib.models.generators.block.BlockModelProvider; +import io.github.fabricators_of_create.porting_lib.models.generators.item.ItemModelBuilder; + import net.minecraft.resources.ResourceLocation; import net.minecraft.world.item.BlockItem; import net.minecraft.world.item.Item; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.state.BlockState; -import net.minecraftforge.client.model.generators.BlockModelProvider; -import net.minecraftforge.client.model.generators.ItemModelBuilder; -import net.minecraftforge.client.model.generators.ModelFile; -import net.minecraftforge.client.model.generators.ModelFile.ExistingModelFile; public abstract class AbstractDiodeGenerator extends SpecialBlockStateGen { diff --git a/src/main/java/com/simibubi/create/content/redstone/diodes/BrassDiodeGenerator.java b/src/main/java/com/simibubi/create/content/redstone/diodes/BrassDiodeGenerator.java index dc3055f4cf..97b1b070dd 100644 --- a/src/main/java/com/simibubi/create/content/redstone/diodes/BrassDiodeGenerator.java +++ b/src/main/java/com/simibubi/create/content/redstone/diodes/BrassDiodeGenerator.java @@ -4,11 +4,12 @@ import com.tterrag.registrate.providers.DataGenContext; +import io.github.fabricators_of_create.porting_lib.models.generators.ModelFile; +import io.github.fabricators_of_create.porting_lib.models.generators.block.BlockModelProvider; + import net.minecraft.resources.ResourceLocation; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.state.BlockState; -import net.minecraftforge.client.model.generators.BlockModelProvider; -import net.minecraftforge.client.model.generators.ModelFile; public class BrassDiodeGenerator extends AbstractDiodeGenerator { diff --git a/src/main/java/com/simibubi/create/content/redstone/diodes/PoweredLatchGenerator.java b/src/main/java/com/simibubi/create/content/redstone/diodes/PoweredLatchGenerator.java index 5928f3649c..fbe897b254 100644 --- a/src/main/java/com/simibubi/create/content/redstone/diodes/PoweredLatchGenerator.java +++ b/src/main/java/com/simibubi/create/content/redstone/diodes/PoweredLatchGenerator.java @@ -4,11 +4,12 @@ import com.tterrag.registrate.providers.DataGenContext; +import io.github.fabricators_of_create.porting_lib.models.generators.ModelFile; +import io.github.fabricators_of_create.porting_lib.models.generators.block.BlockModelProvider; + import net.minecraft.resources.ResourceLocation; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.state.BlockState; -import net.minecraftforge.client.model.generators.BlockModelProvider; -import net.minecraftforge.client.model.generators.ModelFile; public class PoweredLatchGenerator extends AbstractDiodeGenerator { diff --git a/src/main/java/com/simibubi/create/content/redstone/diodes/ToggleLatchGenerator.java b/src/main/java/com/simibubi/create/content/redstone/diodes/ToggleLatchGenerator.java index c98d3a51a7..9d92aea097 100644 --- a/src/main/java/com/simibubi/create/content/redstone/diodes/ToggleLatchGenerator.java +++ b/src/main/java/com/simibubi/create/content/redstone/diodes/ToggleLatchGenerator.java @@ -4,11 +4,12 @@ import com.tterrag.registrate.providers.DataGenContext; +import io.github.fabricators_of_create.porting_lib.models.generators.ModelFile; +import io.github.fabricators_of_create.porting_lib.models.generators.block.BlockModelProvider; + import net.minecraft.resources.ResourceLocation; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.state.BlockState; -import net.minecraftforge.client.model.generators.BlockModelProvider; -import net.minecraftforge.client.model.generators.ModelFile; public class ToggleLatchGenerator extends AbstractDiodeGenerator { diff --git a/src/main/java/com/simibubi/create/content/redstone/link/RedstoneLinkGenerator.java b/src/main/java/com/simibubi/create/content/redstone/link/RedstoneLinkGenerator.java index bbee913fe7..c6ff5166bf 100644 --- a/src/main/java/com/simibubi/create/content/redstone/link/RedstoneLinkGenerator.java +++ b/src/main/java/com/simibubi/create/content/redstone/link/RedstoneLinkGenerator.java @@ -4,10 +4,11 @@ import com.tterrag.registrate.providers.DataGenContext; import com.tterrag.registrate.providers.RegistrateBlockstateProvider; +import io.github.fabricators_of_create.porting_lib.models.generators.ModelFile; + import net.minecraft.core.Direction; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.state.BlockState; -import net.minecraftforge.client.model.generators.ModelFile; public class RedstoneLinkGenerator extends SpecialBlockStateGen { @@ -26,7 +27,7 @@ protected int getYRotation(BlockState state) { @Override public ModelFile getModel(DataGenContext ctx, RegistrateBlockstateProvider prov, - BlockState state) { + BlockState state) { String variant = state.getValue(RedstoneLinkBlock.RECEIVER) ? "receiver" : "transmitter"; if (state.getValue(RedstoneLinkBlock.FACING).getAxis().isHorizontal()) variant += "_vertical"; diff --git a/src/main/java/com/simibubi/create/content/redstone/link/controller/LinkedControllerScreen.java b/src/main/java/com/simibubi/create/content/redstone/link/controller/LinkedControllerScreen.java index 9b5f7b0d97..b5645aaafc 100644 --- a/src/main/java/com/simibubi/create/content/redstone/link/controller/LinkedControllerScreen.java +++ b/src/main/java/com/simibubi/create/content/redstone/link/controller/LinkedControllerScreen.java @@ -14,7 +14,8 @@ import com.simibubi.create.foundation.gui.widget.IconButton; import com.simibubi.create.foundation.utility.ControlsUtil; import com.simibubi.create.foundation.utility.Lang; -import io.github.fabricators_of_create.porting_lib.mixin.common.accessor.SlotAccessor; + +import io.github.fabricators_of_create.porting_lib.mixin.accessors.common.accessor.SlotAccessor; import io.github.fabricators_of_create.porting_lib.util.ItemStackUtil; import io.github.fabricators_of_create.porting_lib.util.PlayerEntityHelper; diff --git a/src/main/java/com/simibubi/create/content/redstone/nixieTube/NixieTubeGenerator.java b/src/main/java/com/simibubi/create/content/redstone/nixieTube/NixieTubeGenerator.java index 63e0277d06..ff250353a1 100644 --- a/src/main/java/com/simibubi/create/content/redstone/nixieTube/NixieTubeGenerator.java +++ b/src/main/java/com/simibubi/create/content/redstone/nixieTube/NixieTubeGenerator.java @@ -5,9 +5,10 @@ import com.tterrag.registrate.providers.DataGenContext; import com.tterrag.registrate.providers.RegistrateBlockstateProvider; +import io.github.fabricators_of_create.porting_lib.models.generators.ModelFile; + import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.state.BlockState; -import net.minecraftforge.client.model.generators.ModelFile; public class NixieTubeGenerator extends SpecialBlockStateGen { @@ -26,7 +27,7 @@ protected int getYRotation(BlockState state) { @Override public ModelFile getModel(DataGenContext ctx, RegistrateBlockstateProvider prov, - BlockState state) { + BlockState state) { return prov.models() .withExistingParent(ctx.getName(), prov.modLoc("block/nixie_tube/block")); } diff --git a/src/main/java/com/simibubi/create/content/redstone/rail/ControllerRailGenerator.java b/src/main/java/com/simibubi/create/content/redstone/rail/ControllerRailGenerator.java index a363005447..3dbceccfef 100644 --- a/src/main/java/com/simibubi/create/content/redstone/rail/ControllerRailGenerator.java +++ b/src/main/java/com/simibubi/create/content/redstone/rail/ControllerRailGenerator.java @@ -5,11 +5,12 @@ import com.tterrag.registrate.providers.DataGenContext; import com.tterrag.registrate.providers.RegistrateBlockstateProvider; +import io.github.fabricators_of_create.porting_lib.models.generators.ModelFile; + import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.properties.Property; import net.minecraft.world.level.block.state.properties.RailShape; -import net.minecraftforge.client.model.generators.ModelFile; public class ControllerRailGenerator extends SpecialBlockStateGen { @@ -44,7 +45,7 @@ protected int getYRotation(BlockState state) { @Override public ModelFile getModel(DataGenContext ctx, RegistrateBlockstateProvider prov, - BlockState state) { + BlockState state) { RailShape shape = state.getValue(ControllerRailBlock.SHAPE); boolean backwards = ControllerRailBlock.isStateBackwards(state); diff --git a/src/main/java/com/simibubi/create/content/redstone/smartObserver/SmartObserverGenerator.java b/src/main/java/com/simibubi/create/content/redstone/smartObserver/SmartObserverGenerator.java index 9f7f73289c..6f8ceadcc5 100644 --- a/src/main/java/com/simibubi/create/content/redstone/smartObserver/SmartObserverGenerator.java +++ b/src/main/java/com/simibubi/create/content/redstone/smartObserver/SmartObserverGenerator.java @@ -6,9 +6,10 @@ import com.tterrag.registrate.providers.DataGenContext; import com.tterrag.registrate.providers.RegistrateBlockstateProvider; +import io.github.fabricators_of_create.porting_lib.models.generators.ModelFile; + import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.state.BlockState; -import net.minecraftforge.client.model.generators.ModelFile; public class SmartObserverGenerator extends SpecialBlockStateGen { @@ -28,7 +29,7 @@ protected int getYRotation(BlockState state) { @Override public ModelFile getModel(DataGenContext ctx, RegistrateBlockstateProvider prov, - BlockState state) { + BlockState state) { return AssetLookup.forPowered(ctx, prov) .apply(state); } diff --git a/src/main/java/com/simibubi/create/content/redstone/thresholdSwitch/ThresholdSwitchGenerator.java b/src/main/java/com/simibubi/create/content/redstone/thresholdSwitch/ThresholdSwitchGenerator.java index d85e974d68..b98cc664a2 100644 --- a/src/main/java/com/simibubi/create/content/redstone/thresholdSwitch/ThresholdSwitchGenerator.java +++ b/src/main/java/com/simibubi/create/content/redstone/thresholdSwitch/ThresholdSwitchGenerator.java @@ -6,9 +6,10 @@ import com.tterrag.registrate.providers.DataGenContext; import com.tterrag.registrate.providers.RegistrateBlockstateProvider; +import io.github.fabricators_of_create.porting_lib.models.generators.ModelFile; + import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.state.BlockState; -import net.minecraftforge.client.model.generators.ModelFile; public class ThresholdSwitchGenerator extends SpecialBlockStateGen { @@ -24,7 +25,7 @@ protected int getYRotation(BlockState state) { @Override public ModelFile getModel(DataGenContext ctx, RegistrateBlockstateProvider prov, - BlockState state) { + BlockState state) { int level = state.getValue(ThresholdSwitchBlock.LEVEL); String path = "threshold_switch/block_" + Lang.asId(state.getValue(ThresholdSwitchBlock.TARGET) .name()); diff --git a/src/main/java/com/simibubi/create/content/schematics/SchematicProcessor.java b/src/main/java/com/simibubi/create/content/schematics/SchematicProcessor.java index 05c518b25b..76a65f4bd4 100644 --- a/src/main/java/com/simibubi/create/content/schematics/SchematicProcessor.java +++ b/src/main/java/com/simibubi/create/content/schematics/SchematicProcessor.java @@ -7,7 +7,8 @@ import com.mojang.serialization.Codec; import com.simibubi.create.AllStructureProcessorTypes; import com.simibubi.create.foundation.utility.NBTProcessors; -import io.github.fabricators_of_create.porting_lib.extensions.StructureProcessorExtensions; + +import io.github.fabricators_of_create.porting_lib.extensions.extensions.StructureProcessorExtensions; import net.minecraft.core.BlockPos; import net.minecraft.nbt.CompoundTag; diff --git a/src/main/java/com/simibubi/create/content/schematics/cannon/SchematicannonRenderer.java b/src/main/java/com/simibubi/create/content/schematics/cannon/SchematicannonRenderer.java index 07c898377c..ba90f74820 100644 --- a/src/main/java/com/simibubi/create/content/schematics/cannon/SchematicannonRenderer.java +++ b/src/main/java/com/simibubi/create/content/schematics/cannon/SchematicannonRenderer.java @@ -15,16 +15,14 @@ import com.simibubi.create.foundation.blockEntity.renderer.SafeBlockEntityRenderer; import com.simibubi.create.foundation.render.CachedBufferer; import com.simibubi.create.foundation.render.SuperByteBuffer; -import io.github.fabricators_of_create.porting_lib.mixin.client.accessor.BlockRenderDispatcherAccessor; -import io.github.fabricators_of_create.porting_lib.render.virtual.FixedLightBakedModel; +import io.github.fabricators_of_create.porting_lib.mixin.accessors.client.accessor.BlockRenderDispatcherAccessor; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.ItemBlockRenderTypes; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.RenderType; import net.minecraft.client.renderer.block.BlockRenderDispatcher; import net.minecraft.client.renderer.block.model.ItemTransforms; -import net.minecraft.client.renderer.block.model.ItemTransforms.TransformType; import net.minecraft.client.renderer.blockentity.BlockEntityRendererProvider; import net.minecraft.client.resources.model.BakedModel; import net.minecraft.core.BlockPos; @@ -32,6 +30,7 @@ import net.minecraft.core.particles.ParticleTypes; import net.minecraft.util.Mth; import net.minecraft.util.RandomSource; +import net.minecraft.world.item.ItemDisplayContext; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.phys.Vec3; diff --git a/src/main/java/com/simibubi/create/content/schematics/client/SchematicRenderer.java b/src/main/java/com/simibubi/create/content/schematics/client/SchematicRenderer.java index 4846cc35fd..6362c440a6 100644 --- a/src/main/java/com/simibubi/create/content/schematics/client/SchematicRenderer.java +++ b/src/main/java/com/simibubi/create/content/schematics/client/SchematicRenderer.java @@ -6,10 +6,7 @@ import com.jozufozu.flywheel.core.model.ModelUtil; import com.jozufozu.flywheel.core.model.ShadeSeparatedBufferedData; import com.jozufozu.flywheel.core.model.ShadeSeparatingVertexConsumer; -import com.jozufozu.flywheel.fabric.model.CullingBakedModel; -import com.jozufozu.flywheel.fabric.model.FabricModelUtil; import com.jozufozu.flywheel.fabric.model.LayerFilteringBakedModel; -import com.jozufozu.flywheel.util.Pair; import com.mojang.blaze3d.vertex.BufferBuilder; import com.mojang.blaze3d.vertex.DefaultVertexFormat; import com.mojang.blaze3d.vertex.PoseStack; diff --git a/src/main/java/com/simibubi/create/content/trains/display/FlapDisplayRenderer.java b/src/main/java/com/simibubi/create/content/trains/display/FlapDisplayRenderer.java index 8c09dcd2b4..285c652986 100644 --- a/src/main/java/com/simibubi/create/content/trains/display/FlapDisplayRenderer.java +++ b/src/main/java/com/simibubi/create/content/trains/display/FlapDisplayRenderer.java @@ -2,6 +2,8 @@ import java.util.List; +import io.github.fabricators_of_create.porting_lib.mixin.accessors.client.accessor.FontAccessor; + import org.joml.Matrix4f; import com.jozufozu.flywheel.util.transform.TransformStack; @@ -16,7 +18,6 @@ import com.simibubi.create.foundation.utility.AngleHelper; import com.simibubi.create.foundation.utility.AnimationTickHolder; -import io.github.fabricators_of_create.porting_lib.mixin.client.accessor.FontAccessor; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.Font; import net.minecraft.client.gui.font.FontSet; diff --git a/src/main/java/com/simibubi/create/content/trains/schedule/DestinationSuggestions.java b/src/main/java/com/simibubi/create/content/trains/schedule/DestinationSuggestions.java index 2a3730aaea..d1d8ca21dc 100644 --- a/src/main/java/com/simibubi/create/content/trains/schedule/DestinationSuggestions.java +++ b/src/main/java/com/simibubi/create/content/trains/schedule/DestinationSuggestions.java @@ -6,9 +6,9 @@ import com.mojang.brigadier.context.StringRange; import com.mojang.brigadier.suggestion.Suggestion; import com.simibubi.create.foundation.utility.IntAttached; -import com.simibubi.create.foundation.utility.LongAttached; -import io.github.fabricators_of_create.porting_lib.mixin.client.accessor.CommandSuggestions$SuggestionsListAccessor; +import io.github.fabricators_of_create.porting_lib.mixin.accessors.client.accessor.CommandSuggestions$SuggestionsListAccessor; + import net.minecraft.client.Minecraft; import net.minecraft.client.gui.Font; import net.minecraft.client.gui.components.CommandSuggestions; diff --git a/src/main/java/com/simibubi/create/content/trains/schedule/ScheduleItem.java b/src/main/java/com/simibubi/create/content/trains/schedule/ScheduleItem.java index 2ac52a869e..fc6104a08e 100644 --- a/src/main/java/com/simibubi/create/content/trains/schedule/ScheduleItem.java +++ b/src/main/java/com/simibubi/create/content/trains/schedule/ScheduleItem.java @@ -15,7 +15,6 @@ import com.simibubi.create.foundation.utility.Lang; import io.github.fabricators_of_create.porting_lib.util.NetworkHooks; -import io.github.fabricators_of_create.porting_lib.util.NetworkUtil; import net.minecraft.ChatFormatting; import net.minecraft.core.BlockPos; import net.minecraft.network.chat.Component; diff --git a/src/main/java/com/simibubi/create/content/trains/schedule/ScheduleScreen.java b/src/main/java/com/simibubi/create/content/trains/schedule/ScheduleScreen.java index 7df82f4b5e..098525b77b 100644 --- a/src/main/java/com/simibubi/create/content/trains/schedule/ScheduleScreen.java +++ b/src/main/java/com/simibubi/create/content/trains/schedule/ScheduleScreen.java @@ -49,9 +49,7 @@ import com.simibubi.create.foundation.utility.animation.LerpedFloat; import com.simibubi.create.foundation.utility.animation.LerpedFloat.Chaser; -import io.github.fabricators_of_create.porting_lib.mixin.client.accessor.ScreenAccessor; import io.github.fabricators_of_create.porting_lib.util.KeyBindingHelper; -import io.github.fabricators_of_create.porting_lib.util.client.ScreenUtils; import net.minecraft.ChatFormatting; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.Font; diff --git a/src/main/java/com/simibubi/create/content/trains/schedule/TrainHatArmorLayer.java b/src/main/java/com/simibubi/create/content/trains/schedule/TrainHatArmorLayer.java index f330df51f2..00c16b19e6 100644 --- a/src/main/java/com/simibubi/create/content/trains/schedule/TrainHatArmorLayer.java +++ b/src/main/java/com/simibubi/create/content/trains/schedule/TrainHatArmorLayer.java @@ -10,7 +10,7 @@ import com.simibubi.create.foundation.render.CachedBufferer; import com.simibubi.create.foundation.utility.Couple; -import io.github.fabricators_of_create.porting_lib.mixin.client.accessor.ModelPartAccessor; +import io.github.fabricators_of_create.porting_lib.mixin.accessors.client.accessor.ModelPartAccessor; import net.fabricmc.fabric.api.client.rendering.v1.LivingEntityFeatureRendererRegistrationCallback.RegistrationHelper; import net.minecraft.client.model.AgeableListModel; import net.minecraft.client.model.AxolotlModel; @@ -63,7 +63,7 @@ public void render(PoseStack ms, MultiBufferSource buffer, int light, LivingEnti TransformStack msr = TransformStack.cast(ms); float scale = 1; - if (entityModel instanceof AgeableListModel model && entityModel instanceof io.github.fabricators_of_create.porting_lib.mixin.client.accessor.AgeableListModelAccessor access) { + if (entityModel instanceof AgeableListModel model && entityModel instanceof io.github.fabricators_of_create.porting_lib.mixin.accessors.client.accessor.AgeableListModelAccessor access) { if (model.young) { if (access.porting_lib$scaleHead()) { float f = 1.5F / access.porting_lib$babyHeadScale(); diff --git a/src/main/java/com/simibubi/create/content/trains/station/NoShadowFontWrapper.java b/src/main/java/com/simibubi/create/content/trains/station/NoShadowFontWrapper.java index e95530b7a8..384dd4f5b0 100644 --- a/src/main/java/com/simibubi/create/content/trains/station/NoShadowFontWrapper.java +++ b/src/main/java/com/simibubi/create/content/trains/station/NoShadowFontWrapper.java @@ -2,9 +2,10 @@ import java.util.List; +import io.github.fabricators_of_create.porting_lib.mixin.accessors.client.accessor.FontAccessor; + import org.joml.Matrix4f; -import io.github.fabricators_of_create.porting_lib.mixin.client.accessor.FontAccessor; import net.minecraft.client.StringSplitter; import net.minecraft.client.gui.Font; import net.minecraft.client.gui.font.FontSet; @@ -26,14 +27,14 @@ public NoShadowFontWrapper(Font wrapped) { public FontSet getFontSet(ResourceLocation pFontLocation) { return ((FontAccessor) wrapped).port_lib$getFontSet(pFontLocation); } - + @Override public int drawInBatch(Component pText, float pX, float pY, int pColor, boolean pDropShadow, Matrix4f pMatrix, MultiBufferSource pBuffer, DisplayMode pDisplayMode, int pBackgroundColor, int pPackedLightCoords) { return wrapped.drawInBatch(pText, pX, pY, pColor, false, pMatrix, pBuffer, pDisplayMode, pBackgroundColor, pPackedLightCoords); } - + @Override public int drawInBatch(FormattedCharSequence pText, float pX, float pY, int pColor, boolean pDropShadow, Matrix4f pMatrix, MultiBufferSource pBuffer, DisplayMode pDisplayMode, int pBackgroundColor, @@ -41,14 +42,14 @@ public int drawInBatch(FormattedCharSequence pText, float pX, float pY, int pCol return wrapped.drawInBatch(pText, pX, pY, pColor, false, pMatrix, pBuffer, pDisplayMode, pBackgroundColor, pPackedLightCoords); } - + @Override public int drawInBatch(String pText, float pX, float pY, int pColor, boolean pDropShadow, Matrix4f pMatrix, MultiBufferSource pBuffer, DisplayMode pDisplayMode, int pBackgroundColor, int pPackedLightCoords) { return wrapped.drawInBatch(pText, pX, pY, pColor, false, pMatrix, pBuffer, pDisplayMode, pBackgroundColor, pPackedLightCoords); } - + @Override public int drawInBatch(String pText, float pX, float pY, int pColor, boolean pDropShadow, Matrix4f pMatrix, MultiBufferSource pBuffer, DisplayMode pDisplayMode, int pBackgroundColor, int pPackedLightCoords, @@ -56,12 +57,12 @@ public int drawInBatch(String pText, float pX, float pY, int pColor, boolean pDr return wrapped.drawInBatch(pText, pX, pY, pColor, false, pMatrix, pBuffer, pDisplayMode, pBackgroundColor, pPackedLightCoords, pBidirectional); } - + @Override public FormattedText ellipsize(FormattedText text, int maxWidth) { return wrapped.ellipsize(text, maxWidth); } - + @Override public int wordWrapHeight(FormattedText pText, int pMaxWidth) { return wrapped.wordWrapHeight(pText, pMaxWidth); diff --git a/src/main/java/com/simibubi/create/content/trains/track/TrackBlock.java b/src/main/java/com/simibubi/create/content/trains/track/TrackBlock.java index 7b83d4d1de..9fb191799f 100644 --- a/src/main/java/com/simibubi/create/content/trains/track/TrackBlock.java +++ b/src/main/java/com/simibubi/create/content/trains/track/TrackBlock.java @@ -51,7 +51,6 @@ import com.simibubi.create.foundation.utility.Pair; import com.simibubi.create.foundation.utility.VecHelper; -import io.github.fabricators_of_create.porting_lib.block.CustomPathNodeTypeBlock; import it.unimi.dsi.fastutil.objects.Object2IntArrayMap; import it.unimi.dsi.fastutil.objects.Object2IntMap; import net.fabricmc.api.EnvType; @@ -186,10 +185,10 @@ public BlockState getStateForPlacement(BlockPlaceContext ctx) { return stateForPlacement.setValue(SHAPE, best); } - @Override - public PushReaction getPistonPushReaction(BlockState pState) { - return PushReaction.BLOCK; - } + // fabric: moved to block setting +// public PushReaction getPistonPushReaction(BlockState pState) { +// return PushReaction.BLOCK; +// } @Override public void playerWillDestroy(Level pLevel, BlockPos pPos, BlockState pState, Player pPlayer) { diff --git a/src/main/java/com/simibubi/create/content/trains/track/TrackBlockStateGenerator.java b/src/main/java/com/simibubi/create/content/trains/track/TrackBlockStateGenerator.java index 81e1931c1d..4fb50411f0 100644 --- a/src/main/java/com/simibubi/create/content/trains/track/TrackBlockStateGenerator.java +++ b/src/main/java/com/simibubi/create/content/trains/track/TrackBlockStateGenerator.java @@ -5,9 +5,10 @@ import com.tterrag.registrate.providers.DataGenContext; import com.tterrag.registrate.providers.RegistrateBlockstateProvider; +import io.github.fabricators_of_create.porting_lib.models.generators.ModelFile; + import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.state.BlockState; -import net.minecraftforge.client.model.generators.ModelFile; public class TrackBlockStateGenerator extends SpecialBlockStateGen { @@ -24,7 +25,7 @@ protected int getYRotation(BlockState state) { @Override public ModelFile getModel(DataGenContext ctx, RegistrateBlockstateProvider prov, - BlockState state) { + BlockState state) { TrackShape value = state.getValue(TrackBlock.SHAPE); if (value == TrackShape.NONE) return prov.models() diff --git a/src/main/java/com/simibubi/create/content/trains/track/TrackMaterialFactory.java b/src/main/java/com/simibubi/create/content/trains/track/TrackMaterialFactory.java index a4b7299b23..df447e0c9a 100644 --- a/src/main/java/com/simibubi/create/content/trains/track/TrackMaterialFactory.java +++ b/src/main/java/com/simibubi/create/content/trains/track/TrackMaterialFactory.java @@ -3,13 +3,14 @@ import java.util.function.Supplier; import java.util.stream.Stream; +import io.github.fabricators_of_create.porting_lib.mixin.accessors.common.accessor.TagValueAccessor; + import org.jetbrains.annotations.Nullable; import com.jozufozu.flywheel.core.PartialModel; import com.simibubi.create.AllTags; import com.tterrag.registrate.util.nullness.NonNullSupplier; -import io.github.fabricators_of_create.porting_lib.mixin.common.accessor.TagValueAccessor; import io.github.fabricators_of_create.porting_lib.util.EnvExecutor; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; diff --git a/src/main/java/com/simibubi/create/foundation/block/CopperBlockSet.java b/src/main/java/com/simibubi/create/foundation/block/CopperBlockSet.java index 25d2b3c28a..c031f08167 100644 --- a/src/main/java/com/simibubi/create/foundation/block/CopperBlockSet.java +++ b/src/main/java/com/simibubi/create/foundation/block/CopperBlockSet.java @@ -7,6 +7,8 @@ import java.util.Objects; import java.util.function.Supplier; +import io.github.fabricators_of_create.porting_lib.models.generators.ModelProvider; + import org.apache.commons.lang3.ArrayUtils; import com.simibubi.create.foundation.data.TagGen; @@ -24,7 +26,6 @@ import com.tterrag.registrate.util.nullness.NonNullBiConsumer; import com.tterrag.registrate.util.nullness.NonNullFunction; -import io.github.fabricators_of_create.porting_lib.mixin.common.accessor.StairBlockAccessor; import net.minecraft.data.recipes.RecipeCategory; import net.minecraft.data.recipes.ShapelessRecipeBuilder; import net.minecraft.resources.ResourceLocation; @@ -40,7 +41,6 @@ import net.minecraft.world.level.block.WeatheringCopperStairBlock; import net.minecraft.world.level.block.state.BlockBehaviour.Properties; import net.minecraft.world.level.block.state.BlockState; -import net.minecraftforge.client.model.generators.ModelProvider; public class CopperBlockSet { protected static final WeatherState[] WEATHER_STATES = WeatherState.values(); @@ -321,7 +321,7 @@ public NonNullFunction getFactory(CopperBlockSet blocks, Supplier defaultStateSupplier = () -> blocks.get(parent, state, waxed) .getDefaultState(); if (waxed) { - return p -> StairBlockAccessor.port_lib$init(defaultStateSupplier.get(), p); + return p -> new StairBlock(defaultStateSupplier.get(), p); } else { return p -> { WeatheringCopperStairBlock block = diff --git a/src/main/java/com/simibubi/create/foundation/blockEntity/SyncedBlockEntity.java b/src/main/java/com/simibubi/create/foundation/blockEntity/SyncedBlockEntity.java index 4a05f917f4..5abc19731b 100644 --- a/src/main/java/com/simibubi/create/foundation/blockEntity/SyncedBlockEntity.java +++ b/src/main/java/com/simibubi/create/foundation/blockEntity/SyncedBlockEntity.java @@ -4,7 +4,6 @@ import io.github.fabricators_of_create.porting_lib.block.CustomDataPacketHandlingBlockEntity; import io.github.fabricators_of_create.porting_lib.block.CustomUpdateTagHandlingBlockEntity; -import io.github.fabricators_of_create.porting_lib.extensions.BlockEntityExtensions; import net.minecraft.MethodsReturnNonnullByDefault; import net.minecraft.core.BlockPos; @@ -23,7 +22,7 @@ @MethodsReturnNonnullByDefault @ParametersAreNonnullByDefault -public abstract class SyncedBlockEntity extends BlockEntity implements BlockEntityExtensions, CustomDataPacketHandlingBlockEntity, CustomUpdateTagHandlingBlockEntity { +public abstract class SyncedBlockEntity extends BlockEntity implements CustomDataPacketHandlingBlockEntity, CustomUpdateTagHandlingBlockEntity { public SyncedBlockEntity(BlockEntityType type, BlockPos pos, BlockState state) { super(type, pos, state); diff --git a/src/main/java/com/simibubi/create/foundation/collision/Matrix3d.java b/src/main/java/com/simibubi/create/foundation/collision/Matrix3d.java index d519102ebb..0232521d51 100644 --- a/src/main/java/com/simibubi/create/foundation/collision/Matrix3d.java +++ b/src/main/java/com/simibubi/create/foundation/collision/Matrix3d.java @@ -1,7 +1,6 @@ package com.simibubi.create.foundation.collision; import org.joml.Matrix4f; -import io.github.fabricators_of_create.porting_lib.util.Matrix4fHelper; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; @@ -143,7 +142,7 @@ public Matrix4f getAsMatrix4f() { conversionBuffer[9] = (float) m21; conversionBuffer[10] = (float) m22; - return Matrix4fHelper.fromFloatArray().setTransposed(conversionBuffer); + return new Matrix4f().setTransposed(conversionBuffer); } } diff --git a/src/main/java/com/simibubi/create/foundation/config/ui/ConfigModListScreen.java b/src/main/java/com/simibubi/create/foundation/config/ui/ConfigModListScreen.java index 2d399cdba6..5dc1d5c8b1 100644 --- a/src/main/java/com/simibubi/create/foundation/config/ui/ConfigModListScreen.java +++ b/src/main/java/com/simibubi/create/foundation/config/ui/ConfigModListScreen.java @@ -6,6 +6,10 @@ import com.simibubi.create.foundation.utility.Components; +import io.github.fabricators_of_create.porting_lib.mixin.accessors.client.accessor.AbstractSelectionListAccessor; + +import io.github.fabricators_of_create.porting_lib.mixin.accessors.client.accessor.AbstractWidgetAccessor; + import org.lwjgl.glfw.GLFW; import com.mojang.blaze3d.vertex.PoseStack; @@ -17,11 +21,9 @@ import com.simibubi.create.foundation.gui.widget.BoxWidget; import com.simibubi.create.foundation.item.TooltipHelper; import com.simibubi.create.foundation.item.TooltipHelper.Palette; -import io.github.fabricators_of_create.porting_lib.mixin.client.accessor.AbstractSelectionListAccessor; -import io.github.fabricators_of_create.porting_lib.mixin.client.accessor.AbstractWidgetAccessor; import net.fabricmc.loader.api.FabricLoader; -import net.minecraft.ChatFormatting; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.screens.Screen; public class ConfigModListScreen extends ConfigScreen { diff --git a/src/main/java/com/simibubi/create/foundation/config/ui/SubMenuConfigScreen.java b/src/main/java/com/simibubi/create/foundation/config/ui/SubMenuConfigScreen.java index 8f0606aa9b..2c39810750 100644 --- a/src/main/java/com/simibubi/create/foundation/config/ui/SubMenuConfigScreen.java +++ b/src/main/java/com/simibubi/create/foundation/config/ui/SubMenuConfigScreen.java @@ -14,6 +14,8 @@ import javax.annotation.Nonnull; import javax.annotation.Nullable; +import io.github.fabricators_of_create.porting_lib.mixin.accessors.client.accessor.AbstractSelectionListAccessor; + import org.lwjgl.glfw.GLFW; import com.electronwill.nightconfig.core.AbstractConfig; @@ -40,7 +42,6 @@ import com.simibubi.create.foundation.utility.Components; import com.simibubi.create.foundation.utility.Couple; import com.simibubi.create.foundation.utility.Pair; -import io.github.fabricators_of_create.porting_lib.mixin.client.accessor.AbstractSelectionListAccessor; import net.minecraft.ChatFormatting; import net.minecraft.client.Minecraft; diff --git a/src/main/java/com/simibubi/create/foundation/config/ui/compat/flywheel/FlwBooleanEntry.java b/src/main/java/com/simibubi/create/foundation/config/ui/compat/flywheel/FlwBooleanEntry.java index a2f8cb0d68..0e92041bce 100644 --- a/src/main/java/com/simibubi/create/foundation/config/ui/compat/flywheel/FlwBooleanEntry.java +++ b/src/main/java/com/simibubi/create/foundation/config/ui/compat/flywheel/FlwBooleanEntry.java @@ -8,7 +8,8 @@ import com.simibubi.create.foundation.gui.UIRenderHelper; import com.simibubi.create.foundation.gui.element.RenderElement; import com.simibubi.create.foundation.gui.widget.BoxWidget; -import io.github.fabricators_of_create.porting_lib.mixin.client.accessor.AbstractWidgetAccessor; + +import io.github.fabricators_of_create.porting_lib.mixin.accessors.client.accessor.AbstractWidgetAccessor; public class FlwBooleanEntry extends FlwValueEntry { RenderElement enabled; diff --git a/src/main/java/com/simibubi/create/foundation/config/ui/compat/flywheel/FlwSubMenuConfigScreen.java b/src/main/java/com/simibubi/create/foundation/config/ui/compat/flywheel/FlwSubMenuConfigScreen.java index 3d8bd03943..0ff266b94e 100644 --- a/src/main/java/com/simibubi/create/foundation/config/ui/compat/flywheel/FlwSubMenuConfigScreen.java +++ b/src/main/java/com/simibubi/create/foundation/config/ui/compat/flywheel/FlwSubMenuConfigScreen.java @@ -21,11 +21,11 @@ import com.simibubi.create.foundation.utility.Color; import com.simibubi.create.foundation.utility.Couple; -import io.github.fabricators_of_create.porting_lib.mixin.client.accessor.AbstractSelectionListAccessor; import net.minecraft.ChatFormatting; import net.minecraft.client.gui.screens.Screen; import net.minecraft.network.chat.Component; import net.minecraft.network.chat.FormattedText; +import io.github.fabricators_of_create.porting_lib.mixin.accessors.client.accessor.AbstractSelectionListAccessor; import net.minecraftforge.fml.config.ModConfig; public class FlwSubMenuConfigScreen extends SubMenuConfigScreen { diff --git a/src/main/java/com/simibubi/create/foundation/config/ui/entries/BooleanEntry.java b/src/main/java/com/simibubi/create/foundation/config/ui/entries/BooleanEntry.java index 700bb70003..52b6f3b09d 100644 --- a/src/main/java/com/simibubi/create/foundation/config/ui/entries/BooleanEntry.java +++ b/src/main/java/com/simibubi/create/foundation/config/ui/entries/BooleanEntry.java @@ -5,9 +5,9 @@ import com.simibubi.create.foundation.gui.UIRenderHelper; import com.simibubi.create.foundation.gui.element.RenderElement; import com.simibubi.create.foundation.gui.widget.BoxWidget; -import io.github.fabricators_of_create.porting_lib.mixin.client.accessor.AbstractWidgetAccessor; import net.minecraft.client.gui.GuiGraphics; +import io.github.fabricators_of_create.porting_lib.mixin.accessors.client.accessor.AbstractWidgetAccessor; import net.minecraftforge.common.ForgeConfigSpec; public class BooleanEntry extends ValueEntry { diff --git a/src/main/java/com/simibubi/create/foundation/config/ui/entries/NumberEntry.java b/src/main/java/com/simibubi/create/foundation/config/ui/entries/NumberEntry.java index f8d34ab46a..a8f0040b74 100644 --- a/src/main/java/com/simibubi/create/foundation/config/ui/entries/NumberEntry.java +++ b/src/main/java/com/simibubi/create/foundation/config/ui/entries/NumberEntry.java @@ -12,13 +12,12 @@ import com.simibubi.create.foundation.gui.element.TextStencilElement; import com.simibubi.create.foundation.utility.Components; -import io.github.fabricators_of_create.porting_lib.mixin.client.accessor.AbstractWidgetAccessor; - import net.minecraft.client.Minecraft; import net.minecraft.client.gui.Font; import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.components.EditBox; import net.minecraft.network.chat.MutableComponent; +import io.github.fabricators_of_create.porting_lib.mixin.accessors.client.accessor.AbstractWidgetAccessor; import net.minecraftforge.common.ForgeConfigSpec; public abstract class NumberEntry extends ValueEntry { diff --git a/src/main/java/com/simibubi/create/foundation/config/ui/entries/SubMenuEntry.java b/src/main/java/com/simibubi/create/foundation/config/ui/entries/SubMenuEntry.java index d5a68c12d1..b824d5ec7e 100644 --- a/src/main/java/com/simibubi/create/foundation/config/ui/entries/SubMenuEntry.java +++ b/src/main/java/com/simibubi/create/foundation/config/ui/entries/SubMenuEntry.java @@ -7,9 +7,9 @@ import com.simibubi.create.foundation.gui.ScreenOpener; import com.simibubi.create.foundation.gui.element.DelegatedStencilElement; import com.simibubi.create.foundation.gui.widget.BoxWidget; -import io.github.fabricators_of_create.porting_lib.mixin.client.accessor.AbstractWidgetAccessor; import net.minecraft.client.gui.GuiGraphics; +import io.github.fabricators_of_create.porting_lib.mixin.accessors.client.accessor.AbstractWidgetAccessor; import net.minecraftforge.common.ForgeConfigSpec; public class SubMenuEntry extends ConfigScreenList.LabeledEntry { diff --git a/src/main/java/com/simibubi/create/foundation/config/ui/entries/ValueEntry.java b/src/main/java/com/simibubi/create/foundation/config/ui/entries/ValueEntry.java index a4f389526e..f147d35d10 100644 --- a/src/main/java/com/simibubi/create/foundation/config/ui/entries/ValueEntry.java +++ b/src/main/java/com/simibubi/create/foundation/config/ui/entries/ValueEntry.java @@ -21,9 +21,10 @@ import com.simibubi.create.foundation.utility.Components; import com.simibubi.create.foundation.utility.Pair; -import io.github.fabricators_of_create.porting_lib.mixin.client.accessor.AbstractSelectionList$EntryAccessor; import net.minecraft.ChatFormatting; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.components.AbstractSelectionList; +import io.github.fabricators_of_create.porting_lib.mixin.accessors.client.accessor.AbstractSelectionList$EntryAccessor; import net.minecraftforge.common.ForgeConfigSpec; public class ValueEntry extends ConfigScreenList.LabeledEntry { diff --git a/src/main/java/com/simibubi/create/foundation/data/AssetLookup.java b/src/main/java/com/simibubi/create/foundation/data/AssetLookup.java index 4cbc165440..03ba37efb2 100644 --- a/src/main/java/com/simibubi/create/foundation/data/AssetLookup.java +++ b/src/main/java/com/simibubi/create/foundation/data/AssetLookup.java @@ -7,14 +7,15 @@ import com.tterrag.registrate.providers.RegistrateItemModelProvider; import com.tterrag.registrate.util.nullness.NonNullBiConsumer; +import io.github.fabricators_of_create.porting_lib.models.generators.ModelFile; +import io.github.fabricators_of_create.porting_lib.models.generators.item.ItemModelBuilder; + import net.minecraft.resources.ResourceLocation; import net.minecraft.world.item.BlockItem; import net.minecraft.world.item.Item; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.properties.BlockStateProperties; import net.minecraft.world.level.block.state.properties.IntegerProperty; -import net.minecraftforge.client.model.generators.ItemModelBuilder; -import net.minecraftforge.client.model.generators.ModelFile; public class AssetLookup { @@ -25,7 +26,7 @@ public class AssetLookup { * Adding "powered", "vertical" will look for /block_powered_vertical.json */ public static ModelFile partialBaseModel(DataGenContext ctx, RegistrateBlockstateProvider prov, - String... suffix) { + String... suffix) { String string = "/block"; for (String suf : suffix) string += "_" + suf; @@ -47,7 +48,7 @@ public static ModelFile standardModel(DataGenContext ctx, RegistrateBlocks * models/block/x/item.json */ public static ItemModelBuilder customItemModel(DataGenContext ctx, - RegistrateItemModelProvider prov) { + RegistrateItemModelProvider prov) { return prov.blockItem(() -> ctx.getEntry() .getBlock(), "/item"); } diff --git a/src/main/java/com/simibubi/create/foundation/data/BlockStateGen.java b/src/main/java/com/simibubi/create/foundation/data/BlockStateGen.java index e29e0dbeba..080c55c97d 100644 --- a/src/main/java/com/simibubi/create/foundation/data/BlockStateGen.java +++ b/src/main/java/com/simibubi/create/foundation/data/BlockStateGen.java @@ -9,6 +9,13 @@ import java.util.function.BiFunction; import java.util.function.Function; +import io.github.fabricators_of_create.porting_lib.models.generators.ConfiguredModel; +import io.github.fabricators_of_create.porting_lib.models.generators.ModelFile; + +import io.github.fabricators_of_create.porting_lib.models.generators.ModelFile.ExistingModelFile; +import io.github.fabricators_of_create.porting_lib.models.generators.block.BlockModelProvider; +import io.github.fabricators_of_create.porting_lib.models.generators.block.MultiPartBlockStateBuilder; + import org.apache.commons.lang3.tuple.Pair; import com.google.common.collect.ImmutableList; @@ -43,11 +50,6 @@ import net.minecraft.world.level.block.state.properties.BooleanProperty; import net.minecraft.world.level.block.state.properties.Half; import net.minecraft.world.level.block.state.properties.RailShape; -import net.minecraftforge.client.model.generators.BlockModelProvider; -import net.minecraftforge.client.model.generators.ConfiguredModel; -import net.minecraftforge.client.model.generators.ModelFile; -import net.minecraftforge.client.model.generators.ModelFile.ExistingModelFile; -import net.minecraftforge.client.model.generators.MultiPartBlockStateBuilder; public class BlockStateGen { @@ -77,7 +79,7 @@ public static NonNullBiConsumer, Regi boolean customItem) { return (c, p) -> horizontalAxisBlock(c, p, getBlockModel(customItem, c, p)); } - + public static NonNullBiConsumer, RegistrateBlockstateProvider> simpleCubeAll( String path) { return (c, p) -> p.simpleBlock(c.get(), p.models() @@ -97,7 +99,7 @@ public static NonNullBiConsumer, Regi // Utility private static Function getBlockModel(boolean customItem, - DataGenContext c, RegistrateBlockstateProvider p) { + DataGenContext c, RegistrateBlockstateProvider p) { return $ -> customItem ? AssetLookup.partialBaseModel(c, p) : AssetLookup.standardModel(c, p); } diff --git a/src/main/java/com/simibubi/create/foundation/data/BuilderTransformers.java b/src/main/java/com/simibubi/create/foundation/data/BuilderTransformers.java index f54350a2ae..30759c5499 100644 --- a/src/main/java/com/simibubi/create/foundation/data/BuilderTransformers.java +++ b/src/main/java/com/simibubi/create/foundation/data/BuilderTransformers.java @@ -48,6 +48,9 @@ import com.tterrag.registrate.util.DataIngredient; import com.tterrag.registrate.util.nullness.NonNullUnaryOperator; +import io.github.fabricators_of_create.porting_lib.models.generators.ConfiguredModel; +import io.github.fabricators_of_create.porting_lib.models.generators.ModelFile; + import net.minecraft.client.renderer.RenderType; import net.minecraft.core.Direction.Axis; import net.minecraft.core.Direction.AxisDirection; @@ -77,8 +80,6 @@ import net.minecraft.world.level.storage.loot.predicates.LootItemCondition; import net.minecraft.world.level.storage.loot.providers.nbt.ContextNbtProvider; import net.minecraft.world.level.storage.loot.providers.number.ConstantValue; -import net.minecraftforge.client.model.generators.ConfiguredModel; -import net.minecraftforge.client.model.generators.ModelFile; public class BuilderTransformers { diff --git a/src/main/java/com/simibubi/create/foundation/data/DirectionalAxisBlockStateGen.java b/src/main/java/com/simibubi/create/foundation/data/DirectionalAxisBlockStateGen.java index 3103cf4d5f..b57c607ba4 100644 --- a/src/main/java/com/simibubi/create/foundation/data/DirectionalAxisBlockStateGen.java +++ b/src/main/java/com/simibubi/create/foundation/data/DirectionalAxisBlockStateGen.java @@ -4,11 +4,12 @@ import com.tterrag.registrate.providers.DataGenContext; import com.tterrag.registrate.providers.RegistrateBlockstateProvider; +import io.github.fabricators_of_create.porting_lib.models.generators.ModelFile; + import net.minecraft.core.Direction; import net.minecraft.core.Direction.Axis; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.state.BlockState; -import net.minecraftforge.client.model.generators.ModelFile; public abstract class DirectionalAxisBlockStateGen extends SpecialBlockStateGen { @@ -44,7 +45,7 @@ public abstract String getModelPrefix(DataGenContext @Override public ModelFile getModel(DataGenContext ctx, RegistrateBlockstateProvider prov, - BlockState state) { + BlockState state) { boolean vertical = state.getValue(GaugeBlock.FACING) .getAxis() .isVertical(); diff --git a/src/main/java/com/simibubi/create/foundation/data/MetalBarsGen.java b/src/main/java/com/simibubi/create/foundation/data/MetalBarsGen.java index 3dc5b325d6..be1df1a815 100644 --- a/src/main/java/com/simibubi/create/foundation/data/MetalBarsGen.java +++ b/src/main/java/com/simibubi/create/foundation/data/MetalBarsGen.java @@ -16,6 +16,8 @@ import com.tterrag.registrate.util.entry.BlockEntry; import com.tterrag.registrate.util.nullness.NonNullBiConsumer; +import io.github.fabricators_of_create.porting_lib.models.generators.ModelFile; + import net.minecraft.client.renderer.RenderType; import net.minecraft.data.recipes.RecipeCategory; import net.minecraft.resources.ResourceLocation; @@ -24,7 +26,6 @@ import net.minecraft.world.level.block.IronBarsBlock; import net.minecraft.world.level.block.SoundType; import net.minecraft.world.level.material.MapColor; -import net.minecraftforge.client.model.generators.ModelFile; public class MetalBarsGen { diff --git a/src/main/java/com/simibubi/create/foundation/data/ModelGen.java b/src/main/java/com/simibubi/create/foundation/data/ModelGen.java index 9c038f8b20..116b50d342 100644 --- a/src/main/java/com/simibubi/create/foundation/data/ModelGen.java +++ b/src/main/java/com/simibubi/create/foundation/data/ModelGen.java @@ -5,11 +5,12 @@ import com.tterrag.registrate.providers.DataGenContext; import com.tterrag.registrate.util.nullness.NonNullFunction; +import io.github.fabricators_of_create.porting_lib.models.generators.ModelFile; +import io.github.fabricators_of_create.porting_lib.models.generators.block.BlockStateProvider; + import net.minecraft.resources.ResourceLocation; import net.minecraft.world.item.BlockItem; import net.minecraft.world.level.block.Block; -import net.minecraftforge.client.model.generators.BlockStateProvider; -import net.minecraftforge.client.model.generators.ModelFile; public class ModelGen { diff --git a/src/main/java/com/simibubi/create/foundation/data/SpecialBlockStateGen.java b/src/main/java/com/simibubi/create/foundation/data/SpecialBlockStateGen.java index 6bd466442b..21db3d166e 100644 --- a/src/main/java/com/simibubi/create/foundation/data/SpecialBlockStateGen.java +++ b/src/main/java/com/simibubi/create/foundation/data/SpecialBlockStateGen.java @@ -3,12 +3,13 @@ import com.tterrag.registrate.providers.DataGenContext; import com.tterrag.registrate.providers.RegistrateBlockstateProvider; +import io.github.fabricators_of_create.porting_lib.models.generators.ConfiguredModel; +import io.github.fabricators_of_create.porting_lib.models.generators.ModelFile; + import net.minecraft.core.Direction; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.properties.Property; -import net.minecraftforge.client.model.generators.ConfiguredModel; -import net.minecraftforge.client.model.generators.ModelFile; public abstract class SpecialBlockStateGen { @@ -39,6 +40,6 @@ protected int horizontalAngle(Direction direction) { protected abstract int getYRotation(BlockState state); public abstract ModelFile getModel(DataGenContext ctx, - RegistrateBlockstateProvider prov, BlockState state); + RegistrateBlockstateProvider prov, BlockState state); } diff --git a/src/main/java/com/simibubi/create/foundation/data/WindowGen.java b/src/main/java/com/simibubi/create/foundation/data/WindowGen.java index 5a0104ffae..2ee01d546c 100644 --- a/src/main/java/com/simibubi/create/foundation/data/WindowGen.java +++ b/src/main/java/com/simibubi/create/foundation/data/WindowGen.java @@ -25,6 +25,7 @@ import com.tterrag.registrate.util.nullness.NonNullConsumer; import com.tterrag.registrate.util.nullness.NonNullFunction; +import io.github.fabricators_of_create.porting_lib.models.generators.ModelFile; import me.alphamode.forgetags.Tags; import net.minecraft.client.renderer.RenderType; import net.minecraft.core.BlockPos; @@ -41,7 +42,6 @@ import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.properties.WoodType; import net.minecraft.world.level.material.MapColor; -import net.minecraftforge.client.model.generators.ModelFile; public class WindowGen { diff --git a/src/main/java/com/simibubi/create/foundation/data/recipe/LogStrippingFakeRecipes.java b/src/main/java/com/simibubi/create/foundation/data/recipe/LogStrippingFakeRecipes.java index 7822b4b9d9..05cfeeb8c5 100644 --- a/src/main/java/com/simibubi/create/foundation/data/recipe/LogStrippingFakeRecipes.java +++ b/src/main/java/com/simibubi/create/foundation/data/recipe/LogStrippingFakeRecipes.java @@ -3,6 +3,8 @@ import java.util.ArrayList; import java.util.List; +import io.github.fabricators_of_create.porting_lib.mixin.accessors.common.accessor.AxeItemAccessor; + import org.jetbrains.annotations.Nullable; import com.simibubi.create.content.kinetics.deployer.ManualApplicationRecipe; @@ -11,8 +13,8 @@ import com.simibubi.create.foundation.utility.RegisteredObjects; import com.simibubi.create.infrastructure.config.AllConfigs; -import io.github.fabricators_of_create.porting_lib.mixin.common.accessor.AxeItemAccessor; import net.minecraft.core.Registry; +import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.resources.ResourceLocation; import net.minecraft.tags.ItemTags; import net.minecraft.world.item.BlockItem; @@ -38,7 +40,7 @@ public static List createRecipes() { axe.setHoverName(Lang.translateDirect("recipe.item_application.any_axe") .withStyle(style -> style.withItalic(false))); // fabric: tag may not exist yet with JEI, #773 - Registry.ITEM.getTagOrEmpty(ItemTags.LOGS) + BuiltInRegistries.ITEM.getTagOrEmpty(ItemTags.LOGS) .forEach(stack -> process(stack.value(), recipes, axe)); return recipes; } diff --git a/src/main/java/com/simibubi/create/foundation/events/ClientEvents.java b/src/main/java/com/simibubi/create/foundation/events/ClientEvents.java index 28011e8a82..0d6930150f 100644 --- a/src/main/java/com/simibubi/create/foundation/events/ClientEvents.java +++ b/src/main/java/com/simibubi/create/foundation/events/ClientEvents.java @@ -72,6 +72,7 @@ import com.simibubi.create.infrastructure.config.AllConfigs; import com.simibubi.create.infrastructure.gui.OpenCreateMenuButton; +import io.github.fabricators_of_create.porting_lib.entity.events.player.PlayerTickEvents; import io.github.fabricators_of_create.porting_lib.event.client.CameraSetupCallback; import io.github.fabricators_of_create.porting_lib.event.client.CameraSetupCallback.CameraInfo; import io.github.fabricators_of_create.porting_lib.event.client.ClientWorldEvents; @@ -80,13 +81,10 @@ import io.github.fabricators_of_create.porting_lib.event.client.FogEvents.ColorData; import io.github.fabricators_of_create.porting_lib.event.client.InteractEvents; import io.github.fabricators_of_create.porting_lib.event.client.ParticleManagerRegistrationCallback; -import io.github.fabricators_of_create.porting_lib.event.client.RenderArmCallback; import io.github.fabricators_of_create.porting_lib.event.client.RenderHandCallback; import io.github.fabricators_of_create.porting_lib.event.client.RenderTickStartCallback; import io.github.fabricators_of_create.porting_lib.event.client.RenderTooltipBorderColorCallback; import io.github.fabricators_of_create.porting_lib.event.common.AttackAirCallback; -import io.github.fabricators_of_create.porting_lib.event.common.MountEntityCallback; -import io.github.fabricators_of_create.porting_lib.event.common.PlayerTickEvents; import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientChunkEvents; import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientEntityEvents; import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents; diff --git a/src/main/java/com/simibubi/create/foundation/events/CommonEvents.java b/src/main/java/com/simibubi/create/foundation/events/CommonEvents.java index 6fe3eca4ff..3dc166184a 100644 --- a/src/main/java/com/simibubi/create/foundation/events/CommonEvents.java +++ b/src/main/java/com/simibubi/create/foundation/events/CommonEvents.java @@ -2,6 +2,8 @@ import java.util.concurrent.Executor; +import io.github.fabricators_of_create.porting_lib.entity.events.living.LivingEntityEvents; + import org.jetbrains.annotations.Nullable; import com.mojang.brigadier.CommandDispatcher; @@ -41,23 +43,13 @@ import com.simibubi.create.foundation.block.ItemUseOverrides; import com.simibubi.create.foundation.blockEntity.behaviour.ValueSettingsInputHandler; import com.simibubi.create.foundation.blockEntity.behaviour.edgeInteraction.EdgeInteractionHandler; -import com.simibubi.create.foundation.fluid.FluidHelper; import com.simibubi.create.foundation.recipe.RecipeFinder; -import com.simibubi.create.foundation.utility.Iterate; import com.simibubi.create.foundation.utility.ServerSpeedProvider; import com.simibubi.create.foundation.utility.WorldAttached; import com.simibubi.create.foundation.utility.fabric.AbstractMinecartExtensions; import com.simibubi.create.infrastructure.command.AllCommands; -import com.simibubi.create.infrastructure.worldgen.AllOreFeatureConfigEntries; import io.github.fabricators_of_create.porting_lib.event.common.BlockEvents; -import io.github.fabricators_of_create.porting_lib.event.common.EntityEvents; -import io.github.fabricators_of_create.porting_lib.event.common.EntityReadExtraDataCallback; -import io.github.fabricators_of_create.porting_lib.event.common.LivingEntityEvents; -import io.github.fabricators_of_create.porting_lib.event.common.MinecartEvents; -import io.github.fabricators_of_create.porting_lib.event.common.MobEntitySetTargetCallback; -import io.github.fabricators_of_create.porting_lib.event.common.MountEntityCallback; -import io.github.fabricators_of_create.porting_lib.event.common.ProjectileImpactCallback; import net.fabricmc.fabric.api.command.v2.CommandRegistrationCallback; import net.fabricmc.fabric.api.event.lifecycle.v1.ServerChunkEvents; import net.fabricmc.fabric.api.event.lifecycle.v1.ServerEntityEvents; @@ -187,10 +179,6 @@ public static void startTracking(Entity target, ServerPlayer player) { CapabilityMinecartController.startTracking(target); } - public static void onBiomeLoad() { - AllOreFeatureConfigEntries.modifyBiomes(); - } - public static void leftClickEmpty(ServerPlayer player) { ItemStack stack = player.getMainHandItem(); if (stack.getItem() instanceof ZapperItem) { @@ -234,7 +222,6 @@ public static void register() { // fabric: some features using events on forge don't use events here. // they've been left in this class for upstream compatibility. CommonEvents.addReloadListeners(); - CommonEvents.onBiomeLoad(); CommonEvents.addPackFinders(); // External Events diff --git a/src/main/java/com/simibubi/create/foundation/gui/AbstractSimiScreen.java b/src/main/java/com/simibubi/create/foundation/gui/AbstractSimiScreen.java index c1f49d682d..624f5eb10e 100644 --- a/src/main/java/com/simibubi/create/foundation/gui/AbstractSimiScreen.java +++ b/src/main/java/com/simibubi/create/foundation/gui/AbstractSimiScreen.java @@ -8,10 +8,11 @@ import com.simibubi.create.foundation.gui.widget.AbstractSimiWidget; import com.simibubi.create.foundation.utility.Components; -import io.github.fabricators_of_create.porting_lib.mixin.client.accessor.ScreenAccessor; +import io.github.fabricators_of_create.porting_lib.mixin.accessors.client.accessor.ScreenAccessor; import io.github.fabricators_of_create.porting_lib.util.KeyBindingHelper; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.components.AbstractWidget; import net.minecraft.client.gui.components.EditBox; import net.minecraft.client.gui.components.Renderable; diff --git a/src/main/java/com/simibubi/create/foundation/gui/RemovedGuiUtils.java b/src/main/java/com/simibubi/create/foundation/gui/RemovedGuiUtils.java index 823c2ed126..f1bd89ce97 100644 --- a/src/main/java/com/simibubi/create/foundation/gui/RemovedGuiUtils.java +++ b/src/main/java/com/simibubi/create/foundation/gui/RemovedGuiUtils.java @@ -8,6 +8,7 @@ import io.github.fabricators_of_create.porting_lib.util.client.ScreenUtils; import net.minecraft.client.gui.Font; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.network.chat.FormattedText; import net.minecraft.world.item.ItemStack; @@ -24,7 +25,7 @@ public static void postItemToolTip() { } public static void drawHoveringText(GuiGraphics graphics, List textLines, int mouseX, - int mouseY, int screenWidth, int screenHeight, int maxTextWidth, Font font) { + int mouseY, int screenWidth, int screenHeight, int maxTextWidth, Font font) { drawHoveringText(graphics, textLines, mouseX, mouseY, screenWidth, screenHeight, maxTextWidth, IForgeGuiGraphics.DEFAULT_BACKGROUND_COLOR, IForgeGuiGraphics.DEFAULT_BORDER_COLOR_START, IForgeGuiGraphics.DEFAULT_BORDER_COLOR_END, font); diff --git a/src/main/java/com/simibubi/create/foundation/gui/UIRenderHelper.java b/src/main/java/com/simibubi/create/foundation/gui/UIRenderHelper.java index 045990d722..860a073561 100644 --- a/src/main/java/com/simibubi/create/foundation/gui/UIRenderHelper.java +++ b/src/main/java/com/simibubi/create/foundation/gui/UIRenderHelper.java @@ -1,5 +1,7 @@ package com.simibubi.create.foundation.gui; +import io.github.fabricators_of_create.porting_lib.extensions.extensions.RenderTargetExtensions; + import org.joml.Matrix4f; import org.lwjgl.opengl.GL20; import org.lwjgl.opengl.GL30; @@ -18,8 +20,6 @@ import com.simibubi.create.foundation.utility.Color; import com.simibubi.create.foundation.utility.Couple; -import io.github.fabricators_of_create.porting_lib.extensions.RenderTargetExtensions; -import io.github.fabricators_of_create.porting_lib.util.client.ScreenUtils; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.renderer.GameRenderer; diff --git a/src/main/java/com/simibubi/create/foundation/gui/element/GuiGameElement.java b/src/main/java/com/simibubi/create/foundation/gui/element/GuiGameElement.java index 3b5bff270b..d36e918260 100644 --- a/src/main/java/com/simibubi/create/foundation/gui/element/GuiGameElement.java +++ b/src/main/java/com/simibubi/create/foundation/gui/element/GuiGameElement.java @@ -18,11 +18,11 @@ import com.simibubi.create.foundation.gui.UIRenderHelper; import com.simibubi.create.foundation.utility.VecHelper; -import io.github.fabricators_of_create.porting_lib.render.virtual.FixedColorTintingBakedModel; import io.github.fabricators_of_create.porting_lib.util.FluidStack; import net.fabricmc.fabric.api.transfer.v1.fluid.FluidConstants; import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.renderer.ItemBlockRenderTypes; import net.minecraft.client.renderer.LightTexture; import net.minecraft.client.renderer.MultiBufferSource; diff --git a/src/main/java/com/simibubi/create/foundation/gui/element/ScreenElement.java b/src/main/java/com/simibubi/create/foundation/gui/element/ScreenElement.java index 168074219e..305c04e6e7 100644 --- a/src/main/java/com/simibubi/create/foundation/gui/element/ScreenElement.java +++ b/src/main/java/com/simibubi/create/foundation/gui/element/ScreenElement.java @@ -1,9 +1,8 @@ package com.simibubi.create.foundation.gui.element; -import com.mojang.blaze3d.vertex.PoseStack; - import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; +import net.minecraft.client.gui.GuiGraphics; public interface ScreenElement { diff --git a/src/main/java/com/simibubi/create/foundation/gui/menu/AbstractSimiContainerScreen.java b/src/main/java/com/simibubi/create/foundation/gui/menu/AbstractSimiContainerScreen.java index 0fc02cf5af..0e68c4cef3 100644 --- a/src/main/java/com/simibubi/create/foundation/gui/menu/AbstractSimiContainerScreen.java +++ b/src/main/java/com/simibubi/create/foundation/gui/menu/AbstractSimiContainerScreen.java @@ -10,12 +10,13 @@ import com.simibubi.create.foundation.gui.AllGuiTextures; import com.simibubi.create.foundation.gui.TickableGuiEventListener; import com.simibubi.create.foundation.gui.widget.AbstractSimiWidget; -import io.github.fabricators_of_create.porting_lib.mixin.client.accessor.ScreenAccessor; +import io.github.fabricators_of_create.porting_lib.mixin.accessors.client.accessor.ScreenAccessor; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.fabricmc.fabric.api.client.keybinding.v1.KeyBindingHelper; import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.components.AbstractWidget; import net.minecraft.client.gui.components.EditBox; import net.minecraft.client.gui.components.Renderable; diff --git a/src/main/java/com/simibubi/create/foundation/item/SmartInventory.java b/src/main/java/com/simibubi/create/foundation/item/SmartInventory.java index f86f12b73b..169864f63e 100644 --- a/src/main/java/com/simibubi/create/foundation/item/SmartInventory.java +++ b/src/main/java/com/simibubi/create/foundation/item/SmartInventory.java @@ -2,7 +2,7 @@ import com.simibubi.create.foundation.blockEntity.SyncedBlockEntity; -import io.github.fabricators_of_create.porting_lib.extensions.INBTSerializable; +import io.github.fabricators_of_create.porting_lib.core.util.INBTSerializable; import io.github.fabricators_of_create.porting_lib.transfer.item.ItemStackHandlerContainer; import net.fabricmc.fabric.api.transfer.v1.item.ItemVariant; diff --git a/src/main/java/com/simibubi/create/foundation/item/render/CustomRenderedItemModel.java b/src/main/java/com/simibubi/create/foundation/item/render/CustomRenderedItemModel.java index c45298a49b..a2908524b3 100644 --- a/src/main/java/com/simibubi/create/foundation/item/render/CustomRenderedItemModel.java +++ b/src/main/java/com/simibubi/create/foundation/item/render/CustomRenderedItemModel.java @@ -2,10 +2,9 @@ import com.mojang.blaze3d.vertex.PoseStack; -import io.github.fabricators_of_create.porting_lib.render.TransformTypeDependentItemBakedModel; -import net.minecraft.client.renderer.block.model.ItemTransforms; import net.fabricmc.fabric.api.renderer.v1.model.ForwardingBakedModel; import net.minecraft.client.resources.model.BakedModel; +import net.minecraft.world.item.ItemDisplayContext; public class CustomRenderedItemModel extends ForwardingBakedModel implements TransformTypeDependentItemBakedModel { @@ -20,7 +19,7 @@ public boolean isCustomRenderer() { @Override public BakedModel applyTransform(ItemDisplayContext cameraItemDisplayContext, PoseStack mat, - boolean leftHand) { + boolean leftHand) { // Super call returns originalModel, but we want to return this, else BEWLR // won't be used. TransformTypeDependentItemBakedModel.maybeApplyTransform(wrapped, cameraItemDisplayContext, mat, leftHand); diff --git a/src/main/java/com/simibubi/create/foundation/mixin/fabric/EntityMixin.java b/src/main/java/com/simibubi/create/foundation/mixin/fabric/EntityMixin.java index bffe021b32..b1e5728b58 100644 --- a/src/main/java/com/simibubi/create/foundation/mixin/fabric/EntityMixin.java +++ b/src/main/java/com/simibubi/create/foundation/mixin/fabric/EntityMixin.java @@ -3,7 +3,6 @@ import com.google.common.collect.ImmutableList; import com.simibubi.create.foundation.ponder.PonderWorld; -import io.github.fabricators_of_create.porting_lib.mixin.common.accessor.EntityAccessor; import net.minecraft.world.entity.Entity; import net.minecraft.world.level.Level; import net.minecraft.world.level.border.WorldBorder; @@ -12,6 +11,8 @@ import net.minecraft.world.phys.shapes.VoxelShape; +import io.github.fabricators_of_create.porting_lib.mixin.accessors.common.accessor.EntityAccessor; + import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; diff --git a/src/main/java/com/simibubi/create/foundation/mixin/fabric/StructureUtilsMixin.java b/src/main/java/com/simibubi/create/foundation/mixin/fabric/StructureUtilsMixin.java index fcaf649b72..ab23c0946a 100644 --- a/src/main/java/com/simibubi/create/foundation/mixin/fabric/StructureUtilsMixin.java +++ b/src/main/java/com/simibubi/create/foundation/mixin/fabric/StructureUtilsMixin.java @@ -5,7 +5,6 @@ import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; -import net.fabricmc.fabric.mixin.gametest.StructureTestUtilMixin; import net.minecraft.gametest.framework.StructureUtils; import net.minecraft.resources.ResourceLocation; import net.minecraft.server.level.ServerLevel; diff --git a/src/main/java/com/simibubi/create/foundation/ponder/element/TextWindowElement.java b/src/main/java/com/simibubi/create/foundation/ponder/element/TextWindowElement.java index b2795471f9..cdf5ed23c0 100644 --- a/src/main/java/com/simibubi/create/foundation/ponder/element/TextWindowElement.java +++ b/src/main/java/com/simibubi/create/foundation/ponder/element/TextWindowElement.java @@ -12,9 +12,7 @@ import com.simibubi.create.foundation.ponder.PonderScene.SceneTransform; import com.simibubi.create.foundation.ponder.ui.PonderUI; import com.simibubi.create.foundation.utility.Color; -import io.github.fabricators_of_create.porting_lib.util.client.GuiUtils; -import io.github.fabricators_of_create.porting_lib.util.client.ScreenUtils; import net.minecraft.client.gui.GuiGraphics; import net.minecraft.network.chat.FormattedText; import net.minecraft.network.chat.Style; diff --git a/src/main/java/com/simibubi/create/foundation/ponder/element/WorldSectionElement.java b/src/main/java/com/simibubi/create/foundation/ponder/element/WorldSectionElement.java index 33e1227849..185f9b1fcc 100644 --- a/src/main/java/com/simibubi/create/foundation/ponder/element/WorldSectionElement.java +++ b/src/main/java/com/simibubi/create/foundation/ponder/element/WorldSectionElement.java @@ -9,8 +9,6 @@ import com.jozufozu.flywheel.core.model.ModelUtil; import com.jozufozu.flywheel.core.model.ShadeSeparatedBufferedData; import com.jozufozu.flywheel.core.model.ShadeSeparatingVertexConsumer; -import com.jozufozu.flywheel.fabric.model.CullingBakedModel; -import com.jozufozu.flywheel.fabric.model.FabricModelUtil; import com.jozufozu.flywheel.fabric.model.LayerFilteringBakedModel; import com.jozufozu.flywheel.util.transform.TransformStack; import com.mojang.blaze3d.vertex.BufferBuilder; diff --git a/src/main/java/com/simibubi/create/foundation/ponder/ui/PonderUI.java b/src/main/java/com/simibubi/create/foundation/ponder/ui/PonderUI.java index 65a7458d7d..ff1fb12ab7 100644 --- a/src/main/java/com/simibubi/create/foundation/ponder/ui/PonderUI.java +++ b/src/main/java/com/simibubi/create/foundation/ponder/ui/PonderUI.java @@ -7,6 +7,8 @@ import java.util.List; import java.util.stream.IntStream; +import io.github.fabricators_of_create.porting_lib.mixin.accessors.client.accessor.ScreenAccessor; + import org.joml.Matrix4f; import com.mojang.blaze3d.platform.ClipboardManager; @@ -49,8 +51,6 @@ import com.simibubi.create.infrastructure.ponder.DebugScenes; import com.simibubi.create.infrastructure.ponder.PonderIndex; -import io.github.fabricators_of_create.porting_lib.mixin.client.accessor.ScreenAccessor; - import io.github.fabricators_of_create.porting_lib.util.client.ScreenUtils; import net.fabricmc.fabric.api.client.keybinding.v1.KeyBindingHelper; import net.minecraft.ChatFormatting; @@ -62,8 +62,10 @@ import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.core.Registry; +import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.network.chat.Component; import net.minecraft.network.chat.MutableComponent; +import net.minecraft.network.chat.Style; import net.minecraft.resources.ResourceLocation; import net.minecraft.util.Mth; import net.minecraft.util.RandomSource; @@ -144,10 +146,10 @@ public static PonderUI of(PonderChapter chapter) { protected PonderUI(List scenes) { ResourceLocation component = scenes.get(0) .getComponent(); - if (Registry.ITEM.containsKey(component)) - stack = new ItemStack(Registry.ITEM.get(component)); + if (BuiltInRegistries.ITEM.containsKey(component)) + stack = new ItemStack(BuiltInRegistries.ITEM.get(component)); else - stack = new ItemStack(Registry.BLOCK.get(component)); + stack = new ItemStack(BuiltInRegistries.BLOCK.get(component)); tags = new ArrayList<>(PonderRegistry.TAGS.getTags(component)); this.scenes = scenes; diff --git a/src/main/java/com/simibubi/create/foundation/recipe/AllIngredients.java b/src/main/java/com/simibubi/create/foundation/recipe/AllIngredients.java index 70c9e7c342..4035e01e5f 100644 --- a/src/main/java/com/simibubi/create/foundation/recipe/AllIngredients.java +++ b/src/main/java/com/simibubi/create/foundation/recipe/AllIngredients.java @@ -2,8 +2,6 @@ import com.simibubi.create.Create; -import io.github.fabricators_of_create.porting_lib.crafting.CraftingHelper; - public class AllIngredients { public static void register() { CraftingHelper.register(Create.asResource("block_tag_ingredient"), BlockTagIngredient.Serializer.INSTANCE); diff --git a/src/main/java/com/simibubi/create/foundation/recipe/BlockTagIngredient.java b/src/main/java/com/simibubi/create/foundation/recipe/BlockTagIngredient.java index 434d524ee0..f8663ff9c8 100644 --- a/src/main/java/com/simibubi/create/foundation/recipe/BlockTagIngredient.java +++ b/src/main/java/com/simibubi/create/foundation/recipe/BlockTagIngredient.java @@ -8,9 +8,6 @@ import com.google.gson.JsonElement; import com.google.gson.JsonObject; -import io.github.fabricators_of_create.porting_lib.crafting.AbstractIngredient; -import io.github.fabricators_of_create.porting_lib.crafting.CraftingHelper; -import io.github.tropheusj.serialization_hooks.ingredient.IngredientDeserializer; import it.unimi.dsi.fastutil.ints.IntArrayList; import it.unimi.dsi.fastutil.ints.IntComparators; import it.unimi.dsi.fastutil.ints.IntList; diff --git a/src/main/java/com/simibubi/create/foundation/recipe/RecipeApplier.java b/src/main/java/com/simibubi/create/foundation/recipe/RecipeApplier.java index ce30e60d8b..1696396c45 100644 --- a/src/main/java/com/simibubi/create/foundation/recipe/RecipeApplier.java +++ b/src/main/java/com/simibubi/create/foundation/recipe/RecipeApplier.java @@ -12,6 +12,7 @@ import net.minecraft.world.entity.item.ItemEntity; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.crafting.Recipe; +import net.minecraft.world.level.Level; public class RecipeApplier { public static void applyRecipeOn(ItemEntity entity, Recipe recipe) { diff --git a/src/main/java/com/simibubi/create/foundation/render/MultiRenderTypeModel.java b/src/main/java/com/simibubi/create/foundation/render/MultiRenderTypeModel.java index 357f182167..163be7788d 100644 --- a/src/main/java/com/simibubi/create/foundation/render/MultiRenderTypeModel.java +++ b/src/main/java/com/simibubi/create/foundation/render/MultiRenderTypeModel.java @@ -9,8 +9,6 @@ import com.simibubi.create.Create; -import io.github.fabricators_of_create.porting_lib.model.CompositeModel; -import io.github.fabricators_of_create.porting_lib.model.CompositeModel.Baked; import net.fabricmc.fabric.api.renderer.v1.Renderer; import net.fabricmc.fabric.api.renderer.v1.RendererAccess; import net.fabricmc.fabric.api.renderer.v1.material.BlendMode; @@ -20,6 +18,7 @@ import net.fabricmc.fabric.api.renderer.v1.model.FabricBakedModel; import net.fabricmc.fabric.api.renderer.v1.model.ForwardingBakedModel; import net.fabricmc.fabric.api.renderer.v1.render.RenderContext; +import vazkii.botania.fabric.client.FabricFloatingFlowerModel.Baked; import net.minecraft.client.resources.model.BakedModel; import net.minecraft.core.BlockPos; import net.minecraft.util.RandomSource; diff --git a/src/main/java/com/simibubi/create/foundation/render/RenderTypes.java b/src/main/java/com/simibubi/create/foundation/render/RenderTypes.java index 135b69ea80..e46535d0a8 100644 --- a/src/main/java/com/simibubi/create/foundation/render/RenderTypes.java +++ b/src/main/java/com/simibubi/create/foundation/render/RenderTypes.java @@ -7,16 +7,15 @@ import com.mojang.blaze3d.vertex.VertexFormat; import com.simibubi.create.AllSpecialTextures; import com.simibubi.create.Create; -import io.github.fabricators_of_create.porting_lib.event.client.RegisterShadersCallback; -import io.github.fabricators_of_create.porting_lib.event.client.RegisterShadersCallback.ShaderRegistry; -import io.github.fabricators_of_create.porting_lib.mixin.client.accessor.RenderTypeAccessor; + +import io.github.fabricators_of_create.porting_lib.mixin.accessors.client.accessor.RenderTypeAccessor; import net.minecraft.client.renderer.GameRenderer; import net.minecraft.client.renderer.RenderStateShard; import net.minecraft.client.renderer.RenderType; import net.minecraft.client.renderer.ShaderInstance; import net.minecraft.resources.ResourceLocation; -import net.minecraft.server.packs.resources.ResourceProvider; +import net.minecraft.server.packs.resources.ResourceManager; import net.minecraft.world.inventory.InventoryMenu; // TODO 1.17: use custom shaders instead of vanilla ones diff --git a/src/main/java/com/simibubi/create/foundation/utility/AnimationTickHolder.java b/src/main/java/com/simibubi/create/foundation/utility/AnimationTickHolder.java index 2d3396b9a3..d7b0ffca6d 100644 --- a/src/main/java/com/simibubi/create/foundation/utility/AnimationTickHolder.java +++ b/src/main/java/com/simibubi/create/foundation/utility/AnimationTickHolder.java @@ -3,7 +3,8 @@ import com.simibubi.create.foundation.ponder.PonderWorld; import com.simibubi.create.foundation.ponder.ui.PonderUI; import com.simibubi.create.foundation.utility.worldWrappers.WrappedClientWorld; -import io.github.fabricators_of_create.porting_lib.util.MinecraftClientUtil; + +import io.github.fabricators_of_create.porting_lib.common.util.MinecraftClientUtil; import net.minecraft.client.Minecraft; import net.minecraft.world.level.LevelAccessor; diff --git a/src/main/java/com/simibubi/create/foundation/utility/BlockHelper.java b/src/main/java/com/simibubi/create/foundation/utility/BlockHelper.java index 0eaf822565..947d80d7b6 100644 --- a/src/main/java/com/simibubi/create/foundation/utility/BlockHelper.java +++ b/src/main/java/com/simibubi/create/foundation/utility/BlockHelper.java @@ -9,8 +9,8 @@ import com.simibubi.create.content.kinetics.base.KineticBlockEntity; import com.simibubi.create.foundation.blockEntity.IMergeableBE; +import io.github.fabricators_of_create.porting_lib.common.util.PlantUtil; import io.github.fabricators_of_create.porting_lib.transfer.TransferUtil; -import io.github.fabricators_of_create.porting_lib.util.PlantUtil; import net.fabricmc.fabric.api.event.player.PlayerBlockBreakEvents; import net.fabricmc.fabric.api.transfer.v1.item.ItemVariant; import net.fabricmc.fabric.api.transfer.v1.item.PlayerInventoryStorage; @@ -50,7 +50,6 @@ import net.minecraft.world.level.chunk.LevelChunk; import net.minecraft.world.level.chunk.LevelChunkSection; import net.minecraft.world.level.material.FluidState; -import net.minecraft.world.level.material.Material; public class BlockHelper { diff --git a/src/main/java/com/simibubi/create/foundation/utility/FontHelper.java b/src/main/java/com/simibubi/create/foundation/utility/FontHelper.java index 4a31163d4c..cd2ffb3b75 100644 --- a/src/main/java/com/simibubi/create/foundation/utility/FontHelper.java +++ b/src/main/java/com/simibubi/create/foundation/utility/FontHelper.java @@ -4,12 +4,12 @@ import java.util.LinkedList; import java.util.List; +import io.github.fabricators_of_create.porting_lib.common.util.MinecraftClientUtil; + import org.joml.Matrix4f; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.Tesselator; -import com.mojang.math.Matrix4f; -import io.github.fabricators_of_create.porting_lib.util.MinecraftClientUtil; import net.minecraft.client.gui.Font; import net.minecraft.client.renderer.LightTexture; diff --git a/src/main/java/com/simibubi/create/foundation/utility/ModelSwapper.java b/src/main/java/com/simibubi/create/foundation/utility/ModelSwapper.java index 708266c615..336ac94ff5 100644 --- a/src/main/java/com/simibubi/create/foundation/utility/ModelSwapper.java +++ b/src/main/java/com/simibubi/create/foundation/utility/ModelSwapper.java @@ -3,23 +3,19 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; -import java.util.function.Consumer; import java.util.function.Function; import com.simibubi.create.foundation.block.render.CustomBlockModels; import com.simibubi.create.foundation.item.render.CustomItemModels; import com.simibubi.create.foundation.item.render.CustomRenderedItemModel; import com.simibubi.create.foundation.item.render.CustomRenderedItems; -import io.github.fabricators_of_create.porting_lib.event.client.ModelsBakedCallback; -import net.fabricmc.fabric.api.client.model.ModelLoadingRegistry; import net.minecraft.client.renderer.block.BlockModelShaper; import net.minecraft.client.resources.model.BakedModel; import net.minecraft.client.resources.model.ModelBakery; import net.minecraft.client.resources.model.ModelManager; import net.minecraft.client.resources.model.ModelResourceLocation; import net.minecraft.resources.ResourceLocation; -import net.minecraft.server.packs.resources.ResourceManager; import net.minecraft.world.item.Item; import net.minecraft.world.level.block.Block; diff --git a/src/main/java/com/simibubi/create/foundation/utility/VecHelper.java b/src/main/java/com/simibubi/create/foundation/utility/VecHelper.java index 55381b3e88..f5abb1b8a1 100644 --- a/src/main/java/com/simibubi/create/foundation/utility/VecHelper.java +++ b/src/main/java/com/simibubi/create/foundation/utility/VecHelper.java @@ -7,7 +7,6 @@ import com.simibubi.create.foundation.mixin.accessor.GameRendererAccessor; -import io.github.fabricators_of_create.porting_lib.extensions.Vector3fExtensions; import net.minecraft.client.Camera; import net.minecraft.client.Minecraft; import net.minecraft.core.BlockPos; diff --git a/src/main/java/com/simibubi/create/foundation/utility/ghost/GhostBlockRenderer.java b/src/main/java/com/simibubi/create/foundation/utility/ghost/GhostBlockRenderer.java index 65907ac688..37120dd09c 100644 --- a/src/main/java/com/simibubi/create/foundation/utility/ghost/GhostBlockRenderer.java +++ b/src/main/java/com/simibubi/create/foundation/utility/ghost/GhostBlockRenderer.java @@ -10,15 +10,11 @@ import com.simibubi.create.foundation.placement.PlacementHelpers; import com.simibubi.create.foundation.render.SuperRenderTypeBuffer; -import io.github.fabricators_of_create.porting_lib.render.virtual.FixedLightBakedModel; -import io.github.fabricators_of_create.porting_lib.render.virtual.TranslucentBakedModel; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.ItemBlockRenderTypes; import net.minecraft.client.renderer.LevelRenderer; import net.minecraft.client.renderer.RenderType; import net.minecraft.client.renderer.block.BlockRenderDispatcher; -import net.minecraft.client.renderer.block.ModelBlockRenderer; -import net.minecraft.client.renderer.block.model.BakedQuad; import net.minecraft.client.renderer.texture.OverlayTexture; import net.minecraft.client.resources.model.BakedModel; import net.minecraft.core.BlockPos; diff --git a/src/main/java/com/simibubi/create/foundation/utility/worldWrappers/WrappedClientWorld.java b/src/main/java/com/simibubi/create/foundation/utility/worldWrappers/WrappedClientWorld.java index 38d2a1ad82..38a37c5a25 100644 --- a/src/main/java/com/simibubi/create/foundation/utility/worldWrappers/WrappedClientWorld.java +++ b/src/main/java/com/simibubi/create/foundation/utility/worldWrappers/WrappedClientWorld.java @@ -5,12 +5,10 @@ import javax.annotation.Nullable; import javax.annotation.ParametersAreNonnullByDefault; -import io.github.fabricators_of_create.porting_lib.mixin.client.accessor.ClientPacketListenerAccessor; -import io.github.fabricators_of_create.porting_lib.mixin.common.accessor.BiomeManagerAccessor; - +import io.github.fabricators_of_create.porting_lib.mixin.accessors.client.accessor.ClientPacketListenerAccessor; +import io.github.fabricators_of_create.porting_lib.mixin.accessors.common.accessor.BiomeManagerAccessor; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; -import net.minecraft.MethodsReturnNonnullByDefault; import net.minecraft.client.Minecraft; import net.minecraft.client.multiplayer.ClientLevel; import net.minecraft.core.BlockPos; diff --git a/src/main/java/com/simibubi/create/foundation/utility/worldWrappers/WrappedServerWorld.java b/src/main/java/com/simibubi/create/foundation/utility/worldWrappers/WrappedServerWorld.java index 057d4711db..497b463925 100644 --- a/src/main/java/com/simibubi/create/foundation/utility/worldWrappers/WrappedServerWorld.java +++ b/src/main/java/com/simibubi/create/foundation/utility/worldWrappers/WrappedServerWorld.java @@ -5,13 +5,11 @@ import javax.annotation.ParametersAreNonnullByDefault; -import io.github.fabricators_of_create.porting_lib.mixin.common.accessor.MinecraftServerAccessor; +import io.github.fabricators_of_create.porting_lib.mixin.accessors.common.accessor.MinecraftServerAccessor; import io.github.fabricators_of_create.porting_lib.util.BiomeManagerHelper; -import io.github.fabricators_of_create.porting_lib.util.MinecraftServerUtil; import net.minecraft.MethodsReturnNonnullByDefault; import net.minecraft.Util; -import net.minecraft.client.server.IntegratedServer; import net.minecraft.core.BlockPos; import net.minecraft.core.Holder; import net.minecraft.server.level.ServerLevel; diff --git a/src/main/java/com/simibubi/create/infrastructure/command/FlySpeedCommand.java b/src/main/java/com/simibubi/create/infrastructure/command/FlySpeedCommand.java index 8406832e3a..bf73e7aca9 100644 --- a/src/main/java/com/simibubi/create/infrastructure/command/FlySpeedCommand.java +++ b/src/main/java/com/simibubi/create/infrastructure/command/FlySpeedCommand.java @@ -6,7 +6,7 @@ import com.mojang.brigadier.context.CommandContext; import com.simibubi.create.foundation.utility.Components; -import io.github.fabricators_of_create.porting_lib.mixin.common.accessor.ClientboundPlayerAbilitiesPacketAccessor; +import io.github.fabricators_of_create.porting_lib.mixin.accessors.common.accessor.ClientboundPlayerAbilitiesPacketAccessor; import net.minecraft.commands.CommandSourceStack; import net.minecraft.commands.Commands; diff --git a/src/main/java/com/simibubi/create/infrastructure/config/AllConfigs.java b/src/main/java/com/simibubi/create/infrastructure/config/AllConfigs.java index 33a203fee2..96b5a11f8e 100644 --- a/src/main/java/com/simibubi/create/infrastructure/config/AllConfigs.java +++ b/src/main/java/com/simibubi/create/infrastructure/config/AllConfigs.java @@ -5,14 +5,14 @@ import java.util.Map.Entry; import java.util.function.Supplier; +import fuzs.forgeconfigapiport.api.config.v2.ModConfigEvents; + import org.apache.commons.lang3.tuple.Pair; import com.simibubi.create.Create; import com.simibubi.create.content.kinetics.BlockStressValues; import com.simibubi.create.foundation.config.ConfigBase; -import net.minecraftforge.api.ModLoadingContext; -import net.minecraftforge.api.fml.event.config.ModConfigEvents; import net.minecraftforge.common.ForgeConfigSpec; import net.minecraftforge.fml.config.ModConfig; diff --git a/src/main/java/com/simibubi/create/infrastructure/gui/CreateMainMenuScreen.java b/src/main/java/com/simibubi/create/infrastructure/gui/CreateMainMenuScreen.java index 92650d1a35..9fc9ef9659 100644 --- a/src/main/java/com/simibubi/create/infrastructure/gui/CreateMainMenuScreen.java +++ b/src/main/java/com/simibubi/create/infrastructure/gui/CreateMainMenuScreen.java @@ -22,12 +22,11 @@ import com.simibubi.create.foundation.utility.Lang; import com.terraformersmc.modmenu.gui.ModsScreen; -import io.github.fabricators_of_create.porting_lib.mixin.client.accessor.ScreenAccessor; -import io.github.fabricators_of_create.porting_lib.mixin.client.accessor.TitleScreenAccessor; +import io.github.fabricators_of_create.porting_lib.mixin.accessors.client.accessor.ScreenAccessor; +import io.github.fabricators_of_create.porting_lib.mixin.accessors.client.accessor.TitleScreenAccessor; import net.minecraft.ChatFormatting; import net.minecraft.Util; -import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.components.Button; import net.minecraft.client.gui.components.Tooltip; diff --git a/src/main/java/com/simibubi/create/infrastructure/gui/OpenCreateMenuButton.java b/src/main/java/com/simibubi/create/infrastructure/gui/OpenCreateMenuButton.java index 26676b9a54..c4eee89e0f 100644 --- a/src/main/java/com/simibubi/create/infrastructure/gui/OpenCreateMenuButton.java +++ b/src/main/java/com/simibubi/create/infrastructure/gui/OpenCreateMenuButton.java @@ -12,6 +12,8 @@ import net.fabricmc.fabric.api.client.screen.v1.Screens; import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.Font; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.components.Button; import net.minecraft.client.gui.screens.PauseScreen; import net.minecraft.client.gui.screens.Screen; diff --git a/src/main/java/com/simibubi/create/infrastructure/worldgen/LayerPattern.java b/src/main/java/com/simibubi/create/infrastructure/worldgen/LayerPattern.java index bb5e25f1cd..b9b501238f 100644 --- a/src/main/java/com/simibubi/create/infrastructure/worldgen/LayerPattern.java +++ b/src/main/java/com/simibubi/create/infrastructure/worldgen/LayerPattern.java @@ -19,6 +19,8 @@ import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.levelgen.feature.configurations.OreConfiguration; import net.minecraft.world.level.levelgen.feature.configurations.OreConfiguration.TargetBlockState; +import net.minecraft.world.level.levelgen.structure.templatesystem.RuleTest; +import net.minecraft.world.level.levelgen.structure.templatesystem.TagMatchTest; public class LayerPattern { public static final Codec CODEC = Codec.list(Layer.CODEC)