From e455a56c363033fcfd47946eae82db3917dfe522 Mon Sep 17 00:00:00 2001 From: raoulvdberge Date: Thu, 29 Aug 2019 11:35:55 +0200 Subject: [PATCH] Disable/remove all integrations. --- .../IntegrationCraftingTweaks.java | 11 ++--------- .../IntegrationFunkyLocomotion.java | 4 ++-- .../MoveFactoryNetworkNode.java | 5 +++-- .../MoveFactoryRegisterer.java | 3 ++- .../IntegrationInventorySorter.java | 3 ++- .../integration/jei/AdvancedGuiHandler.java | 3 ++- .../jei/GhostIngredientHandler.java | 3 ++- .../integration/jei/IntegrationJEI.java | 3 ++- .../integration/jei/RSJEIPlugin.java | 3 ++- .../jei/RecipeRegistryPluginCover.java | 2 ++ .../jei/RecipeRegistryPluginHollowCover.java | 3 ++- .../jei/RecipeTransferHandlerGrid.java | 3 ++- .../integration/jei/RecipeWrapperCover.java | 2 ++ .../jei/RecipeWrapperHollowCover.java | 2 ++ .../oc/ConverterCraftingPattern.java | 3 ++- .../oc/ConverterCraftingRequestInfo.java | 3 ++- .../integration/oc/ConverterCraftingTask.java | 3 ++- .../integration/oc/DriverNetwork.java | 3 ++- .../integration/oc/EnvironmentNetwork.java | 2 ++ .../integration/oc/IntegrationOC.java | 2 ++ .../funkylocomotion/api/FunkyRegistry.java | 19 ------------------- .../funkylocomotion/api/IMoveFactory.java | 11 ----------- .../funkylocomotion/api/package-info.java | 4 ---- .../api/MouseTweaksDisableWheelTweak.java | 14 -------------- 24 files changed, 41 insertions(+), 73 deletions(-) delete mode 100644 src/main/java/com/rwtema/funkylocomotion/api/FunkyRegistry.java delete mode 100644 src/main/java/com/rwtema/funkylocomotion/api/IMoveFactory.java delete mode 100644 src/main/java/com/rwtema/funkylocomotion/api/package-info.java delete mode 100644 src/main/java/yalter/mousetweaks/api/MouseTweaksDisableWheelTweak.java diff --git a/src/main/java/com/raoulvdberge/refinedstorage/integration/craftingtweaks/IntegrationCraftingTweaks.java b/src/main/java/com/raoulvdberge/refinedstorage/integration/craftingtweaks/IntegrationCraftingTweaks.java index d34e670b0..4d015c2ec 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/integration/craftingtweaks/IntegrationCraftingTweaks.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/integration/craftingtweaks/IntegrationCraftingTweaks.java @@ -1,14 +1,6 @@ package com.raoulvdberge.refinedstorage.integration.craftingtweaks; -import com.google.common.base.Function; -import com.google.common.base.Predicate; -import com.raoulvdberge.refinedstorage.api.network.grid.GridType; -import com.raoulvdberge.refinedstorage.container.ContainerGrid; -import com.raoulvdberge.refinedstorage.container.slot.grid.SlotGridCrafting; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraftforge.fml.common.Loader; -import net.minecraftforge.fml.common.event.FMLInterModComms; - +/* public final class IntegrationCraftingTweaks { private static final String ID = "craftingtweaks"; @@ -46,3 +38,4 @@ public final class IntegrationCraftingTweaks { } } } +*/ diff --git a/src/main/java/com/raoulvdberge/refinedstorage/integration/funkylocomotion/IntegrationFunkyLocomotion.java b/src/main/java/com/raoulvdberge/refinedstorage/integration/funkylocomotion/IntegrationFunkyLocomotion.java index 7a9a88989..44091fed0 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/integration/funkylocomotion/IntegrationFunkyLocomotion.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/integration/funkylocomotion/IntegrationFunkyLocomotion.java @@ -1,9 +1,9 @@ package com.raoulvdberge.refinedstorage.integration.funkylocomotion; -import net.minecraftforge.fml.common.Loader; - +/* public final class IntegrationFunkyLocomotion { public static boolean isLoaded() { return Loader.isModLoaded("funkylocomotion"); } } +*/ diff --git a/src/main/java/com/raoulvdberge/refinedstorage/integration/funkylocomotion/MoveFactoryNetworkNode.java b/src/main/java/com/raoulvdberge/refinedstorage/integration/funkylocomotion/MoveFactoryNetworkNode.java index c66176ade..a40ce41a3 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/integration/funkylocomotion/MoveFactoryNetworkNode.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/integration/funkylocomotion/MoveFactoryNetworkNode.java @@ -1,5 +1,5 @@ package com.raoulvdberge.refinedstorage.integration.funkylocomotion; - +/* import com.raoulvdberge.refinedstorage.api.network.node.INetworkNode; import com.raoulvdberge.refinedstorage.api.network.node.INetworkNodeManager; import com.raoulvdberge.refinedstorage.apiimpl.API; @@ -72,4 +72,5 @@ public class MoveFactoryNetworkNode implements IMoveFactory { return true; } -} \ No newline at end of file +} + */ \ No newline at end of file diff --git a/src/main/java/com/raoulvdberge/refinedstorage/integration/funkylocomotion/MoveFactoryRegisterer.java b/src/main/java/com/raoulvdberge/refinedstorage/integration/funkylocomotion/MoveFactoryRegisterer.java index 808fe8c6a..ba2ad2d73 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/integration/funkylocomotion/MoveFactoryRegisterer.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/integration/funkylocomotion/MoveFactoryRegisterer.java @@ -1,5 +1,5 @@ package com.raoulvdberge.refinedstorage.integration.funkylocomotion; - +/* import com.raoulvdberge.refinedstorage.block.BlockBase; import com.raoulvdberge.refinedstorage.block.BlockNode; import com.rwtema.funkylocomotion.api.FunkyRegistry; @@ -16,3 +16,4 @@ public class MoveFactoryRegisterer { } } } +*/ diff --git a/src/main/java/com/raoulvdberge/refinedstorage/integration/inventorysorter/IntegrationInventorySorter.java b/src/main/java/com/raoulvdberge/refinedstorage/integration/inventorysorter/IntegrationInventorySorter.java index 3ab4d1193..365136886 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/integration/inventorysorter/IntegrationInventorySorter.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/integration/inventorysorter/IntegrationInventorySorter.java @@ -1,5 +1,5 @@ package com.raoulvdberge.refinedstorage.integration.inventorysorter; - +/* import net.minecraftforge.fml.common.event.FMLInterModComms; public class IntegrationInventorySorter { @@ -8,3 +8,4 @@ public class IntegrationInventorySorter { FMLInterModComms.sendMessage("inventorysorter", "slotblacklist", "com.raoulvdberge.refinedstorage.container.slot.SlotCrafterManager"); } } + */ \ No newline at end of file diff --git a/src/main/java/com/raoulvdberge/refinedstorage/integration/jei/AdvancedGuiHandler.java b/src/main/java/com/raoulvdberge/refinedstorage/integration/jei/AdvancedGuiHandler.java index 1ebbe00bc..d1af1ba26 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/integration/jei/AdvancedGuiHandler.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/integration/jei/AdvancedGuiHandler.java @@ -1,5 +1,5 @@ package com.raoulvdberge.refinedstorage.integration.jei; - +/* import com.raoulvdberge.refinedstorage.container.ContainerBase; import com.raoulvdberge.refinedstorage.container.slot.filter.SlotFilterFluid; import com.raoulvdberge.refinedstorage.gui.GuiBase; @@ -50,3 +50,4 @@ public class AdvancedGuiHandler implements IAdvancedGuiHandler { return null; } } +*/ \ No newline at end of file diff --git a/src/main/java/com/raoulvdberge/refinedstorage/integration/jei/GhostIngredientHandler.java b/src/main/java/com/raoulvdberge/refinedstorage/integration/jei/GhostIngredientHandler.java index a45ea03e8..616c3bdc0 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/integration/jei/GhostIngredientHandler.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/integration/jei/GhostIngredientHandler.java @@ -1,5 +1,5 @@ package com.raoulvdberge.refinedstorage.integration.jei; - +/* import com.raoulvdberge.refinedstorage.RS; import com.raoulvdberge.refinedstorage.container.slot.filter.SlotFilter; import com.raoulvdberge.refinedstorage.container.slot.filter.SlotFilterFluid; @@ -71,3 +71,4 @@ public class GhostIngredientHandler implements IGhostIngredientHandler // NO OP } } +*/ \ No newline at end of file diff --git a/src/main/java/com/raoulvdberge/refinedstorage/integration/jei/IntegrationJEI.java b/src/main/java/com/raoulvdberge/refinedstorage/integration/jei/IntegrationJEI.java index 76626ca64..7f22e5af9 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/integration/jei/IntegrationJEI.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/integration/jei/IntegrationJEI.java @@ -1,5 +1,5 @@ package com.raoulvdberge.refinedstorage.integration.jei; - +/* import net.minecraftforge.fml.common.Loader; public final class IntegrationJEI { @@ -7,3 +7,4 @@ public final class IntegrationJEI { return Loader.isModLoaded("jei"); } } + */ diff --git a/src/main/java/com/raoulvdberge/refinedstorage/integration/jei/RSJEIPlugin.java b/src/main/java/com/raoulvdberge/refinedstorage/integration/jei/RSJEIPlugin.java index a6ac4edfd..143f17baa 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/integration/jei/RSJEIPlugin.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/integration/jei/RSJEIPlugin.java @@ -1,5 +1,5 @@ package com.raoulvdberge.refinedstorage.integration.jei; - +/* import mezz.jei.api.IJeiRuntime; import mezz.jei.api.IModPlugin; import mezz.jei.api.IModRegistry; @@ -35,3 +35,4 @@ public class RSJEIPlugin implements IModPlugin { return runtime; } } +*/ \ No newline at end of file diff --git a/src/main/java/com/raoulvdberge/refinedstorage/integration/jei/RecipeRegistryPluginCover.java b/src/main/java/com/raoulvdberge/refinedstorage/integration/jei/RecipeRegistryPluginCover.java index 00b7975dc..7cd9139dd 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/integration/jei/RecipeRegistryPluginCover.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/integration/jei/RecipeRegistryPluginCover.java @@ -1,5 +1,6 @@ package com.raoulvdberge.refinedstorage.integration.jei; +/* import com.raoulvdberge.refinedstorage.RS; import com.raoulvdberge.refinedstorage.RSItems; import com.raoulvdberge.refinedstorage.apiimpl.API; @@ -59,3 +60,4 @@ public class RecipeRegistryPluginCover implements IRecipeRegistryPlugin { return Collections.emptyList(); } } +*/ \ No newline at end of file diff --git a/src/main/java/com/raoulvdberge/refinedstorage/integration/jei/RecipeRegistryPluginHollowCover.java b/src/main/java/com/raoulvdberge/refinedstorage/integration/jei/RecipeRegistryPluginHollowCover.java index aa56a29da..4cccaa7b4 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/integration/jei/RecipeRegistryPluginHollowCover.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/integration/jei/RecipeRegistryPluginHollowCover.java @@ -1,5 +1,5 @@ package com.raoulvdberge.refinedstorage.integration.jei; - +/* import com.raoulvdberge.refinedstorage.RS; import com.raoulvdberge.refinedstorage.RSItems; import com.raoulvdberge.refinedstorage.apiimpl.API; @@ -72,3 +72,4 @@ public class RecipeRegistryPluginHollowCover implements IRecipeRegistryPlugin { return Collections.emptyList(); } } +*/ \ No newline at end of file diff --git a/src/main/java/com/raoulvdberge/refinedstorage/integration/jei/RecipeTransferHandlerGrid.java b/src/main/java/com/raoulvdberge/refinedstorage/integration/jei/RecipeTransferHandlerGrid.java index a92b1090c..937602a20 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/integration/jei/RecipeTransferHandlerGrid.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/integration/jei/RecipeTransferHandlerGrid.java @@ -1,5 +1,5 @@ package com.raoulvdberge.refinedstorage.integration.jei; - +/* import com.raoulvdberge.refinedstorage.RS; import com.raoulvdberge.refinedstorage.api.network.grid.GridType; import com.raoulvdberge.refinedstorage.api.network.grid.IGrid; @@ -101,3 +101,4 @@ public class RecipeTransferHandlerGrid implements IRecipeTransferHandler { return null; } } +*/ \ No newline at end of file diff --git a/src/main/java/com/raoulvdberge/refinedstorage/integration/jei/RecipeWrapperCover.java b/src/main/java/com/raoulvdberge/refinedstorage/integration/jei/RecipeWrapperCover.java index 51db26aaf..dfe991dc2 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/integration/jei/RecipeWrapperCover.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/integration/jei/RecipeWrapperCover.java @@ -1,5 +1,6 @@ package com.raoulvdberge.refinedstorage.integration.jei; +/* import com.raoulvdberge.refinedstorage.RSItems; import mezz.jei.api.ingredients.IIngredients; import mezz.jei.api.ingredients.VanillaTypes; @@ -30,3 +31,4 @@ public class RecipeWrapperCover implements ICraftingRecipeWrapper { ingredients.setOutput(VanillaTypes.ITEM, cover); } } +*/ \ No newline at end of file diff --git a/src/main/java/com/raoulvdberge/refinedstorage/integration/jei/RecipeWrapperHollowCover.java b/src/main/java/com/raoulvdberge/refinedstorage/integration/jei/RecipeWrapperHollowCover.java index 4cc1b1cb2..a585c6303 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/integration/jei/RecipeWrapperHollowCover.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/integration/jei/RecipeWrapperHollowCover.java @@ -1,5 +1,6 @@ package com.raoulvdberge.refinedstorage.integration.jei; +/* import mezz.jei.api.ingredients.IIngredients; import mezz.jei.api.ingredients.VanillaTypes; import mezz.jei.api.recipe.wrapper.IShapedCraftingRecipeWrapper; @@ -44,3 +45,4 @@ public class RecipeWrapperHollowCover implements IShapedCraftingRecipeWrapper { return 3; } } +*/ \ No newline at end of file diff --git a/src/main/java/com/raoulvdberge/refinedstorage/integration/oc/ConverterCraftingPattern.java b/src/main/java/com/raoulvdberge/refinedstorage/integration/oc/ConverterCraftingPattern.java index 70d7dbb16..147b88480 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/integration/oc/ConverterCraftingPattern.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/integration/oc/ConverterCraftingPattern.java @@ -1,5 +1,5 @@ package com.raoulvdberge.refinedstorage.integration.oc; - +/* import com.raoulvdberge.refinedstorage.api.autocrafting.ICraftingPattern; import li.cil.oc.api.driver.Converter; @@ -26,3 +26,4 @@ public class ConverterCraftingPattern implements Converter { } } } +*/ \ No newline at end of file diff --git a/src/main/java/com/raoulvdberge/refinedstorage/integration/oc/ConverterCraftingRequestInfo.java b/src/main/java/com/raoulvdberge/refinedstorage/integration/oc/ConverterCraftingRequestInfo.java index ec39bd1fa..68f98555d 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/integration/oc/ConverterCraftingRequestInfo.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/integration/oc/ConverterCraftingRequestInfo.java @@ -1,5 +1,5 @@ package com.raoulvdberge.refinedstorage.integration.oc; - +/* import com.raoulvdberge.refinedstorage.api.autocrafting.task.ICraftingRequestInfo; import li.cil.oc.api.driver.Converter; @@ -14,3 +14,4 @@ public class ConverterCraftingRequestInfo implements Converter { } } } +*/ \ No newline at end of file diff --git a/src/main/java/com/raoulvdberge/refinedstorage/integration/oc/ConverterCraftingTask.java b/src/main/java/com/raoulvdberge/refinedstorage/integration/oc/ConverterCraftingTask.java index cbe7c3e3c..546b65ef6 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/integration/oc/ConverterCraftingTask.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/integration/oc/ConverterCraftingTask.java @@ -1,5 +1,5 @@ package com.raoulvdberge.refinedstorage.integration.oc; - +/* import com.raoulvdberge.refinedstorage.api.autocrafting.task.ICraftingTask; import li.cil.oc.api.driver.Converter; @@ -19,3 +19,4 @@ public class ConverterCraftingTask implements Converter { } } } +*/ \ No newline at end of file diff --git a/src/main/java/com/raoulvdberge/refinedstorage/integration/oc/DriverNetwork.java b/src/main/java/com/raoulvdberge/refinedstorage/integration/oc/DriverNetwork.java index 4a1aa257e..7e6b8025c 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/integration/oc/DriverNetwork.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/integration/oc/DriverNetwork.java @@ -1,5 +1,5 @@ package com.raoulvdberge.refinedstorage.integration.oc; - +/* import com.raoulvdberge.refinedstorage.api.network.INetwork; import com.raoulvdberge.refinedstorage.capability.CapabilityNetworkNodeProxy; import li.cil.oc.api.Driver; @@ -36,3 +36,4 @@ public class DriverNetwork implements DriverBlock { Driver.add(new ConverterCraftingRequestInfo()); } } +*/ \ No newline at end of file diff --git a/src/main/java/com/raoulvdberge/refinedstorage/integration/oc/EnvironmentNetwork.java b/src/main/java/com/raoulvdberge/refinedstorage/integration/oc/EnvironmentNetwork.java index ecdef86fa..44fed3f85 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/integration/oc/EnvironmentNetwork.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/integration/oc/EnvironmentNetwork.java @@ -1,5 +1,6 @@ package com.raoulvdberge.refinedstorage.integration.oc; +/* import com.raoulvdberge.refinedstorage.api.autocrafting.ICraftingPattern; import com.raoulvdberge.refinedstorage.api.autocrafting.task.ICraftingTask; import com.raoulvdberge.refinedstorage.api.autocrafting.task.ICraftingTaskError; @@ -454,3 +455,4 @@ public class EnvironmentNetwork extends AbstractManagedEnvironment { return stack; } } +*/ diff --git a/src/main/java/com/raoulvdberge/refinedstorage/integration/oc/IntegrationOC.java b/src/main/java/com/raoulvdberge/refinedstorage/integration/oc/IntegrationOC.java index c4689d421..a0e6882e5 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/integration/oc/IntegrationOC.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/integration/oc/IntegrationOC.java @@ -1,5 +1,6 @@ package com.raoulvdberge.refinedstorage.integration.oc; +/* import net.minecraftforge.fml.common.Loader; public final class IntegrationOC { @@ -9,3 +10,4 @@ public final class IntegrationOC { return Loader.isModLoaded(ID); } } +*/ \ No newline at end of file diff --git a/src/main/java/com/rwtema/funkylocomotion/api/FunkyRegistry.java b/src/main/java/com/rwtema/funkylocomotion/api/FunkyRegistry.java deleted file mode 100644 index d5bb55ef4..000000000 --- a/src/main/java/com/rwtema/funkylocomotion/api/FunkyRegistry.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.rwtema.funkylocomotion.api; - -import net.minecraft.block.Block; -import net.minecraftforge.common.capabilities.Capability; - -import javax.annotation.Nullable; - -public abstract class FunkyRegistry { - @Nullable - public static FunkyRegistry INSTANCE = null; - - public abstract void registerMoveFactoryBlock(Block b, IMoveFactory factory); - - public abstract void registerMoveFactoryTileEntityClass(Class tile, IMoveFactory factory); - - public abstract void registerMoveFactoryBlockClass(Class b, IMoveFactory factory); - - public abstract void registerProxy(Object object, Capability capability, T type); -} diff --git a/src/main/java/com/rwtema/funkylocomotion/api/IMoveFactory.java b/src/main/java/com/rwtema/funkylocomotion/api/IMoveFactory.java deleted file mode 100644 index e39258e98..000000000 --- a/src/main/java/com/rwtema/funkylocomotion/api/IMoveFactory.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.rwtema.funkylocomotion.api; - -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; - -public interface IMoveFactory { - NBTTagCompound destroyBlock(World world, BlockPos pos); - - boolean recreateBlock(World world, BlockPos pos, NBTTagCompound tag); -} diff --git a/src/main/java/com/rwtema/funkylocomotion/api/package-info.java b/src/main/java/com/rwtema/funkylocomotion/api/package-info.java deleted file mode 100644 index 95e03a443..000000000 --- a/src/main/java/com/rwtema/funkylocomotion/api/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -@API(apiVersion = "2.0", owner = "funkylocomotion", provides = "funkylocomotion_api") -package com.rwtema.funkylocomotion.api; - -import net.minecraftforge.fml.common.API; \ No newline at end of file diff --git a/src/main/java/yalter/mousetweaks/api/MouseTweaksDisableWheelTweak.java b/src/main/java/yalter/mousetweaks/api/MouseTweaksDisableWheelTweak.java deleted file mode 100644 index bd425607c..000000000 --- a/src/main/java/yalter/mousetweaks/api/MouseTweaksDisableWheelTweak.java +++ /dev/null @@ -1,14 +0,0 @@ -package yalter.mousetweaks.api; - -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -/** - * Put this on your GuiScreen to disable the wheel tweak. - */ -@Retention(RetentionPolicy.RUNTIME) -@Target(ElementType.TYPE) -public @interface MouseTweaksDisableWheelTweak { -} \ No newline at end of file