diff --git a/common/src/main/java/dev/architectury/extensions/injected/InjectedBucketItemExtension.java b/common/src/main/java/dev/architectury/extensions/injected/InjectedBucketItemExtension.java index 6db4d88d..52656234 100644 --- a/common/src/main/java/dev/architectury/extensions/injected/InjectedBucketItemExtension.java +++ b/common/src/main/java/dev/architectury/extensions/injected/InjectedBucketItemExtension.java @@ -1,22 +1,3 @@ -/* - * This file is part of architectury. - * Copyright (C) 2020, 2021, 2022 architectury - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 3 of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - package dev.architectury.extensions.injected; import dev.architectury.hooks.fluid.FluidBucketHooks; diff --git a/common/src/main/java/dev/architectury/extensions/injected/InjectedLiquidBlockExtension.java b/common/src/main/java/dev/architectury/extensions/injected/InjectedLiquidBlockExtension.java deleted file mode 100644 index 330d1d08..00000000 --- a/common/src/main/java/dev/architectury/extensions/injected/InjectedLiquidBlockExtension.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * This file is part of architectury. - * Copyright (C) 2020, 2021, 2022 architectury - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 3 of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - -package dev.architectury.extensions.injected; - -import dev.architectury.hooks.fluid.LiquidBlockHooks; -import net.minecraft.world.level.block.LiquidBlock; -import net.minecraft.world.level.material.FlowingFluid; - -public interface InjectedLiquidBlockExtension { - default FlowingFluid arch$getFluid() { - return LiquidBlockHooks.getFluid((LiquidBlock) this); - } -} diff --git a/common/src/main/java/dev/architectury/hooks/fluid/LiquidBlockHooks.java b/common/src/main/java/dev/architectury/hooks/fluid/LiquidBlockHooks.java deleted file mode 100644 index 49e04e6b..00000000 --- a/common/src/main/java/dev/architectury/hooks/fluid/LiquidBlockHooks.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * This file is part of architectury. - * Copyright (C) 2020, 2021, 2022 architectury - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 3 of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - -package dev.architectury.hooks.fluid; - -import dev.architectury.injectables.annotations.ExpectPlatform; -import net.minecraft.world.level.block.LiquidBlock; -import net.minecraft.world.level.material.FlowingFluid; - -public final class LiquidBlockHooks { - /** - * Returns the fluid contained in the liquid block. - * This requires special handling since forge defers the fiuid. - * - * @param block the liquid block - * @return the fluid contained in the liquid block - */ - @ExpectPlatform - public static FlowingFluid getFluid(LiquidBlock block) { - throw new AssertionError(); - } -} diff --git a/common/src/main/java/dev/architectury/mixin/inject/MixinBlock.java b/common/src/main/java/dev/architectury/mixin/inject/MixinBlock.java index 78001554..341a292f 100644 --- a/common/src/main/java/dev/architectury/mixin/inject/MixinBlock.java +++ b/common/src/main/java/dev/architectury/mixin/inject/MixinBlock.java @@ -1,22 +1,3 @@ -/* - * This file is part of architectury. - * Copyright (C) 2020, 2021, 2022 architectury - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 3 of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - package dev.architectury.mixin.inject; import dev.architectury.extensions.injected.InjectedBlockExtension; diff --git a/common/src/main/java/dev/architectury/mixin/inject/MixinBucketItem.java b/common/src/main/java/dev/architectury/mixin/inject/MixinBucketItem.java index 3808e4d5..fba02eea 100644 --- a/common/src/main/java/dev/architectury/mixin/inject/MixinBucketItem.java +++ b/common/src/main/java/dev/architectury/mixin/inject/MixinBucketItem.java @@ -1,22 +1,3 @@ -/* - * This file is part of architectury. - * Copyright (C) 2020, 2021, 2022 architectury - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 3 of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - package dev.architectury.mixin.inject; import dev.architectury.extensions.injected.InjectedBucketItemExtension; diff --git a/common/src/main/java/dev/architectury/mixin/inject/MixinEntityType.java b/common/src/main/java/dev/architectury/mixin/inject/MixinEntityType.java index cfe3e3f9..b4536433 100644 --- a/common/src/main/java/dev/architectury/mixin/inject/MixinEntityType.java +++ b/common/src/main/java/dev/architectury/mixin/inject/MixinEntityType.java @@ -1,22 +1,3 @@ -/* - * This file is part of architectury. - * Copyright (C) 2020, 2021, 2022 architectury - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 3 of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - package dev.architectury.mixin.inject; import dev.architectury.extensions.injected.InjectedEntityTypeExtension; diff --git a/common/src/main/java/dev/architectury/mixin/inject/MixinFluid.java b/common/src/main/java/dev/architectury/mixin/inject/MixinFluid.java index 378d8401..4782fb3a 100644 --- a/common/src/main/java/dev/architectury/mixin/inject/MixinFluid.java +++ b/common/src/main/java/dev/architectury/mixin/inject/MixinFluid.java @@ -1,22 +1,3 @@ -/* - * This file is part of architectury. - * Copyright (C) 2020, 2021, 2022 architectury - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 3 of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - package dev.architectury.mixin.inject; import dev.architectury.extensions.injected.InjectedFluidExtension; diff --git a/common/src/main/java/dev/architectury/mixin/inject/MixinFoodPropertiesBuilder.java b/common/src/main/java/dev/architectury/mixin/inject/MixinFoodPropertiesBuilder.java deleted file mode 100644 index 13dad400..00000000 --- a/common/src/main/java/dev/architectury/mixin/inject/MixinFoodPropertiesBuilder.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * This file is part of architectury. - * Copyright (C) 2020, 2021, 2022 architectury - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 3 of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - -package dev.architectury.mixin.inject; - -import dev.architectury.extensions.injected.InjectedFoodPropertiesBuilderExtension; -import net.minecraft.world.food.FoodProperties; -import org.spongepowered.asm.mixin.Mixin; - -@Mixin(FoodProperties.Builder.class) -public class MixinFoodPropertiesBuilder implements InjectedFoodPropertiesBuilderExtension { -} diff --git a/common/src/main/java/dev/architectury/mixin/inject/MixinGameEvent.java b/common/src/main/java/dev/architectury/mixin/inject/MixinGameEvent.java index a71fc894..84fbda0e 100644 --- a/common/src/main/java/dev/architectury/mixin/inject/MixinGameEvent.java +++ b/common/src/main/java/dev/architectury/mixin/inject/MixinGameEvent.java @@ -1,22 +1,3 @@ -/* - * This file is part of architectury. - * Copyright (C) 2020, 2021, 2022 architectury - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 3 of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - package dev.architectury.mixin.inject; import dev.architectury.extensions.injected.InjectedGameEventExtension; diff --git a/common/src/main/java/dev/architectury/mixin/inject/MixinItem.java b/common/src/main/java/dev/architectury/mixin/inject/MixinItem.java index 4b2a34bc..1ef8b53a 100644 --- a/common/src/main/java/dev/architectury/mixin/inject/MixinItem.java +++ b/common/src/main/java/dev/architectury/mixin/inject/MixinItem.java @@ -1,22 +1,3 @@ -/* - * This file is part of architectury. - * Copyright (C) 2020, 2021, 2022 architectury - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 3 of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - package dev.architectury.mixin.inject; import dev.architectury.extensions.injected.InjectedItemExtension; diff --git a/common/src/main/java/dev/architectury/mixin/inject/MixinLiquidBlock.java b/common/src/main/java/dev/architectury/mixin/inject/MixinLiquidBlock.java deleted file mode 100644 index f518a514..00000000 --- a/common/src/main/java/dev/architectury/mixin/inject/MixinLiquidBlock.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * This file is part of architectury. - * Copyright (C) 2020, 2021, 2022 architectury - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 3 of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - -package dev.architectury.mixin.inject; - -import dev.architectury.extensions.injected.InjectedLiquidBlockExtension; -import net.minecraft.world.level.block.LiquidBlock; -import org.spongepowered.asm.mixin.Mixin; - -@Mixin(LiquidBlock.class) -public class MixinLiquidBlock implements InjectedLiquidBlockExtension { -} diff --git a/common/src/main/resources/architectury-common.mixins.json b/common/src/main/resources/architectury-common.mixins.json index 76b27514..a8d49c96 100644 --- a/common/src/main/resources/architectury-common.mixins.json +++ b/common/src/main/resources/architectury-common.mixins.json @@ -10,10 +10,8 @@ "inject.MixinBucketItem", "inject.MixinEntityType", "inject.MixinFluid", - "inject.MixinFoodPropertiesBuilder", "inject.MixinGameEvent", "inject.MixinItem", - "inject.MixinLiquidBlock", "MixinLightningBolt" ], "injectors": { diff --git a/common/src/main/resources/architectury.common.json b/common/src/main/resources/architectury.common.json index a6d0c93c..7682f1c8 100644 --- a/common/src/main/resources/architectury.common.json +++ b/common/src/main/resources/architectury.common.json @@ -21,9 +21,6 @@ ], "net/minecraft/class_4174$class_4175": [ "dev/architectury/extensions/injected/InjectedFoodPropertiesBuilderExtension" - ], - "net/minecraft/class_2404": [ - "dev/architectury/extensions/injected/InjectedLiquidBlockExtension" ] } } \ No newline at end of file diff --git a/fabric/src/main/java/dev/architectury/hooks/fluid/fabric/LiquidBlockHooksImpl.java b/fabric/src/main/java/dev/architectury/hooks/fluid/fabric/LiquidBlockHooksImpl.java deleted file mode 100644 index aad798d0..00000000 --- a/fabric/src/main/java/dev/architectury/hooks/fluid/fabric/LiquidBlockHooksImpl.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * This file is part of architectury. - * Copyright (C) 2020, 2021, 2022 architectury - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 3 of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - -package dev.architectury.hooks.fluid.fabric; - -import dev.architectury.mixin.fabric.LiquidBlockAccessor; -import net.minecraft.world.level.block.LiquidBlock; -import net.minecraft.world.level.material.FlowingFluid; - -public class LiquidBlockHooksImpl { - public static FlowingFluid getFluid(LiquidBlock block) { - return ((LiquidBlockAccessor) block).getFluid(); - } -} diff --git a/fabric/src/main/java/dev/architectury/mixin/fabric/LiquidBlockAccessor.java b/fabric/src/main/java/dev/architectury/mixin/fabric/LiquidBlockAccessor.java deleted file mode 100644 index 48cb8b43..00000000 --- a/fabric/src/main/java/dev/architectury/mixin/fabric/LiquidBlockAccessor.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * This file is part of architectury. - * Copyright (C) 2020, 2021, 2022 architectury - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 3 of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - -package dev.architectury.mixin.fabric; - -import net.minecraft.world.level.block.LiquidBlock; -import net.minecraft.world.level.material.FlowingFluid; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.gen.Accessor; - -@Mixin(LiquidBlock.class) -public interface LiquidBlockAccessor { - @Accessor("fluid") - FlowingFluid getFluid(); -} diff --git a/fabric/src/main/resources/architectury.mixins.json b/fabric/src/main/resources/architectury.mixins.json index 363897b1..52aa0a6a 100644 --- a/fabric/src/main/resources/architectury.mixins.json +++ b/fabric/src/main/resources/architectury.mixins.json @@ -28,7 +28,6 @@ "BucketItemAccessor", "ExplosionPreInvoker", "HorseTameInvoker", - "LiquidBlockAccessor", "LivingDeathInvoker", "MixinBaseSpawner", "MixinBlockItem", diff --git a/forge/src/main/java/dev/architectury/hooks/fluid/forge/LiquidBlockHooksImpl.java b/forge/src/main/java/dev/architectury/hooks/fluid/forge/LiquidBlockHooksImpl.java deleted file mode 100644 index f5f7bb63..00000000 --- a/forge/src/main/java/dev/architectury/hooks/fluid/forge/LiquidBlockHooksImpl.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * This file is part of architectury. - * Copyright (C) 2020, 2021, 2022 architectury - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 3 of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - -package dev.architectury.hooks.fluid.forge; - -import net.minecraft.world.level.block.LiquidBlock; -import net.minecraft.world.level.material.FlowingFluid; - -public class LiquidBlockHooksImpl { - public static FlowingFluid getFluid(LiquidBlock block) { - return block.getFluid(); - } -}