Skip to content

Commit b3a3a22

Browse files
TropheusJTropheusJ
committed
tariffs lifted
fixed a million imports
1 parent 71dab01 commit b3a3a22

40 files changed

+282
-410
lines changed

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

Lines changed: 36 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,56 @@
11
package com.simibubi.create;
22

3-
import java.util.function.Consumer;
4-
import java.util.function.Supplier;
3+
import static net.minecraft.world.item.Items.BUCKET;
4+
import static net.minecraft.world.item.Items.GLASS_BOTTLE;
5+
import static net.minecraft.world.item.Items.HONEY_BOTTLE;
56

6-
import javax.annotation.Nullable;
7+
import java.util.List;
78

8-
import org.jetbrains.annotations.NotNull;
9-
import org.joml.Vector3f;
9+
import javax.annotation.Nullable;
1010

11-
import com.mojang.blaze3d.shaders.FogShape;
12-
import com.mojang.blaze3d.systems.RenderSystem;
1311
import com.simibubi.create.AllTags.AllFluidTags;
1412
import com.simibubi.create.content.decoration.palettes.AllPaletteStoneTypes;
1513
import com.simibubi.create.content.fluids.VirtualFluid;
1614
import com.simibubi.create.content.fluids.potion.PotionFluid;
17-
import com.simibubi.create.content.fluids.potion.PotionFluid.PotionFluidType;
15+
import com.simibubi.create.content.fluids.potion.PotionFluid.BottleType;
16+
import com.simibubi.create.content.fluids.potion.PotionFluidHandler;
1817
import com.simibubi.create.foundation.data.CreateRegistrate;
19-
import com.simibubi.create.infrastructure.config.AllConfigs;
20-
import com.tterrag.registrate.builders.FluidBuilder.FluidTypeFactory;
18+
import com.simibubi.create.foundation.fluid.FluidHelper;
19+
import com.tterrag.registrate.fabric.SimpleFlowableFluid;
2120
import com.tterrag.registrate.util.entry.FluidEntry;
2221

23-
import net.minecraftforge.client.extensions.common.IClientFluidTypeExtensions;
24-
import net.minecraftforge.common.ForgeMod;
25-
import net.minecraftforge.fluids.FluidInteractionRegistry;
26-
import net.minecraftforge.fluids.FluidInteractionRegistry.InteractionInformation;
27-
import net.minecraftforge.fluids.FluidStack;
28-
import net.minecraftforge.fluids.FluidType;
29-
import net.minecraftforge.fluids.ForgeFlowingFluid;
30-
31-
import net.createmod.catnip.theme.Color;
32-
import net.minecraft.client.Camera;
33-
import net.minecraft.client.multiplayer.ClientLevel;
34-
import net.minecraft.client.renderer.FogRenderer.FogMode;
22+
import net.createmod.catnip.data.Iterate;
23+
import net.createmod.catnip.nbt.NBTHelper;
3524
import net.minecraft.core.BlockPos;
36-
import net.minecraft.resources.ResourceLocation;
25+
import net.minecraft.core.Direction;
26+
import net.minecraft.core.registries.Registries;
27+
import net.minecraft.nbt.CompoundTag;
28+
import net.minecraft.network.chat.Component;
29+
import net.minecraft.tags.FluidTags;
30+
import net.minecraft.world.item.TooltipFlag;
31+
import net.minecraft.world.item.alchemy.PotionUtils;
3732
import net.minecraft.world.level.BlockAndTintGetter;
38-
import net.minecraft.world.level.block.Blocks;
33+
import net.minecraft.world.level.ItemLike;
34+
import net.minecraft.world.level.Level;
35+
import net.minecraft.world.level.LevelAccessor;
3936
import net.minecraft.world.level.block.state.BlockState;
4037
import net.minecraft.world.level.material.Fluid;
4138
import net.minecraft.world.level.material.FluidState;
39+
import net.minecraft.world.level.material.MapColor;
40+
41+
import net.fabricmc.api.EnvType;
42+
import net.fabricmc.api.Environment;
43+
import net.fabricmc.fabric.api.transfer.v1.client.fluid.FluidVariantRenderHandler;
44+
import net.fabricmc.fabric.api.transfer.v1.client.fluid.FluidVariantRendering;
45+
import net.fabricmc.fabric.api.transfer.v1.fluid.FluidConstants;
46+
import net.fabricmc.fabric.api.transfer.v1.fluid.FluidStorage;
47+
import net.fabricmc.fabric.api.transfer.v1.fluid.FluidVariant;
48+
import net.fabricmc.fabric.api.transfer.v1.fluid.FluidVariantAttributeHandler;
49+
import net.fabricmc.fabric.api.transfer.v1.fluid.base.EmptyItemFluidStorage;
50+
import net.fabricmc.fabric.api.transfer.v1.fluid.base.FullItemFluidStorage;
51+
import net.fabricmc.fabric.api.transfer.v1.item.ItemVariant;
52+
53+
import io.github.fabricators_of_create.porting_lib.event.common.FluidPlaceBlockCallback;
4254

4355
@SuppressWarnings("UnstableApiUsage")
4456
public class AllFluids {

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

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@
1010
import com.simibubi.create.api.registrate.CreateRegistrateRegistrationCallback;
1111
import com.simibubi.create.compat.Mods;
1212
import com.simibubi.create.compat.computercraft.ComputerCraftProxy;
13-
import com.simibubi.create.compat.curios.Curios;
14-
import com.simibubi.create.compat.inventorySorter.InventorySorterCompat;
13+
import com.simibubi.create.compat.trinkets.Trinkets;
1514
import com.simibubi.create.content.decoration.palettes.AllPaletteBlocks;
1615
import com.simibubi.create.content.equipment.potatoCannon.AllPotatoProjectileBlockHitActions;
1716
import com.simibubi.create.content.equipment.potatoCannon.AllPotatoProjectileEntityHitActions;
@@ -21,6 +20,7 @@
2120
import com.simibubi.create.content.kinetics.fan.processing.AllFanProcessingTypes;
2221
import com.simibubi.create.content.kinetics.mechanicalArm.AllArmInteractionPointTypes;
2322
import com.simibubi.create.content.logistics.item.filter.attribute.AllItemAttributeTypes;
23+
import com.simibubi.create.content.logistics.packager.AllInventoryIdentifiers;
2424
import com.simibubi.create.content.logistics.packager.AllUnpackingHandlers;
2525
import com.simibubi.create.content.logistics.packagerLink.GlobalLogisticsManager;
2626
import com.simibubi.create.content.redstone.link.RedstoneLinkNetworkHandler;
@@ -33,27 +33,20 @@
3333
import com.simibubi.create.foundation.advancement.AllTriggers;
3434
import com.simibubi.create.foundation.block.CopperRegistries;
3535
import com.simibubi.create.foundation.data.CreateRegistrate;
36+
import com.simibubi.create.foundation.events.CommonEvents;
3637
import com.simibubi.create.foundation.item.ItemDescription;
3738
import com.simibubi.create.foundation.item.KineticStats;
3839
import com.simibubi.create.foundation.item.TooltipModifier;
40+
import com.simibubi.create.foundation.ponder.FabricStructureProcessing;
41+
import com.simibubi.create.foundation.recipe.AllIngredients;
42+
import com.simibubi.create.impl.registry.CreateRegistriesImpl;
3943
import com.simibubi.create.infrastructure.command.ServerLagger;
4044
import com.simibubi.create.infrastructure.config.AllConfigs;
41-
import com.simibubi.create.infrastructure.data.CreateDatagen;
45+
import com.simibubi.create.infrastructure.worldgen.AllBiomeModifiers;
4246
import com.simibubi.create.infrastructure.worldgen.AllFeatures;
4347
import com.simibubi.create.infrastructure.worldgen.AllPlacementModifiers;
4448

45-
import net.minecraftforge.api.distmarker.Dist;
46-
import net.minecraftforge.common.ForgeMod;
47-
import net.minecraftforge.common.MinecraftForge;
48-
import net.minecraftforge.eventbus.api.EventPriority;
49-
import net.minecraftforge.eventbus.api.IEventBus;
50-
import net.minecraftforge.fml.DistExecutor;
51-
import net.minecraftforge.fml.ModLoadingContext;
52-
import net.minecraftforge.fml.common.Mod;
53-
import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent;
54-
import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
55-
import net.minecraftforge.registries.RegisterEvent;
56-
49+
import io.github.tropheusj.milk.Milk;
5750
import net.createmod.catnip.lang.FontHelper;
5851
import net.createmod.catnip.lang.LangBuilder;
5952
import net.minecraft.resources.ResourceKey;
@@ -62,6 +55,8 @@
6255
import net.minecraft.world.item.CreativeModeTab;
6356
import net.minecraft.world.level.Level;
6457

58+
import net.fabricmc.api.ModInitializer;
59+
6560
public class Create implements ModInitializer {
6661
public static final String ID = "create";
6762
public static final String NAME = "Create";

‎src/main/java/com/simibubi/create/compat/ftb/FTBIntegration.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,8 @@
22

33
import com.simibubi.create.foundation.gui.menu.AbstractSimiContainerScreen;
44

5-
import dev.ftb.mods.ftblibrary.FTBLibraryClient;
65
import net.createmod.catnip.gui.AbstractSimiScreen;
76
import net.minecraft.client.gui.screens.Screen;
8-
import net.minecraftforge.client.event.ScreenEvent;
9-
import net.minecraftforge.eventbus.api.EventPriority;
10-
import net.minecraftforge.eventbus.api.IEventBus;
117

128
public class FTBIntegration {
139

‎src/main/java/com/simibubi/create/compat/jei/CreateJEI.java

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777
import mezz.jei.api.IModPlugin;
7878
import mezz.jei.api.JeiPlugin;
7979
import mezz.jei.api.constants.RecipeTypes;
80-
import mezz.jei.api.forge.ForgeTypes;
80+
import mezz.jei.api.fabric.constants.FabricTypes;
8181
import mezz.jei.api.gui.drawable.IDrawable;
8282
import mezz.jei.api.helpers.IPlatformFluidHelper;
8383
import mezz.jei.api.recipe.category.IRecipeCategory;
@@ -89,9 +89,13 @@
8989
import mezz.jei.api.registration.IRecipeTransferRegistration;
9090
import mezz.jei.api.registration.ISubtypeRegistration;
9191
import mezz.jei.api.runtime.IIngredientManager;
92-
import net.createmod.catnip.config.ConfigBase.ConfigBool;
92+
import mezz.jei.api.runtime.IJeiRuntime;
93+
import mezz.jei.fabric.ingredients.fluid.JeiFluidIngredient;
94+
import net.createmod.catnip.config.ConfigBase;
9395
import net.minecraft.client.Minecraft;
96+
import net.minecraft.core.IdMap;
9497
import net.minecraft.core.RegistryAccess;
98+
import net.minecraft.core.registries.BuiltInRegistries;
9599
import net.minecraft.resources.ResourceLocation;
96100
import net.minecraft.world.effect.MobEffect;
97101
import net.minecraft.world.item.ItemStack;
@@ -101,12 +105,13 @@
101105
import net.minecraft.world.item.crafting.CraftingRecipe;
102106
import net.minecraft.world.item.crafting.Recipe;
103107
import net.minecraft.world.item.crafting.RecipeType;
108+
import net.minecraft.world.item.crafting.ShapedRecipe;
104109
import net.minecraft.world.item.crafting.SmokingRecipe;
105110
import net.minecraft.world.level.ItemLike;
106111
import net.minecraft.world.level.block.Blocks;
107-
import net.minecraftforge.common.crafting.IShapedRecipe;
108-
import net.minecraftforge.fluids.FluidStack;
109-
import net.minecraftforge.registries.ForgeRegistries;
112+
113+
import io.github.fabricators_of_create.porting_lib.fluids.FluidStack;
114+
import io.github.fabricators_of_create.porting_lib.mixin.accessors.common.accessor.RecipeManagerAccessor;
110115

111116
@JeiPlugin
112117
@SuppressWarnings("unused")

‎src/main/java/com/simibubi/create/compat/jei/StockKeeperTransferHandler.java

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,12 @@
3737
import net.minecraft.world.item.ItemStack;
3838
import net.minecraft.world.item.crafting.Recipe;
3939
import net.minecraft.world.level.Level;
40-
import net.minecraftforge.api.distmarker.Dist;
41-
import net.minecraftforge.fml.DistExecutor;
42-
import net.minecraftforge.items.ItemStackHandler;
43-
import net.minecraftforge.items.wrapper.RecipeWrapper;
40+
41+
import net.fabricmc.api.EnvType;
42+
43+
import io.github.fabricators_of_create.porting_lib.transfer.item.ItemStackHandler;
44+
import io.github.fabricators_of_create.porting_lib.transfer.item.RecipeWrapper;
45+
import io.github.fabricators_of_create.porting_lib.util.EnvExecutor;
4446

4547
@ParametersAreNonnullByDefault
4648
@MethodsReturnNonnullByDefault

‎src/main/java/com/simibubi/create/compat/jei/category/CreateRecipeCategory.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.simibubi.create.compat.jei.category;
22

3-
import java.util.ArrayList;
3+
import java.util.Collection;
44
import java.util.List;
55
import java.util.Optional;
66
import java.util.function.Supplier;
@@ -9,19 +9,17 @@
99

1010
import org.jetbrains.annotations.NotNull;
1111

12-
import com.simibubi.create.AllFluids;
13-
import com.simibubi.create.content.fluids.potion.PotionFluidHandler;
1412
import com.simibubi.create.content.processing.recipe.ProcessingOutput;
1513
import com.simibubi.create.foundation.fluid.FluidIngredient;
1614
import com.simibubi.create.foundation.gui.AllGuiTextures;
1715
import com.simibubi.create.foundation.utility.CreateLang;
1816

19-
import mezz.jei.api.forge.ForgeTypes;
17+
import mezz.jei.api.fabric.constants.FabricTypes;
18+
import mezz.jei.api.fabric.ingredients.fluids.IJeiFluidIngredient;
2019
import mezz.jei.api.gui.builder.IRecipeLayoutBuilder;
2120
import mezz.jei.api.gui.builder.IRecipeSlotBuilder;
2221
import mezz.jei.api.gui.drawable.IDrawable;
2322
import mezz.jei.api.gui.ingredient.IRecipeSlotRichTooltipCallback;
24-
import mezz.jei.api.gui.ingredient.IRecipeSlotView;
2523
import mezz.jei.api.recipe.RecipeIngredientRole;
2624
import mezz.jei.api.recipe.RecipeType;
2725
import mezz.jei.api.recipe.category.IRecipeCategory;
@@ -32,11 +30,13 @@
3230
import net.minecraft.client.Minecraft;
3331
import net.minecraft.client.gui.GuiGraphics;
3432
import net.minecraft.client.multiplayer.ClientLevel;
33+
import net.minecraft.nbt.CompoundTag;
3534
import net.minecraft.network.chat.Component;
3635
import net.minecraft.world.item.ItemStack;
3736
import net.minecraft.world.item.crafting.Recipe;
37+
import net.minecraft.world.level.material.Fluid;
3838

39-
import net.minecraftforge.fluids.FluidStack;
39+
import io.github.fabricators_of_create.porting_lib.fluids.FluidStack;
4040

4141
@ParametersAreNonnullByDefault
4242
@MethodsReturnNonnullByDefault

‎src/main/java/com/simibubi/create/content/equipment/extendoGrip/ExtendoGripItem.java

Lines changed: 9 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,56 +1,35 @@
11
package com.simibubi.create.content.equipment.extendoGrip;
22

33
import java.util.UUID;
4-
import java.util.function.Consumer;
54
import java.util.function.Supplier;
65

6+
import org.jetbrains.annotations.Nullable;
7+
78
import com.google.common.base.Suppliers;
89
import com.google.common.collect.ImmutableMultimap;
910
import com.google.common.collect.Multimap;
11+
import com.jamieswhiteshirt.reachentityattributes.ReachEntityAttributes;
1012
import com.simibubi.create.AllItems;
11-
import com.simibubi.create.AllPackets;
1213
import com.simibubi.create.content.equipment.armor.BacktankUtil;
1314
import com.simibubi.create.foundation.advancement.AllAdvancements;
14-
import com.simibubi.create.foundation.item.render.SimpleCustomRenderer;
1515
import com.simibubi.create.infrastructure.config.AllConfigs;
1616

17-
import net.createmod.catnip.animation.AnimationTickHolder;
18-
import net.minecraft.client.Minecraft;
19-
import net.minecraft.client.player.LocalPlayer;
17+
import net.minecraft.core.BlockPos;
2018
import net.minecraft.nbt.CompoundTag;
2119
import net.minecraft.world.InteractionHand;
2220
import net.minecraft.world.damagesource.DamageSource;
2321
import net.minecraft.world.entity.Entity;
2422
import net.minecraft.world.entity.LivingEntity;
2523
import net.minecraft.world.entity.ai.attributes.Attribute;
2624
import net.minecraft.world.entity.ai.attributes.AttributeModifier;
27-
import net.minecraft.world.entity.decoration.ItemFrame;
2825
import net.minecraft.world.entity.player.Player;
29-
import net.minecraft.world.entity.projectile.ProjectileUtil;
3026
import net.minecraft.world.item.Item;
3127
import net.minecraft.world.item.ItemStack;
32-
import net.minecraft.world.phys.AABB;
33-
import net.minecraft.world.phys.BlockHitResult;
34-
import net.minecraft.world.phys.EntityHitResult;
35-
import net.minecraft.world.phys.HitResult.Type;
36-
import net.minecraft.world.phys.Vec3;
37-
38-
import net.minecraftforge.api.distmarker.Dist;
39-
import net.minecraftforge.api.distmarker.OnlyIn;
40-
import net.minecraftforge.client.event.InputEvent;
41-
import net.minecraftforge.client.extensions.common.IClientItemExtensions;
42-
import net.minecraftforge.common.ForgeMod;
43-
import net.minecraftforge.event.entity.living.LivingAttackEvent;
44-
import net.minecraftforge.event.entity.living.LivingEvent.LivingTickEvent;
45-
import net.minecraftforge.event.entity.living.LivingKnockBackEvent;
46-
import net.minecraftforge.event.entity.player.AttackEntityEvent;
47-
import net.minecraftforge.event.entity.player.PlayerEvent;
48-
import net.minecraftforge.event.entity.player.PlayerInteractEvent;
49-
import net.minecraftforge.event.level.BlockEvent.BreakEvent;
50-
import net.minecraftforge.event.level.BlockEvent.EntityPlaceEvent;
51-
import net.minecraftforge.eventbus.api.EventPriority;
52-
import net.minecraftforge.eventbus.api.SubscribeEvent;
53-
import net.minecraftforge.fml.common.Mod.EventBusSubscriber;
28+
import net.minecraft.world.item.context.BlockPlaceContext;
29+
import net.minecraft.world.level.Level;
30+
import net.minecraft.world.level.LevelReader;
31+
import net.minecraft.world.level.block.entity.BlockEntity;
32+
import net.minecraft.world.level.block.state.BlockState;
5433

5534
public class ExtendoGripItem extends Item {
5635
public static final int MAX_DAMAGE = 200;

‎src/main/java/com/simibubi/create/content/equipment/goggles/GogglesItem.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,11 @@
77
import com.simibubi.create.AllItems;
88

99
import net.minecraft.world.InteractionHand;
10-
import net.minecraft.world.InteractionResult;
1110
import net.minecraft.world.InteractionResultHolder;
1211
import net.minecraft.world.entity.EquipmentSlot;
13-
import net.minecraft.world.entity.Mob;
1412
import net.minecraft.world.entity.player.Player;
1513
import net.minecraft.world.item.ArmorItem;
14+
import net.minecraft.world.item.Equipable;
1615
import net.minecraft.world.item.Item;
1716
import net.minecraft.world.item.ItemStack;
1817
import net.minecraft.world.level.Level;

‎src/main/java/com/simibubi/create/content/equipment/tool/CardboardSwordItem.java

Lines changed: 8 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,19 @@
11
package com.simibubi.create.content.equipment.tool;
22

3-
import java.util.function.Consumer;
3+
import java.util.Map;
44

55
import org.jetbrains.annotations.NotNull;
6-
import org.jetbrains.annotations.Nullable;
76

87
import com.simibubi.create.AllItems;
98
import com.simibubi.create.AllPackets;
109
import com.simibubi.create.AllSoundEvents;
11-
import com.simibubi.create.foundation.item.render.SimpleCustomRenderer;
12-
13-
import net.minecraftforge.api.distmarker.Dist;
14-
import net.minecraftforge.api.distmarker.OnlyIn;
15-
import net.minecraftforge.client.extensions.common.IClientItemExtensions;
16-
import net.minecraftforge.event.entity.living.LivingAttackEvent;
17-
import net.minecraftforge.event.entity.player.PlayerInteractEvent.LeftClickBlock;
18-
import net.minecraftforge.event.entity.player.PlayerInteractEvent.LeftClickBlock.Action;
19-
import net.minecraftforge.eventbus.api.SubscribeEvent;
20-
import net.minecraftforge.fml.LogicalSide;
21-
import net.minecraftforge.fml.common.Mod.EventBusSubscriber;
22-
import net.minecraftforge.network.PacketDistributor;
2310

11+
import net.minecraft.core.BlockPos;
12+
import net.minecraft.core.Direction;
2413
import net.minecraft.server.level.ServerPlayer;
2514
import net.minecraft.util.Mth;
2615
import net.minecraft.world.InteractionHand;
16+
import net.minecraft.world.InteractionResult;
2717
import net.minecraft.world.effect.MobEffectInstance;
2818
import net.minecraft.world.effect.MobEffects;
2919
import net.minecraft.world.entity.Entity;
@@ -35,10 +25,13 @@
3525
import net.minecraft.world.item.ItemStack;
3626
import net.minecraft.world.item.ItemStack.TooltipPart;
3727
import net.minecraft.world.item.SwordItem;
38-
import net.minecraft.world.item.crafting.RecipeType;
3928
import net.minecraft.world.item.enchantment.Enchantment;
4029
import net.minecraft.world.item.enchantment.EnchantmentHelper;
4130
import net.minecraft.world.item.enchantment.Enchantments;
31+
import net.minecraft.world.level.Level;
32+
33+
import io.github.fabricators_of_create.porting_lib.enchant.CustomEnchantingBehaviorItem;
34+
import io.github.fabricators_of_create.porting_lib.entity.events.LivingAttackEvent;
4235

4336
public class CardboardSwordItem extends SwordItem implements CustomEnchantingBehaviorItem {
4437

‎src/main/java/com/simibubi/create/content/fluids/pipes/GlassPipeVisual.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,8 @@
2828
import net.minecraft.world.inventory.InventoryMenu;
2929
import net.minecraft.world.level.material.Fluid;
3030

31-
import net.minecraftforge.client.extensions.common.IClientFluidTypeExtensions;
32-
import net.minecraftforge.fluids.FluidStack;
33-
import net.minecraftforge.fluids.FluidType;
31+
import io.github.fabricators_of_create.porting_lib.fluids.FluidStack;
32+
import io.github.fabricators_of_create.porting_lib.fluids.FluidType;
3433

3534
public class GlassPipeVisual extends AbstractBlockEntityVisual<StraightPipeBlockEntity> implements SimpleDynamicVisual {
3635

0 commit comments

Comments
 (0)