From 7213fed7e3d08882ce7fcdcf7da9517bc0d81f7c Mon Sep 17 00:00:00 2001 From: quat1024 Date: Thu, 19 Oct 2023 06:14:24 -0400 Subject: [PATCH] Inline QuarkModule :crab: --- .../quark/addons/oddities/block/CrateBlock.java | 4 ++-- .../quark/addons/oddities/block/MagnetBlock.java | 4 ++-- .../block/MatrixEnchantingTableBlock.java | 8 ++++---- .../oddities/block/MovingMagnetizedBlock.java | 4 ++-- .../addons/oddities/block/TinyPotatoBlock.java | 4 ++-- .../oddities/block/pipe/BasePipeBlock.java | 4 ++-- .../oddities/block/pipe/EncasedPipeBlock.java | 4 ++-- .../addons/oddities/block/pipe/PipeBlock.java | 4 ++-- .../quark/addons/oddities/item/BackpackItem.java | 8 ++++---- .../addons/oddities/module/BackpackModule.java | 4 ++-- .../addons/oddities/module/CrateModule.java | 4 ++-- .../addons/oddities/module/MagnetsModule.java | 6 ++---- .../oddities/module/MatrixEnchantingModule.java | 4 ++-- .../addons/oddities/module/PipesModule.java | 4 ++-- .../addons/oddities/module/TinyPotatoModule.java | 4 ++-- .../oddities/module/TotemOfHoldingModule.java | 4 ++-- .../vazkii/quark/base/block/IQuarkBlock.java | 6 +++--- .../java/vazkii/quark/base/block/QuarkBlock.java | 10 +++++----- .../quark/base/block/QuarkBlockWrapper.java | 8 ++++---- .../vazkii/quark/base/block/QuarkBushBlock.java | 8 ++++---- .../quark/base/block/QuarkButtonBlock.java | 8 ++++---- .../vazkii/quark/base/block/QuarkDoorBlock.java | 8 ++++---- .../vazkii/quark/base/block/QuarkFenceBlock.java | 8 ++++---- .../quark/base/block/QuarkFenceGateBlock.java | 8 ++++---- .../quark/base/block/QuarkFlammableBlock.java | 4 ++-- .../base/block/QuarkFlammablePillarBlock.java | 4 ++-- .../vazkii/quark/base/block/QuarkGlassBlock.java | 4 ++-- .../quark/base/block/QuarkLeavesBlock.java | 8 ++++---- .../vazkii/quark/base/block/QuarkPaneBlock.java | 8 ++++---- .../quark/base/block/QuarkPillarBlock.java | 8 ++++---- .../base/block/QuarkPressurePlateBlock.java | 8 ++++---- .../quark/base/block/QuarkSaplingBlock.java | 8 ++++---- .../vazkii/quark/base/block/QuarkSlabBlock.java | 4 ++-- .../quark/base/block/QuarkStairsBlock.java | 4 ++-- .../quark/base/block/QuarkStandingSignBlock.java | 8 ++++---- .../quark/base/block/QuarkTrapdoorBlock.java | 8 ++++---- .../vazkii/quark/base/block/QuarkVineBlock.java | 8 ++++---- .../vazkii/quark/base/block/QuarkWallBlock.java | 4 ++-- .../quark/base/block/QuarkWallSignBlock.java | 8 ++++---- .../quark/base/block/QuarkWoodenButtonBlock.java | 4 ++-- .../client/handler/InventoryButtonHandler.java | 14 +++++++------- .../vazkii/quark/base/handler/DyeHandler.java | 7 ++----- .../base/handler/ToolInteractionHandler.java | 8 ++++---- .../base/handler/UndergroundBiomeHandler.java | 6 +++--- .../quark/base/handler/WoodSetHandler.java | 16 ++++++---------- .../handler/advancement/AdvancementModifier.java | 8 +++----- .../advancement/mod/ASeedyPlaceModifier.java | 9 ++------- .../advancement/mod/AdventuringTimeModifier.java | 5 ++--- .../advancement/mod/BalancedDietModifier.java | 5 ++--- .../advancement/mod/FishyBusinessModifier.java | 6 ++---- .../advancement/mod/FuriousCocktailModifier.java | 4 ++-- .../advancement/mod/GlowAndBeholdModifier.java | 5 ++--- .../advancement/mod/MonsterHunterModifier.java | 4 ++-- .../advancement/mod/TacticalFishingModifier.java | 5 ++--- .../advancement/mod/TwoByTwoModifier.java | 4 ++-- .../handler/advancement/mod/WaxModifier.java | 4 ++-- .../vazkii/quark/base/item/QuarkArrowItem.java | 10 +++++----- .../base/item/QuarkDoubleHighBlockItem.java | 6 +++--- .../quark/base/item/QuarkMobBucketItem.java | 8 ++++---- .../quark/base/item/QuarkMusicDiscItem.java | 1 - .../vazkii/quark/base/item/QuarkSignItem.java | 8 ++++---- .../quark/base/item/QuarkSpawnEggItem.java | 8 ++++---- .../quark/base/item/boat/QuarkBoatItem.java | 4 ++-- .../vazkii/quark/base/module/QuarkModule.java | 7 ------- .../base/module/config/ConfigFlagManager.java | 1 - .../module/config/ConfigObjectSerializer.java | 6 ++---- .../quark/base/module/config/ConfigResolver.java | 2 -- .../base/module/config/type/BiomeTagConfig.java | 4 ++-- .../module/config/type/CompoundBiomeConfig.java | 4 ++-- .../type/ConditionalEntitySpawnConfig.java | 4 ++-- .../module/config/type/EntitySpawnConfig.java | 4 ++-- .../base/module/config/type/IConfigType.java | 4 ++-- .../type/inputtable/AbstractInputtableType.java | 4 ++-- .../type/inputtable/ConvulsionMatrixConfig.java | 4 ++-- .../config/type/inputtable/RGBColorConfig.java | 4 ++-- .../quark/base/world/EntitySpawnHandler.java | 6 +++--- .../quark/base/world/WeightedGenerator.java | 4 ++-- .../vazkii/quark/base/world/WorldGenHandler.java | 4 ++-- .../content/automation/block/ChuteBlock.java | 4 ++-- .../automation/block/EnderWatcherBlock.java | 4 ++-- .../automation/block/FeedingTroughBlock.java | 4 ++-- .../content/automation/block/GravisandBlock.java | 4 ++-- .../content/automation/block/IronRodBlock.java | 8 ++++---- .../automation/block/MetalButtonBlock.java | 4 ++-- .../block/ObsidianPressurePlateBlock.java | 4 ++-- .../block/RedstoneRandomizerBlock.java | 4 ++-- .../module/ChainsConnectBlocksModule.java | 4 ++-- .../content/automation/module/ChuteModule.java | 4 ++-- .../module/DispensersPlaceBlocksModule.java | 4 ++-- .../automation/module/EnderWatcherModule.java | 4 ++-- .../automation/module/FeedingTroughModule.java | 4 ++-- .../automation/module/GravisandModule.java | 6 ++---- .../content/automation/module/IronRodModule.java | 4 ++-- .../module/JukeboxAutomationModule.java | 4 ++-- .../automation/module/MetalButtonsModule.java | 4 ++-- .../automation/module/ObsidianPlateModule.java | 4 ++-- .../module/PistonsMoveTileEntitiesModule.java | 4 ++-- .../module/RedstoneRandomizerModule.java | 4 ++-- .../content/building/block/BambooMatBlock.java | 6 +++--- .../building/block/BambooMatCarpetBlock.java | 4 ++-- .../content/building/block/CutVineBlock.java | 4 ++-- .../quark/content/building/block/GrateBlock.java | 4 ++-- .../quark/content/building/block/HedgeBlock.java | 8 ++++---- .../content/building/block/HollowFrameBlock.java | 4 ++-- .../content/building/block/HollowLogBlock.java | 6 +++--- .../building/block/HollowPillarBlock.java | 4 ++-- .../content/building/block/HollowWoodBlock.java | 6 +++--- .../content/building/block/LeafCarpetBlock.java | 4 ++-- .../building/block/MudBrickLatticeBlock.java | 4 ++-- .../building/block/MyalitePillarBlock.java | 4 ++-- .../building/block/PaperLanternBlock.java | 4 ++-- .../building/block/QuarkVerticalSlabBlock.java | 8 ++++---- .../content/building/block/RainbowLampBlock.java | 4 ++-- .../quark/content/building/block/RopeBlock.java | 4 ++-- .../content/building/block/SoulFurnaceBlock.java | 4 ++-- .../quark/content/building/block/StoolBlock.java | 4 ++-- .../content/building/block/SturdyStoneBlock.java | 4 ++-- .../content/building/block/ThatchBlock.java | 4 ++-- .../building/block/VariantBookshelfBlock.java | 4 ++-- .../building/block/VariantChestBlock.java | 12 ++++++------ .../building/block/VariantFurnaceBlock.java | 8 ++++---- .../building/block/VariantLadderBlock.java | 10 +++++----- .../building/block/VariantTrappedChestBlock.java | 12 ++++++------ .../block/WeatheringCopperVerticalSlabBlock.java | 4 ++-- .../content/building/block/WoodPostBlock.java | 4 ++-- .../building/item/QuarkItemFrameItem.java | 4 ++-- .../building/module/BambooBackportModule.java | 4 ++-- .../building/module/CelebratoryLampsModule.java | 4 ++-- .../building/module/CompressedBlocksModule.java | 4 ++-- .../building/module/DuskboundBlocksModule.java | 4 ++-- .../building/module/FramedGlassModule.java | 4 ++-- .../building/module/GlassItemFrameModule.java | 4 ++-- .../content/building/module/GoldBarsModule.java | 4 ++-- .../content/building/module/GrateModule.java | 4 ++-- .../content/building/module/HedgesModule.java | 4 ++-- .../building/module/HollowLogsModule.java | 4 ++-- .../building/module/IndustrialPaletteModule.java | 4 ++-- .../building/module/JapanesePaletteModule.java | 4 ++-- .../building/module/LeafCarpetModule.java | 4 ++-- .../content/building/module/MidoriModule.java | 4 ++-- .../building/module/MoreBrickTypesModule.java | 4 ++-- .../building/module/MoreMudBlocksModule.java | 4 ++-- .../building/module/MorePottedPlantsModule.java | 6 ++---- .../building/module/MoreStoneVariantsModule.java | 7 +++---- .../module/NetherBrickFenceGateModule.java | 4 ++-- .../building/module/RainbowLampsModule.java | 4 ++-- .../building/module/RawMetalBricksModule.java | 4 ++-- .../content/building/module/RopeModule.java | 4 ++-- .../building/module/ShearVinesModule.java | 6 ++---- .../content/building/module/ShinglesModule.java | 4 ++-- .../building/module/SoulSandstoneModule.java | 4 ++-- .../content/building/module/StoolsModule.java | 6 ++---- .../building/module/SturdyStoneModule.java | 4 ++-- .../content/building/module/ThatchModule.java | 4 ++-- .../module/VariantBookshelvesModule.java | 4 ++-- .../building/module/VariantChestsModule.java | 14 ++++++-------- .../building/module/VariantFurnacesModule.java | 4 ++-- .../building/module/VariantLaddersModule.java | 4 ++-- .../building/module/VerticalPlanksModule.java | 6 +++--- .../building/module/VerticalSlabsModule.java | 6 +++--- .../building/module/WoodenPostsModule.java | 4 ++-- .../client/module/AutoWalkKeybindModule.java | 4 ++-- .../client/module/BackButtonKeybindModule.java | 4 ++-- .../module/BucketsShowInhabitantsModule.java | 4 ++-- .../content/client/module/CameraModule.java | 4 ++-- .../client/module/ChestSearchingModule.java | 4 ++-- .../client/module/ElytraIndicatorModule.java | 4 ++-- .../client/module/GreenerGrassModule.java | 4 ++-- .../client/module/ImprovedTooltipsModule.java | 4 ++-- .../client/module/LongRangePickBlockModule.java | 4 ++-- .../client/module/MicrocraftingHelperModule.java | 4 ++-- .../content/client/module/SoulCandlesModule.java | 4 ++-- .../content/client/module/UsageTickerModule.java | 4 ++-- .../client/module/UsesForCursesModule.java | 4 ++-- .../module/VariantAnimalTexturesModule.java | 4 ++-- .../module/WoolShutsUpMinecartsModule.java | 4 ++-- .../experimental/config/BlockSuffixConfig.java | 4 ++-- .../content/experimental/item/HammerItem.java | 7 ++----- .../module/ClimateControlRemoverModule.java | 4 ++-- .../module/EnchantmentPredicatesModule.java | 4 ++-- .../module/EnchantmentsBegoneModule.java | 4 ++-- .../experimental/module/GameNerfsModule.java | 4 ++-- .../module/NarratorReadoutModule.java | 4 ++-- .../experimental/module/OverlayShaderModule.java | 4 ++-- .../module/SpawnerReplacerModule.java | 4 ++-- .../module/VariantSelectorModule.java | 4 ++-- .../module/VillagerRerollingReworkModule.java | 4 ++-- .../module/AutomaticToolRestockModule.java | 4 ++-- .../management/module/EasyTransferingModule.java | 4 ++-- .../module/ExpandedItemInteractionsModule.java | 4 ++-- .../management/module/HotbarChangerModule.java | 4 ++-- .../module/InventorySortingModule.java | 4 ++-- .../management/module/ItemSharingModule.java | 4 ++-- .../module/QuickArmorSwappingModule.java | 4 ++-- .../content/mobs/item/DiamondHeartItem.java | 4 ++-- .../content/mobs/item/ForgottenHatItem.java | 8 ++++---- .../quark/content/mobs/item/SoulBeadItem.java | 4 ++-- .../quark/content/mobs/module/CrabsModule.java | 6 ++---- .../content/mobs/module/ForgottenModule.java | 6 ++---- .../content/mobs/module/FoxhoundModule.java | 6 ++---- .../quark/content/mobs/module/ShibaModule.java | 6 ++---- .../content/mobs/module/StonelingsModule.java | 6 ++---- .../content/mobs/module/ToretoiseModule.java | 6 ++---- .../quark/content/mobs/module/WraithModule.java | 6 ++---- .../quark/content/tools/block/CloudBlock.java | 4 ++-- .../content/tools/item/AncientTomeItem.java | 4 ++-- .../content/tools/item/BottledCloudItem.java | 4 ++-- .../quark/content/tools/item/ParrotEggItem.java | 4 ++-- .../content/tools/item/PathfindersQuillItem.java | 6 +++--- .../quark/content/tools/item/PickarangItem.java | 4 ++-- .../quark/content/tools/item/RuneItem.java | 4 ++-- .../quark/content/tools/item/SeedPouchItem.java | 4 ++-- .../content/tools/item/SlimeInABucketItem.java | 4 ++-- .../quark/content/tools/item/TrowelItem.java | 4 ++-- .../content/tools/module/AncientTomesModule.java | 5 ++--- .../tools/module/BeaconRedirectionModule.java | 4 ++-- .../content/tools/module/BottledCloudModule.java | 4 ++-- .../content/tools/module/BundleRecipeModule.java | 4 ++-- .../content/tools/module/ColorRunesModule.java | 6 ++---- .../content/tools/module/ParrotEggsModule.java | 4 ++-- .../tools/module/PathfinderMapsModule.java | 4 ++-- .../content/tools/module/PickarangModule.java | 6 ++---- .../content/tools/module/SeedPouchModule.java | 4 ++-- .../content/tools/module/SkullPikesModule.java | 6 ++---- .../tools/module/SlimeInABucketModule.java | 4 ++-- .../content/tools/module/TorchArrowModule.java | 6 ++---- .../quark/content/tools/module/TrowelModule.java | 4 ++-- .../content/tweaks/block/DirtyGlassBlock.java | 4 ++-- .../tweaks/module/ArmedArmorStandsModule.java | 4 ++-- .../module/AutomaticRecipeUnlockModule.java | 4 ++-- .../tweaks/module/BetterElytraRocketModule.java | 4 ++-- .../module/CampfiresBoostElytraModule.java | 4 ++-- .../module/CompassesWorkEverywhereModule.java | 4 ++-- .../tweaks/module/CoralOnCactusModule.java | 4 ++-- .../tweaks/module/DiamondRepairModule.java | 4 ++-- .../tweaks/module/DragonScalesModule.java | 4 ++-- .../tweaks/module/DyeableItemFramesModule.java | 4 ++-- .../content/tweaks/module/EmotesModule.java | 4 ++-- .../tweaks/module/EnhancedLaddersModule.java | 4 ++-- .../content/tweaks/module/GlassShardModule.java | 4 ++-- .../module/GoldToolsHaveFortuneModule.java | 4 ++-- .../tweaks/module/GrabChickensModule.java | 4 ++-- .../tweaks/module/HoeHarvestingModule.java | 4 ++-- .../content/tweaks/module/HorsesSwimModule.java | 4 ++-- .../tweaks/module/LockRotationModule.java | 4 ++-- .../content/tweaks/module/MapWashingModule.java | 4 ++-- .../tweaks/module/MoreBannerLayersModule.java | 4 ++-- .../tweaks/module/MoreNoteBlockSoundsModule.java | 4 ++-- .../module/NoDurabilityOnCosmeticsModule.java | 4 ++-- .../content/tweaks/module/PatTheDogsModule.java | 4 ++-- .../content/tweaks/module/PigLittersModule.java | 4 ++-- .../tweaks/module/PoisonPotatoUsageModule.java | 4 ++-- .../tweaks/module/ReacharoundPlacingModule.java | 4 ++-- .../module/RenewableSporeBlossomsModule.java | 4 ++-- .../tweaks/module/ReplaceScaffoldingModule.java | 4 ++-- .../tweaks/module/SaferCreaturesModule.java | 4 ++-- .../tweaks/module/ShulkerPackingModule.java | 4 ++-- .../content/tweaks/module/SignEditingModule.java | 4 ++-- .../tweaks/module/SimpleHarvestModule.java | 4 ++-- .../tweaks/module/SlabsToBlocksModule.java | 4 ++-- .../tweaks/module/SlimesToMagmaCubesModule.java | 4 ++-- .../module/SnowGolemPlayerHeadsModule.java | 4 ++-- .../module/SpongeOnWaterPlacementModule.java | 4 ++-- .../tweaks/module/SpongesBetterModule.java | 4 ++-- .../tweaks/module/UtilityRecipesModule.java | 4 ++-- .../module/VexesDieWithTheirMastersModule.java | 4 ++-- .../module/VillagersFollowEmeraldsModule.java | 4 ++-- .../module/ZombieVillagersOnNormalModule.java | 4 ++-- .../content/world/block/AncientSaplingBlock.java | 4 ++-- .../content/world/block/BlossomLeavesBlock.java | 4 ++-- .../content/world/block/BlossomSaplingBlock.java | 4 ++-- .../world/block/ChorusVegetationBlock.java | 4 ++-- .../quark/content/world/block/CorundumBlock.java | 4 ++-- .../world/block/ElderPrismarineBlock.java | 4 ++-- .../world/block/GlowLichenGrowthBlock.java | 4 ++-- .../content/world/block/GlowShroomBlock.java | 4 ++-- .../content/world/block/GlowShroomRingBlock.java | 4 ++-- .../content/world/block/HugeGlowShroomBlock.java | 8 ++++---- .../content/world/block/MonsterBoxBlock.java | 4 ++-- .../quark/content/world/block/MyaliteBlock.java | 4 ++-- .../content/world/block/MyaliteCrystalBlock.java | 4 ++-- .../content/world/item/AncientFruitItem.java | 4 ++-- .../content/world/module/AncientWoodModule.java | 4 ++-- .../content/world/module/AzaleaWoodModule.java | 4 ++-- .../world/module/BigStoneClustersModule.java | 4 ++-- .../content/world/module/BlossomTreesModule.java | 4 ++-- .../world/module/ChorusVegetationModule.java | 4 ++-- .../content/world/module/FairyRingsModule.java | 4 ++-- .../world/module/GlimmeringWealdModule.java | 4 ++-- .../content/world/module/MonsterBoxModule.java | 4 ++-- .../world/module/NetherObsidianSpikesModule.java | 4 ++-- .../world/module/NewStoneTypesModule.java | 8 ++++---- .../world/module/NoMoreLavaPocketsModule.java | 4 ++-- .../content/world/module/SpiralSpiresModule.java | 4 ++-- .../base/AbstractUndergroundStyleModule.java | 4 ++-- .../lootr/LootrVariantChestBlock.java | 6 +++--- .../lootr/LootrVariantTrappedChestBlock.java | 6 +++--- .../vazkii/zeta/module/ZetaModuleManager.java | 1 - 298 files changed, 686 insertions(+), 759 deletions(-) delete mode 100644 src/main/java/vazkii/quark/base/module/QuarkModule.java diff --git a/src/main/java/vazkii/quark/addons/oddities/block/CrateBlock.java b/src/main/java/vazkii/quark/addons/oddities/block/CrateBlock.java index ed67fa9c08..67ab54148b 100644 --- a/src/main/java/vazkii/quark/addons/oddities/block/CrateBlock.java +++ b/src/main/java/vazkii/quark/addons/oddities/block/CrateBlock.java @@ -31,13 +31,13 @@ import vazkii.quark.addons.oddities.block.be.CrateBlockEntity; import vazkii.quark.addons.oddities.module.CrateModule; import vazkii.quark.base.block.QuarkBlock; -import vazkii.quark.base.module.QuarkModule; +import vazkii.zeta.module.ZetaModule; public class CrateBlock extends QuarkBlock implements EntityBlock { public static final BooleanProperty PROPERTY_OPEN = BlockStateProperties.OPEN; - public CrateBlock(QuarkModule module) { + public CrateBlock(ZetaModule module) { super("crate", module, CreativeModeTab.TAB_DECORATIONS, Properties.copy(Blocks.BARREL)); registerDefaultState(stateDefinition.any().setValue(PROPERTY_OPEN, false)); } diff --git a/src/main/java/vazkii/quark/addons/oddities/block/MagnetBlock.java b/src/main/java/vazkii/quark/addons/oddities/block/MagnetBlock.java index 1cd83859ac..9edf88eab4 100644 --- a/src/main/java/vazkii/quark/addons/oddities/block/MagnetBlock.java +++ b/src/main/java/vazkii/quark/addons/oddities/block/MagnetBlock.java @@ -36,14 +36,14 @@ import vazkii.quark.addons.oddities.magnetsystem.MagnetSystem; import vazkii.quark.addons.oddities.module.MagnetsModule; import vazkii.quark.base.block.QuarkBlock; -import vazkii.quark.base.module.QuarkModule; +import vazkii.zeta.module.ZetaModule; public class MagnetBlock extends QuarkBlock implements EntityBlock { public static final DirectionProperty FACING = BlockStateProperties.FACING; public static final BooleanProperty POWERED = BlockStateProperties.POWERED; - public MagnetBlock(QuarkModule module) { + public MagnetBlock(ZetaModule module) { super("magnet", module, CreativeModeTab.TAB_REDSTONE, Properties.copy(Blocks.IRON_BLOCK)); registerDefaultState(defaultBlockState().setValue(FACING, Direction.DOWN).setValue(POWERED, false)); } diff --git a/src/main/java/vazkii/quark/addons/oddities/block/MatrixEnchantingTableBlock.java b/src/main/java/vazkii/quark/addons/oddities/block/MatrixEnchantingTableBlock.java index a20673f369..43969faa8e 100644 --- a/src/main/java/vazkii/quark/addons/oddities/block/MatrixEnchantingTableBlock.java +++ b/src/main/java/vazkii/quark/addons/oddities/block/MatrixEnchantingTableBlock.java @@ -40,14 +40,14 @@ import vazkii.quark.base.block.IQuarkBlock; import vazkii.quark.base.handler.CreativeTabHandler; import vazkii.quark.base.module.ModuleLoader; -import vazkii.quark.base.module.QuarkModule; +import vazkii.zeta.module.ZetaModule; public class MatrixEnchantingTableBlock extends EnchantmentTableBlock implements IQuarkBlock { - private final QuarkModule module; + private final ZetaModule module; private BooleanSupplier enabledSupplier = () -> true; - public MatrixEnchantingTableBlock(QuarkModule module) { + public MatrixEnchantingTableBlock(ZetaModule module) { super(Block.Properties.copy(Blocks.ENCHANTING_TABLE)); this.module = module; @@ -80,7 +80,7 @@ public boolean doesConditionApply() { @Nullable @Override - public QuarkModule getModule() { + public ZetaModule getModule() { return module; } diff --git a/src/main/java/vazkii/quark/addons/oddities/block/MovingMagnetizedBlock.java b/src/main/java/vazkii/quark/addons/oddities/block/MovingMagnetizedBlock.java index 768de135c3..839f9047fe 100644 --- a/src/main/java/vazkii/quark/addons/oddities/block/MovingMagnetizedBlock.java +++ b/src/main/java/vazkii/quark/addons/oddities/block/MovingMagnetizedBlock.java @@ -38,7 +38,7 @@ import vazkii.quark.addons.oddities.block.be.MagnetizedBlockBlockEntity; import vazkii.quark.addons.oddities.module.MagnetsModule; import vazkii.quark.base.block.QuarkBlock; -import vazkii.quark.base.module.QuarkModule; +import vazkii.zeta.module.ZetaModule; /** * @author WireSegal @@ -47,7 +47,7 @@ public class MovingMagnetizedBlock extends QuarkBlock implements EntityBlock { public static final DirectionProperty FACING = PistonHeadBlock.FACING; - public MovingMagnetizedBlock(QuarkModule module) { + public MovingMagnetizedBlock(ZetaModule module) { super("magnetized_block", module, null, Block.Properties.of(Material.PISTON).strength(-1.0F).dynamicShape().noLootTable().noOcclusion()); this.registerDefaultState(this.stateDefinition.any().setValue(FACING, Direction.NORTH)); } diff --git a/src/main/java/vazkii/quark/addons/oddities/block/TinyPotatoBlock.java b/src/main/java/vazkii/quark/addons/oddities/block/TinyPotatoBlock.java index 37f8e861f2..5abac2d8a7 100644 --- a/src/main/java/vazkii/quark/addons/oddities/block/TinyPotatoBlock.java +++ b/src/main/java/vazkii/quark/addons/oddities/block/TinyPotatoBlock.java @@ -45,7 +45,7 @@ import vazkii.quark.addons.oddities.item.TinyPotatoBlockItem; import vazkii.quark.addons.oddities.module.TinyPotatoModule; import vazkii.quark.base.block.QuarkBlock; -import vazkii.quark.base.module.QuarkModule; +import vazkii.zeta.module.ZetaModule; import vazkii.zeta.registry.IZetaBlockItemProvider; import javax.annotation.Nonnull; @@ -68,7 +68,7 @@ public static boolean isAngry(ItemStack stack) { return ItemNBTHelper.getBoolean(stack, ANGRY, false); } - public TinyPotatoBlock(QuarkModule module) { + public TinyPotatoBlock(ZetaModule module) { super("tiny_potato", module, CreativeModeTab.TAB_DECORATIONS, BlockBehaviour.Properties.of(Material.WOOL).strength(0.25F)); registerDefaultState(defaultBlockState() diff --git a/src/main/java/vazkii/quark/addons/oddities/block/pipe/BasePipeBlock.java b/src/main/java/vazkii/quark/addons/oddities/block/pipe/BasePipeBlock.java index cfd48c481a..960bc30f09 100644 --- a/src/main/java/vazkii/quark/addons/oddities/block/pipe/BasePipeBlock.java +++ b/src/main/java/vazkii/quark/addons/oddities/block/pipe/BasePipeBlock.java @@ -27,7 +27,7 @@ import vazkii.quark.addons.oddities.module.PipesModule; import vazkii.quark.base.block.QuarkBlock; import vazkii.quark.base.handler.RenderLayerHandler; -import vazkii.quark.base.module.QuarkModule; +import vazkii.zeta.module.ZetaModule; import javax.annotation.Nonnull; import java.util.HashSet; @@ -55,7 +55,7 @@ protected static BooleanProperty property(Direction direction) { }; } - protected BasePipeBlock(String name, QuarkModule module) { + protected BasePipeBlock(String name, ZetaModule module) { super(name, module, CreativeModeTab.TAB_REDSTONE, Block.Properties.of(Material.GLASS) .strength(3F, 10F) diff --git a/src/main/java/vazkii/quark/addons/oddities/block/pipe/EncasedPipeBlock.java b/src/main/java/vazkii/quark/addons/oddities/block/pipe/EncasedPipeBlock.java index 2d9d947165..e2ee74e055 100644 --- a/src/main/java/vazkii/quark/addons/oddities/block/pipe/EncasedPipeBlock.java +++ b/src/main/java/vazkii/quark/addons/oddities/block/pipe/EncasedPipeBlock.java @@ -15,11 +15,11 @@ import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; import vazkii.quark.addons.oddities.block.be.PipeBlockEntity.ConnectionType; -import vazkii.quark.base.module.QuarkModule; +import vazkii.zeta.module.ZetaModule; public class EncasedPipeBlock extends BasePipeBlock { - public EncasedPipeBlock(QuarkModule module) { + public EncasedPipeBlock(ZetaModule module) { super("encased_pipe", module); } diff --git a/src/main/java/vazkii/quark/addons/oddities/block/pipe/PipeBlock.java b/src/main/java/vazkii/quark/addons/oddities/block/pipe/PipeBlock.java index a6ffe8d8c2..38dfc501e3 100644 --- a/src/main/java/vazkii/quark/addons/oddities/block/pipe/PipeBlock.java +++ b/src/main/java/vazkii/quark/addons/oddities/block/pipe/PipeBlock.java @@ -30,7 +30,7 @@ import net.minecraft.world.phys.shapes.VoxelShape; import vazkii.quark.addons.oddities.block.be.PipeBlockEntity; import vazkii.quark.addons.oddities.module.PipesModule; -import vazkii.quark.base.module.QuarkModule; +import vazkii.zeta.module.ZetaModule; import javax.annotation.Nonnull; @@ -56,7 +56,7 @@ public class PipeBlock extends BasePipeBlock implements SimpleWaterloggedBlock { public static final BooleanProperty WATERLOGGED = BlockStateProperties.WATERLOGGED; - public PipeBlock(QuarkModule module) { + public PipeBlock(ZetaModule module) { super("pipe", module); } diff --git a/src/main/java/vazkii/quark/addons/oddities/item/BackpackItem.java b/src/main/java/vazkii/quark/addons/oddities/item/BackpackItem.java index 0ff6152a30..40b4b5496f 100644 --- a/src/main/java/vazkii/quark/addons/oddities/item/BackpackItem.java +++ b/src/main/java/vazkii/quark/addons/oddities/item/BackpackItem.java @@ -39,7 +39,7 @@ import vazkii.quark.base.client.handler.RequiredModTooltipHandler; import vazkii.quark.base.handler.ProxiedItemStackHandler; import vazkii.quark.base.item.IQuarkItem; -import vazkii.quark.base.module.QuarkModule; +import vazkii.zeta.module.ZetaModule; import vazkii.zeta.registry.IZetaItemColorProvider; import javax.annotation.Nonnull; @@ -51,13 +51,13 @@ public class BackpackItem extends DyeableArmorItem implements IQuarkItem, MenuPr private static final String WORN_TEXTURE = Quark.MOD_ID + ":textures/misc/backpack_worn.png"; private static final String WORN_OVERLAY_TEXTURE = Quark.MOD_ID + ":textures/misc/backpack_worn_overlay.png"; - private final QuarkModule module; + private final ZetaModule module; @OnlyIn(Dist.CLIENT) @SuppressWarnings("rawtypes") private HumanoidModel model; - public BackpackItem(QuarkModule module) { + public BackpackItem(ZetaModule module) { super(ArmorMaterials.LEATHER, EquipmentSlot.CHEST, new Item.Properties() .stacksTo(1) @@ -78,7 +78,7 @@ public int getDefaultTooltipHideFlags(@Nonnull ItemStack stack) { } @Override - public QuarkModule getModule() { + public ZetaModule getModule() { return module; } diff --git a/src/main/java/vazkii/quark/addons/oddities/module/BackpackModule.java b/src/main/java/vazkii/quark/addons/oddities/module/BackpackModule.java index 0e89a985d2..ca79ca35d4 100644 --- a/src/main/java/vazkii/quark/addons/oddities/module/BackpackModule.java +++ b/src/main/java/vazkii/quark/addons/oddities/module/BackpackModule.java @@ -39,7 +39,7 @@ import vazkii.quark.base.block.QuarkBlock; import vazkii.quark.base.item.QuarkItem; import vazkii.quark.base.module.LoadModule; -import vazkii.quark.base.module.QuarkModule; +import vazkii.zeta.module.ZetaModule; import vazkii.quark.base.module.config.Config; import vazkii.quark.base.module.hint.Hint; import vazkii.quark.base.network.QuarkNetwork; @@ -50,7 +50,7 @@ import vazkii.zeta.event.client.ZClientSetup; @LoadModule(category = "oddities", hasSubscriptions = true) -public class BackpackModule extends QuarkModule { +public class BackpackModule extends ZetaModule { @Config(description = "Set this to true to allow the backpacks to be unequipped even with items in them") public static boolean superOpMode = false; diff --git a/src/main/java/vazkii/quark/addons/oddities/module/CrateModule.java b/src/main/java/vazkii/quark/addons/oddities/module/CrateModule.java index aa35208945..34627ebb0a 100644 --- a/src/main/java/vazkii/quark/addons/oddities/module/CrateModule.java +++ b/src/main/java/vazkii/quark/addons/oddities/module/CrateModule.java @@ -14,7 +14,7 @@ import vazkii.quark.addons.oddities.inventory.CrateMenu; import vazkii.quark.base.Quark; import vazkii.quark.base.module.LoadModule; -import vazkii.quark.base.module.QuarkModule; +import vazkii.zeta.module.ZetaModule; import vazkii.quark.base.module.config.Config; import vazkii.quark.base.module.hint.Hint; import vazkii.zeta.event.ZRegister; @@ -22,7 +22,7 @@ import vazkii.zeta.event.client.ZClientSetup; @LoadModule(category = "oddities") -public class CrateModule extends QuarkModule { +public class CrateModule extends ZetaModule { public static BlockEntityType blockEntityType; public static MenuType menuType; diff --git a/src/main/java/vazkii/quark/addons/oddities/module/MagnetsModule.java b/src/main/java/vazkii/quark/addons/oddities/module/MagnetsModule.java index 93287d0ad2..a509058640 100644 --- a/src/main/java/vazkii/quark/addons/oddities/module/MagnetsModule.java +++ b/src/main/java/vazkii/quark/addons/oddities/module/MagnetsModule.java @@ -8,8 +8,6 @@ import net.minecraft.core.Registry; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.entity.BlockEntityType; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.event.TickEvent.LevelTickEvent; import net.minecraftforge.event.TickEvent.Phase; import net.minecraftforge.eventbus.api.SubscribeEvent; @@ -22,7 +20,7 @@ import vazkii.quark.api.event.RecipeCrawlEvent; import vazkii.quark.base.Quark; import vazkii.quark.base.module.LoadModule; -import vazkii.quark.base.module.QuarkModule; +import vazkii.zeta.module.ZetaModule; import vazkii.quark.base.module.config.Config; import vazkii.quark.base.module.hint.Hint; import vazkii.zeta.event.ZRegister; @@ -30,7 +28,7 @@ import vazkii.zeta.event.client.ZClientSetup; @LoadModule(category = "oddities", hasSubscriptions = true) -public class MagnetsModule extends QuarkModule { +public class MagnetsModule extends ZetaModule { public static BlockEntityType magnetType; public static BlockEntityType magnetizedBlockType; diff --git a/src/main/java/vazkii/quark/addons/oddities/module/MatrixEnchantingModule.java b/src/main/java/vazkii/quark/addons/oddities/module/MatrixEnchantingModule.java index 20c0117fda..27cc62376e 100644 --- a/src/main/java/vazkii/quark/addons/oddities/module/MatrixEnchantingModule.java +++ b/src/main/java/vazkii/quark/addons/oddities/module/MatrixEnchantingModule.java @@ -45,7 +45,7 @@ import vazkii.quark.base.handler.advancement.QuarkAdvancementHandler; import vazkii.quark.base.handler.advancement.QuarkGenericTrigger; import vazkii.quark.base.module.LoadModule; -import vazkii.quark.base.module.QuarkModule; +import vazkii.zeta.module.ZetaModule; import vazkii.quark.base.module.config.Config; import java.util.ArrayList; @@ -54,7 +54,7 @@ import java.util.Map; @LoadModule(category = "oddities", hasSubscriptions = true) -public class MatrixEnchantingModule extends QuarkModule { +public class MatrixEnchantingModule extends ZetaModule { public static BlockEntityType blockEntityType; public static MenuType menuType; diff --git a/src/main/java/vazkii/quark/addons/oddities/module/PipesModule.java b/src/main/java/vazkii/quark/addons/oddities/module/PipesModule.java index d58c1d5076..ba87a2a30b 100644 --- a/src/main/java/vazkii/quark/addons/oddities/module/PipesModule.java +++ b/src/main/java/vazkii/quark/addons/oddities/module/PipesModule.java @@ -16,7 +16,7 @@ import vazkii.quark.addons.oddities.client.render.be.PipeRenderer; import vazkii.quark.base.Quark; import vazkii.quark.base.module.LoadModule; -import vazkii.quark.base.module.QuarkModule; +import vazkii.zeta.module.ZetaModule; import vazkii.quark.base.module.config.Config; import vazkii.quark.base.module.hint.Hint; import vazkii.zeta.event.ZCommonSetup; @@ -27,7 +27,7 @@ import vazkii.zeta.event.client.ZClientSetup; @LoadModule(category = "oddities") -public class PipesModule extends QuarkModule { +public class PipesModule extends ZetaModule { public static BlockEntityType blockEntityType; diff --git a/src/main/java/vazkii/quark/addons/oddities/module/TinyPotatoModule.java b/src/main/java/vazkii/quark/addons/oddities/module/TinyPotatoModule.java index d1d6191d7f..471f1d5384 100644 --- a/src/main/java/vazkii/quark/addons/oddities/module/TinyPotatoModule.java +++ b/src/main/java/vazkii/quark/addons/oddities/module/TinyPotatoModule.java @@ -24,7 +24,7 @@ import vazkii.quark.base.handler.advancement.QuarkAdvancementHandler; import vazkii.quark.base.handler.advancement.QuarkGenericTrigger; import vazkii.quark.base.module.LoadModule; -import vazkii.quark.base.module.QuarkModule; +import vazkii.zeta.module.ZetaModule; import vazkii.quark.base.module.config.Config; import vazkii.quark.base.module.hint.Hint; import vazkii.zeta.event.ZRegister; @@ -34,7 +34,7 @@ import vazkii.zeta.event.client.ZModelBakingCompleted; @LoadModule(category = "oddities", antiOverlap = "botania", hasSubscriptions = true, subscribeOn = Dist.CLIENT) -public class TinyPotatoModule extends QuarkModule { +public class TinyPotatoModule extends ZetaModule { public static BlockEntityType blockEntityType; public static QuarkGenericTrigger patPotatoTrigger; diff --git a/src/main/java/vazkii/quark/addons/oddities/module/TotemOfHoldingModule.java b/src/main/java/vazkii/quark/addons/oddities/module/TotemOfHoldingModule.java index 2383e346fb..2e099ea3b0 100644 --- a/src/main/java/vazkii/quark/addons/oddities/module/TotemOfHoldingModule.java +++ b/src/main/java/vazkii/quark/addons/oddities/module/TotemOfHoldingModule.java @@ -25,7 +25,7 @@ import vazkii.quark.addons.oddities.entity.TotemOfHoldingEntity; import vazkii.quark.base.Quark; import vazkii.quark.base.module.LoadModule; -import vazkii.quark.base.module.QuarkModule; +import vazkii.zeta.module.ZetaModule; import vazkii.quark.base.module.config.Config; import vazkii.zeta.event.ZRegister; import vazkii.zeta.event.bus.LoadEvent; @@ -37,7 +37,7 @@ * Created at 1:21 PM on 3/30/20. */ @LoadModule(category = "oddities", hasSubscriptions = true) -public class TotemOfHoldingModule extends QuarkModule { +public class TotemOfHoldingModule extends ZetaModule { private static final String TAG_LAST_TOTEM = "quark:lastTotemOfHolding"; private static final String TAG_DEATH_X = "quark:deathX"; diff --git a/src/main/java/vazkii/quark/base/block/IQuarkBlock.java b/src/main/java/vazkii/quark/base/block/IQuarkBlock.java index ff8096c371..6940f23f3e 100644 --- a/src/main/java/vazkii/quark/base/block/IQuarkBlock.java +++ b/src/main/java/vazkii/quark/base/block/IQuarkBlock.java @@ -11,7 +11,7 @@ import net.minecraft.world.level.material.Material; import net.minecraftforge.common.extensions.IForgeBlock; import vazkii.quark.base.Quark; -import vazkii.quark.base.module.QuarkModule; +import vazkii.zeta.module.ZetaModule; import javax.annotation.Nullable; import java.util.function.BooleanSupplier; @@ -24,7 +24,7 @@ public interface IQuarkBlock extends IForgeBlock { @Nullable - QuarkModule getModule(); + ZetaModule getModule(); IQuarkBlock setCondition(BooleanSupplier condition); @@ -35,7 +35,7 @@ default Block getBlock() { } default boolean isEnabled() { - QuarkModule module = getModule(); + ZetaModule module = getModule(); return module != null && module.enabled && !module.disabledByOverlap && doesConditionApply(); } diff --git a/src/main/java/vazkii/quark/base/block/QuarkBlock.java b/src/main/java/vazkii/quark/base/block/QuarkBlock.java index e4ea4d66ec..8c05777b17 100644 --- a/src/main/java/vazkii/quark/base/block/QuarkBlock.java +++ b/src/main/java/vazkii/quark/base/block/QuarkBlock.java @@ -10,7 +10,7 @@ import vazkii.quark.base.Quark; import vazkii.quark.base.client.handler.RequiredModTooltipHandler; import vazkii.quark.base.handler.CreativeTabHandler; -import vazkii.quark.base.module.QuarkModule; +import vazkii.zeta.module.ZetaModule; import javax.annotation.Nonnull; import javax.annotation.Nullable; @@ -18,10 +18,10 @@ public class QuarkBlock extends Block implements IQuarkBlock { - private final QuarkModule module; + private final ZetaModule module; private BooleanSupplier enabledSupplier = () -> true; - public QuarkBlock(String regname, QuarkModule module, CreativeModeTab creativeTab, Properties properties) { + public QuarkBlock(String regname, ZetaModule module, CreativeModeTab creativeTab, Properties properties) { super(properties); Quark.ZETA.registry.registerBlock(this, regname); @@ -52,7 +52,7 @@ public boolean doesConditionApply() { @Nullable @Override - public QuarkModule getModule() { + public ZetaModule getModule() { return module; } @@ -64,7 +64,7 @@ protected static BlockEntityTicke public interface Constructor { - T make(String regname, QuarkModule module, CreativeModeTab creativeTab, Properties properties); + T make(String regname, ZetaModule module, CreativeModeTab creativeTab, Properties properties); } diff --git a/src/main/java/vazkii/quark/base/block/QuarkBlockWrapper.java b/src/main/java/vazkii/quark/base/block/QuarkBlockWrapper.java index 1de874cbf3..6356f44d87 100644 --- a/src/main/java/vazkii/quark/base/block/QuarkBlockWrapper.java +++ b/src/main/java/vazkii/quark/base/block/QuarkBlockWrapper.java @@ -8,17 +8,17 @@ import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.state.BlockState; import net.minecraftforge.common.IPlantable; -import vazkii.quark.base.module.QuarkModule; +import vazkii.zeta.module.ZetaModule; // Wrapper to allow vanilla blocks to be treated as quark blocks contextualized under a module public class QuarkBlockWrapper implements IQuarkBlock { private final Block parent; - private final QuarkModule module; + private final ZetaModule module; private BooleanSupplier condition; - public QuarkBlockWrapper(Block parent, QuarkModule module) { + public QuarkBlockWrapper(Block parent, ZetaModule module) { this.parent = parent; this.module = module; } @@ -29,7 +29,7 @@ public Block getBlock() { } @Override - public QuarkModule getModule() { + public ZetaModule getModule() { return module; } diff --git a/src/main/java/vazkii/quark/base/block/QuarkBushBlock.java b/src/main/java/vazkii/quark/base/block/QuarkBushBlock.java index 73cdbe76f7..3080377422 100644 --- a/src/main/java/vazkii/quark/base/block/QuarkBushBlock.java +++ b/src/main/java/vazkii/quark/base/block/QuarkBushBlock.java @@ -12,14 +12,14 @@ import vazkii.quark.base.Quark; import vazkii.quark.base.handler.CreativeTabHandler; import vazkii.quark.base.handler.RenderLayerHandler; -import vazkii.quark.base.module.QuarkModule; +import vazkii.zeta.module.ZetaModule; public class QuarkBushBlock extends BushBlock implements IQuarkBlock { - private final QuarkModule module; + private final ZetaModule module; private BooleanSupplier enabledSupplier = () -> true; - public QuarkBushBlock(String regname, QuarkModule module, CreativeModeTab creativeTab, Properties properties) { + public QuarkBushBlock(String regname, ZetaModule module, CreativeModeTab creativeTab, Properties properties) { super(properties); this.module = module; @@ -49,7 +49,7 @@ public boolean doesConditionApply() { @Nullable @Override - public QuarkModule getModule() { + public ZetaModule getModule() { return module; } diff --git a/src/main/java/vazkii/quark/base/block/QuarkButtonBlock.java b/src/main/java/vazkii/quark/base/block/QuarkButtonBlock.java index 01729dc49b..dd720fb6cb 100644 --- a/src/main/java/vazkii/quark/base/block/QuarkButtonBlock.java +++ b/src/main/java/vazkii/quark/base/block/QuarkButtonBlock.java @@ -7,7 +7,7 @@ import net.minecraft.world.level.block.ButtonBlock; import vazkii.quark.base.Quark; import vazkii.quark.base.handler.CreativeTabHandler; -import vazkii.quark.base.module.QuarkModule; +import vazkii.zeta.module.ZetaModule; import javax.annotation.Nonnull; import javax.annotation.Nullable; @@ -19,10 +19,10 @@ */ public abstract class QuarkButtonBlock extends ButtonBlock implements IQuarkBlock { - private final QuarkModule module; + private final ZetaModule module; private BooleanSupplier enabledSupplier = () -> true; - public QuarkButtonBlock(String regname, QuarkModule module, CreativeModeTab creativeTab, Properties properties) { + public QuarkButtonBlock(String regname, ZetaModule module, CreativeModeTab creativeTab, Properties properties) { super(false, properties); this.module = module; @@ -56,7 +56,7 @@ public boolean doesConditionApply() { @Nullable @Override - public QuarkModule getModule() { + public ZetaModule getModule() { return module; } diff --git a/src/main/java/vazkii/quark/base/block/QuarkDoorBlock.java b/src/main/java/vazkii/quark/base/block/QuarkDoorBlock.java index 2a55715073..8fba5b8b83 100644 --- a/src/main/java/vazkii/quark/base/block/QuarkDoorBlock.java +++ b/src/main/java/vazkii/quark/base/block/QuarkDoorBlock.java @@ -16,15 +16,15 @@ import vazkii.quark.base.handler.CreativeTabHandler; import vazkii.quark.base.handler.RenderLayerHandler; import vazkii.quark.base.item.QuarkDoubleHighBlockItem; -import vazkii.quark.base.module.QuarkModule; +import vazkii.zeta.module.ZetaModule; import vazkii.zeta.registry.IZetaBlockItemProvider; public class QuarkDoorBlock extends DoorBlock implements IQuarkBlock, IZetaBlockItemProvider { - private final QuarkModule module; + private final ZetaModule module; private BooleanSupplier enabledSupplier = () -> true; - public QuarkDoorBlock(String regname, QuarkModule module, CreativeModeTab creativeTab, Properties properties) { + public QuarkDoorBlock(String regname, ZetaModule module, CreativeModeTab creativeTab, Properties properties) { super(properties); this.module = module; @@ -52,7 +52,7 @@ public boolean doesConditionApply() { @Nullable @Override - public QuarkModule getModule() { + public ZetaModule getModule() { return module; } diff --git a/src/main/java/vazkii/quark/base/block/QuarkFenceBlock.java b/src/main/java/vazkii/quark/base/block/QuarkFenceBlock.java index 152536b31c..0c7e1d0375 100644 --- a/src/main/java/vazkii/quark/base/block/QuarkFenceBlock.java +++ b/src/main/java/vazkii/quark/base/block/QuarkFenceBlock.java @@ -11,14 +11,14 @@ import net.minecraft.world.level.block.FenceBlock; import vazkii.quark.base.Quark; import vazkii.quark.base.handler.CreativeTabHandler; -import vazkii.quark.base.module.QuarkModule; +import vazkii.zeta.module.ZetaModule; public class QuarkFenceBlock extends FenceBlock implements IQuarkBlock { - private final QuarkModule module; + private final ZetaModule module; private BooleanSupplier enabledSupplier = () -> true; - public QuarkFenceBlock(String regname, QuarkModule module, CreativeModeTab creativeTab, Properties properties) { + public QuarkFenceBlock(String regname, ZetaModule module, CreativeModeTab creativeTab, Properties properties) { super(properties); this.module = module; @@ -45,7 +45,7 @@ public boolean doesConditionApply() { @Nullable @Override - public QuarkModule getModule() { + public ZetaModule getModule() { return module; } diff --git a/src/main/java/vazkii/quark/base/block/QuarkFenceGateBlock.java b/src/main/java/vazkii/quark/base/block/QuarkFenceGateBlock.java index d9474811b0..10b4eec0ab 100644 --- a/src/main/java/vazkii/quark/base/block/QuarkFenceGateBlock.java +++ b/src/main/java/vazkii/quark/base/block/QuarkFenceGateBlock.java @@ -11,7 +11,7 @@ import net.minecraft.world.level.block.FenceGateBlock; import vazkii.quark.base.Quark; import vazkii.quark.base.handler.CreativeTabHandler; -import vazkii.quark.base.module.QuarkModule; +import vazkii.zeta.module.ZetaModule; /** * @author WireSegal @@ -19,10 +19,10 @@ */ public class QuarkFenceGateBlock extends FenceGateBlock implements IQuarkBlock { - private final QuarkModule module; + private final ZetaModule module; private BooleanSupplier enabledSupplier = () -> true; - public QuarkFenceGateBlock(String regname, QuarkModule module, CreativeModeTab creativeTab, Properties properties) { + public QuarkFenceGateBlock(String regname, ZetaModule module, CreativeModeTab creativeTab, Properties properties) { super(properties); this.module = module; @@ -49,7 +49,7 @@ public boolean doesConditionApply() { @Nullable @Override - public QuarkModule getModule() { + public ZetaModule getModule() { return module; } diff --git a/src/main/java/vazkii/quark/base/block/QuarkFlammableBlock.java b/src/main/java/vazkii/quark/base/block/QuarkFlammableBlock.java index 5426d51b26..3595ae8ee9 100644 --- a/src/main/java/vazkii/quark/base/block/QuarkFlammableBlock.java +++ b/src/main/java/vazkii/quark/base/block/QuarkFlammableBlock.java @@ -5,13 +5,13 @@ import net.minecraft.world.item.CreativeModeTab; import net.minecraft.world.level.BlockGetter; import net.minecraft.world.level.block.state.BlockState; -import vazkii.quark.base.module.QuarkModule; +import vazkii.zeta.module.ZetaModule; public class QuarkFlammableBlock extends QuarkBlock { private final int flammability; - public QuarkFlammableBlock(String regname, QuarkModule module, CreativeModeTab creativeTab, int flamability, Properties properties) { + public QuarkFlammableBlock(String regname, ZetaModule module, CreativeModeTab creativeTab, int flamability, Properties properties) { super(regname, module, creativeTab, properties); this.flammability = flamability; } diff --git a/src/main/java/vazkii/quark/base/block/QuarkFlammablePillarBlock.java b/src/main/java/vazkii/quark/base/block/QuarkFlammablePillarBlock.java index 57184724ee..d88163c335 100644 --- a/src/main/java/vazkii/quark/base/block/QuarkFlammablePillarBlock.java +++ b/src/main/java/vazkii/quark/base/block/QuarkFlammablePillarBlock.java @@ -5,13 +5,13 @@ import net.minecraft.world.item.CreativeModeTab; import net.minecraft.world.level.BlockGetter; import net.minecraft.world.level.block.state.BlockState; -import vazkii.quark.base.module.QuarkModule; +import vazkii.zeta.module.ZetaModule; public class QuarkFlammablePillarBlock extends QuarkPillarBlock { private final int flammability; - public QuarkFlammablePillarBlock(String regname, QuarkModule module, CreativeModeTab creativeTab, int flamability, Properties properties) { + public QuarkFlammablePillarBlock(String regname, ZetaModule module, CreativeModeTab creativeTab, int flamability, Properties properties) { super(regname, module, creativeTab, properties); this.flammability = flamability; } diff --git a/src/main/java/vazkii/quark/base/block/QuarkGlassBlock.java b/src/main/java/vazkii/quark/base/block/QuarkGlassBlock.java index dc2c61970f..97cd8003e7 100644 --- a/src/main/java/vazkii/quark/base/block/QuarkGlassBlock.java +++ b/src/main/java/vazkii/quark/base/block/QuarkGlassBlock.java @@ -15,7 +15,7 @@ import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; import vazkii.quark.base.handler.RenderLayerHandler; -import vazkii.quark.base.module.QuarkModule; +import vazkii.zeta.module.ZetaModule; /** * @author WireSegal @@ -23,7 +23,7 @@ */ public class QuarkGlassBlock extends QuarkBlock { - public QuarkGlassBlock(String regname, QuarkModule module, CreativeModeTab creativeTab, boolean translucent, Properties properties) { + public QuarkGlassBlock(String regname, ZetaModule module, CreativeModeTab creativeTab, boolean translucent, Properties properties) { super(regname, module, creativeTab, properties .noOcclusion() .isValidSpawn((state, world, pos, entityType) -> false) diff --git a/src/main/java/vazkii/quark/base/block/QuarkLeavesBlock.java b/src/main/java/vazkii/quark/base/block/QuarkLeavesBlock.java index 06f1e98ad3..6b65a953be 100644 --- a/src/main/java/vazkii/quark/base/block/QuarkLeavesBlock.java +++ b/src/main/java/vazkii/quark/base/block/QuarkLeavesBlock.java @@ -13,14 +13,14 @@ import vazkii.quark.base.Quark; import vazkii.quark.base.handler.CreativeTabHandler; import vazkii.quark.base.handler.RenderLayerHandler; -import vazkii.quark.base.module.QuarkModule; +import vazkii.zeta.module.ZetaModule; public class QuarkLeavesBlock extends LeavesBlock implements IQuarkBlock { - private final QuarkModule module; + private final ZetaModule module; private BooleanSupplier enabledSupplier = () -> true; - public QuarkLeavesBlock(String name, QuarkModule module, MaterialColor color) { + public QuarkLeavesBlock(String name, ZetaModule module, MaterialColor color) { super(Block.Properties.of(Material.LEAVES, color) .strength(0.2F) .randomTicks() @@ -40,7 +40,7 @@ public QuarkLeavesBlock(String name, QuarkModule module, MaterialColor color) { @Nullable @Override - public QuarkModule getModule() { + public ZetaModule getModule() { return module; } diff --git a/src/main/java/vazkii/quark/base/block/QuarkPaneBlock.java b/src/main/java/vazkii/quark/base/block/QuarkPaneBlock.java index 7c404ebe06..0b57f3baaf 100644 --- a/src/main/java/vazkii/quark/base/block/QuarkPaneBlock.java +++ b/src/main/java/vazkii/quark/base/block/QuarkPaneBlock.java @@ -9,7 +9,7 @@ import vazkii.quark.base.handler.CreativeTabHandler; import vazkii.quark.base.handler.RenderLayerHandler; import vazkii.quark.base.handler.RenderLayerHandler.RenderTypeSkeleton; -import vazkii.quark.base.module.QuarkModule; +import vazkii.zeta.module.ZetaModule; import javax.annotation.Nonnull; import javax.annotation.Nullable; @@ -17,10 +17,10 @@ public class QuarkPaneBlock extends IronBarsBlock implements IQuarkBlock { - public final QuarkModule module; + public final ZetaModule module; private BooleanSupplier enabledSupplier = () -> true; - public QuarkPaneBlock(String name, QuarkModule module, Block.Properties properties, RenderTypeSkeleton renderType) { + public QuarkPaneBlock(String name, ZetaModule module, Block.Properties properties, RenderTypeSkeleton renderType) { super(properties); this.module = module; @@ -39,7 +39,7 @@ public void fillItemCategory(@Nonnull CreativeModeTab group, @Nonnull NonNullLis @Nullable @Override - public QuarkModule getModule() { + public ZetaModule getModule() { return module; } diff --git a/src/main/java/vazkii/quark/base/block/QuarkPillarBlock.java b/src/main/java/vazkii/quark/base/block/QuarkPillarBlock.java index 379739f88a..c3ea05fee5 100644 --- a/src/main/java/vazkii/quark/base/block/QuarkPillarBlock.java +++ b/src/main/java/vazkii/quark/base/block/QuarkPillarBlock.java @@ -11,14 +11,14 @@ import net.minecraft.world.level.block.RotatedPillarBlock; import vazkii.quark.base.Quark; import vazkii.quark.base.handler.CreativeTabHandler; -import vazkii.quark.base.module.QuarkModule; +import vazkii.zeta.module.ZetaModule; public class QuarkPillarBlock extends RotatedPillarBlock implements IQuarkBlock { - private final QuarkModule module; + private final ZetaModule module; private BooleanSupplier enabledSupplier = () -> true; - public QuarkPillarBlock(String regname, QuarkModule module, CreativeModeTab creativeTab, Properties properties) { + public QuarkPillarBlock(String regname, ZetaModule module, CreativeModeTab creativeTab, Properties properties) { super(properties); this.module = module; Quark.ZETA.registry.registerBlock(this, regname, true); @@ -34,7 +34,7 @@ public void fillItemCategory(@Nonnull CreativeModeTab group, @Nonnull NonNullLis @Nullable @Override - public QuarkModule getModule() { + public ZetaModule getModule() { return module; } diff --git a/src/main/java/vazkii/quark/base/block/QuarkPressurePlateBlock.java b/src/main/java/vazkii/quark/base/block/QuarkPressurePlateBlock.java index 0af3dc73e9..0b212ef148 100644 --- a/src/main/java/vazkii/quark/base/block/QuarkPressurePlateBlock.java +++ b/src/main/java/vazkii/quark/base/block/QuarkPressurePlateBlock.java @@ -11,7 +11,7 @@ import net.minecraft.world.level.block.PressurePlateBlock; import vazkii.quark.base.Quark; import vazkii.quark.base.handler.CreativeTabHandler; -import vazkii.quark.base.module.QuarkModule; +import vazkii.zeta.module.ZetaModule; /** * @author WireSegal @@ -19,10 +19,10 @@ */ public class QuarkPressurePlateBlock extends PressurePlateBlock implements IQuarkBlock { - private final QuarkModule module; + private final ZetaModule module; private BooleanSupplier enabledSupplier = () -> true; - public QuarkPressurePlateBlock(Sensitivity sensitivity, String regname, QuarkModule module, CreativeModeTab creativeTab, Properties properties) { + public QuarkPressurePlateBlock(Sensitivity sensitivity, String regname, ZetaModule module, CreativeModeTab creativeTab, Properties properties) { super(sensitivity, properties); this.module = module; @@ -49,7 +49,7 @@ public boolean doesConditionApply() { @Nullable @Override - public QuarkModule getModule() { + public ZetaModule getModule() { return module; } diff --git a/src/main/java/vazkii/quark/base/block/QuarkSaplingBlock.java b/src/main/java/vazkii/quark/base/block/QuarkSaplingBlock.java index 0bd0f1ce46..1bafbeb187 100644 --- a/src/main/java/vazkii/quark/base/block/QuarkSaplingBlock.java +++ b/src/main/java/vazkii/quark/base/block/QuarkSaplingBlock.java @@ -14,14 +14,14 @@ import vazkii.quark.base.Quark; import vazkii.quark.base.handler.CreativeTabHandler; import vazkii.quark.base.handler.RenderLayerHandler; -import vazkii.quark.base.module.QuarkModule; +import vazkii.zeta.module.ZetaModule; public abstract class QuarkSaplingBlock extends SaplingBlock implements IQuarkBlock { - private final QuarkModule module; + private final ZetaModule module; private BooleanSupplier enabledSupplier = () -> true; - public QuarkSaplingBlock(String name, QuarkModule module, AbstractTreeGrower tree) { + public QuarkSaplingBlock(String name, ZetaModule module, AbstractTreeGrower tree) { super(tree, Block.Properties.copy(Blocks.OAK_SAPLING)); this.module = module; @@ -38,7 +38,7 @@ public void fillItemCategory(@Nonnull CreativeModeTab group, @Nonnull NonNullLis } @Override - public QuarkModule getModule() { + public ZetaModule getModule() { return module; } diff --git a/src/main/java/vazkii/quark/base/block/QuarkSlabBlock.java b/src/main/java/vazkii/quark/base/block/QuarkSlabBlock.java index e4d1e29de7..6edda3ec49 100644 --- a/src/main/java/vazkii/quark/base/block/QuarkSlabBlock.java +++ b/src/main/java/vazkii/quark/base/block/QuarkSlabBlock.java @@ -17,7 +17,7 @@ import vazkii.quark.base.handler.CreativeTabHandler; import vazkii.quark.base.handler.RenderLayerHandler; import vazkii.quark.base.handler.VariantHandler; -import vazkii.quark.base.module.QuarkModule; +import vazkii.zeta.module.ZetaModule; import vazkii.zeta.registry.IZetaBlockColorProvider; import vazkii.zeta.registry.IZetaItemColorProvider; @@ -60,7 +60,7 @@ public void fillItemCategory(@Nonnull CreativeModeTab group, @Nonnull NonNullLis @Nullable @Override - public QuarkModule getModule() { + public ZetaModule getModule() { return parent.getModule(); } diff --git a/src/main/java/vazkii/quark/base/block/QuarkStairsBlock.java b/src/main/java/vazkii/quark/base/block/QuarkStairsBlock.java index 540a8aaf28..e77e00681e 100644 --- a/src/main/java/vazkii/quark/base/block/QuarkStairsBlock.java +++ b/src/main/java/vazkii/quark/base/block/QuarkStairsBlock.java @@ -22,7 +22,7 @@ import vazkii.quark.base.handler.CreativeTabHandler; import vazkii.quark.base.handler.RenderLayerHandler; import vazkii.quark.base.handler.VariantHandler; -import vazkii.quark.base.module.QuarkModule; +import vazkii.zeta.module.ZetaModule; import vazkii.zeta.registry.IZetaBlockColorProvider; import vazkii.zeta.registry.IZetaItemColorProvider; @@ -62,7 +62,7 @@ public int getFlammability(BlockState state, BlockGetter world, BlockPos pos, Di @Nullable @Override - public QuarkModule getModule() { + public ZetaModule getModule() { return parent.getModule(); } diff --git a/src/main/java/vazkii/quark/base/block/QuarkStandingSignBlock.java b/src/main/java/vazkii/quark/base/block/QuarkStandingSignBlock.java index 894f357b95..ca2284e8b0 100644 --- a/src/main/java/vazkii/quark/base/block/QuarkStandingSignBlock.java +++ b/src/main/java/vazkii/quark/base/block/QuarkStandingSignBlock.java @@ -7,14 +7,14 @@ import net.minecraft.world.level.block.StandingSignBlock; import net.minecraft.world.level.block.state.properties.WoodType; import vazkii.quark.base.Quark; -import vazkii.quark.base.module.QuarkModule; +import vazkii.zeta.module.ZetaModule; public class QuarkStandingSignBlock extends StandingSignBlock implements IQuarkBlock { - private final QuarkModule module; + private final ZetaModule module; private BooleanSupplier enabledSupplier = () -> true; - public QuarkStandingSignBlock(String regname, QuarkModule module, WoodType type, Properties properties) { + public QuarkStandingSignBlock(String regname, ZetaModule module, WoodType type, Properties properties) { super(properties, type); this.module = module; @@ -34,7 +34,7 @@ public boolean doesConditionApply() { @Nullable @Override - public QuarkModule getModule() { + public ZetaModule getModule() { return module; } diff --git a/src/main/java/vazkii/quark/base/block/QuarkTrapdoorBlock.java b/src/main/java/vazkii/quark/base/block/QuarkTrapdoorBlock.java index ad48fe198a..0b1cb2ac75 100644 --- a/src/main/java/vazkii/quark/base/block/QuarkTrapdoorBlock.java +++ b/src/main/java/vazkii/quark/base/block/QuarkTrapdoorBlock.java @@ -12,14 +12,14 @@ import vazkii.quark.base.Quark; import vazkii.quark.base.handler.CreativeTabHandler; import vazkii.quark.base.handler.RenderLayerHandler; -import vazkii.quark.base.module.QuarkModule; +import vazkii.zeta.module.ZetaModule; public class QuarkTrapdoorBlock extends TrapDoorBlock implements IQuarkBlock { - private final QuarkModule module; + private final ZetaModule module; private BooleanSupplier enabledSupplier = () -> true; - public QuarkTrapdoorBlock(String regname, QuarkModule module, CreativeModeTab creativeTab, Properties properties) { + public QuarkTrapdoorBlock(String regname, ZetaModule module, CreativeModeTab creativeTab, Properties properties) { super(properties); this.module = module; @@ -49,7 +49,7 @@ public boolean doesConditionApply() { @Nullable @Override - public QuarkModule getModule() { + public ZetaModule getModule() { return module; } diff --git a/src/main/java/vazkii/quark/base/block/QuarkVineBlock.java b/src/main/java/vazkii/quark/base/block/QuarkVineBlock.java index 0ea93f96b4..c07d06e764 100644 --- a/src/main/java/vazkii/quark/base/block/QuarkVineBlock.java +++ b/src/main/java/vazkii/quark/base/block/QuarkVineBlock.java @@ -21,14 +21,14 @@ import vazkii.quark.base.Quark; import vazkii.quark.base.handler.CreativeTabHandler; import vazkii.quark.base.handler.RenderLayerHandler; -import vazkii.quark.base.module.QuarkModule; +import vazkii.zeta.module.ZetaModule; public class QuarkVineBlock extends VineBlock implements IQuarkBlock { - private final QuarkModule module; + private final ZetaModule module; private BooleanSupplier enabledSupplier = () -> true; - public QuarkVineBlock(QuarkModule module, String name, boolean creative) { + public QuarkVineBlock(ZetaModule module, String name, boolean creative) { super(Block.Properties.of(Material.REPLACEABLE_PLANT).noCollission().randomTicks().strength(0.2F).sound(SoundType.GRASS)); this.module = module; @@ -61,7 +61,7 @@ public void fillItemCategory(@Nonnull CreativeModeTab group, @Nonnull NonNullLis @Nullable @Override - public QuarkModule getModule() { + public ZetaModule getModule() { return module; } diff --git a/src/main/java/vazkii/quark/base/block/QuarkWallBlock.java b/src/main/java/vazkii/quark/base/block/QuarkWallBlock.java index 73a35e1453..c69ccdfeab 100644 --- a/src/main/java/vazkii/quark/base/block/QuarkWallBlock.java +++ b/src/main/java/vazkii/quark/base/block/QuarkWallBlock.java @@ -15,7 +15,7 @@ import vazkii.quark.base.handler.CreativeTabHandler; import vazkii.quark.base.handler.RenderLayerHandler; import vazkii.quark.base.handler.VariantHandler; -import vazkii.quark.base.module.QuarkModule; +import vazkii.zeta.module.ZetaModule; import vazkii.zeta.registry.IZetaBlockColorProvider; import vazkii.zeta.registry.IZetaItemColorProvider; @@ -47,7 +47,7 @@ public void fillItemCategory(@Nonnull CreativeModeTab group, @Nonnull NonNullLis @Nullable @Override - public QuarkModule getModule() { + public ZetaModule getModule() { return parent.getModule(); } diff --git a/src/main/java/vazkii/quark/base/block/QuarkWallSignBlock.java b/src/main/java/vazkii/quark/base/block/QuarkWallSignBlock.java index 935a686f55..096a751014 100644 --- a/src/main/java/vazkii/quark/base/block/QuarkWallSignBlock.java +++ b/src/main/java/vazkii/quark/base/block/QuarkWallSignBlock.java @@ -7,14 +7,14 @@ import net.minecraft.world.level.block.WallSignBlock; import net.minecraft.world.level.block.state.properties.WoodType; import vazkii.quark.base.Quark; -import vazkii.quark.base.module.QuarkModule; +import vazkii.zeta.module.ZetaModule; public class QuarkWallSignBlock extends WallSignBlock implements IQuarkBlock { - private final QuarkModule module; + private final ZetaModule module; private BooleanSupplier enabledSupplier = () -> true; - public QuarkWallSignBlock(String regname, QuarkModule module, WoodType type, Properties properties) { + public QuarkWallSignBlock(String regname, ZetaModule module, WoodType type, Properties properties) { super(properties, type); this.module = module; @@ -34,7 +34,7 @@ public boolean doesConditionApply() { @Nullable @Override - public QuarkModule getModule() { + public ZetaModule getModule() { return module; } diff --git a/src/main/java/vazkii/quark/base/block/QuarkWoodenButtonBlock.java b/src/main/java/vazkii/quark/base/block/QuarkWoodenButtonBlock.java index 1d3b02d1c2..9728a131ff 100644 --- a/src/main/java/vazkii/quark/base/block/QuarkWoodenButtonBlock.java +++ b/src/main/java/vazkii/quark/base/block/QuarkWoodenButtonBlock.java @@ -3,13 +3,13 @@ import net.minecraft.sounds.SoundEvent; import net.minecraft.sounds.SoundEvents; import net.minecraft.world.item.CreativeModeTab; -import vazkii.quark.base.module.QuarkModule; +import vazkii.zeta.module.ZetaModule; import javax.annotation.Nonnull; public class QuarkWoodenButtonBlock extends QuarkButtonBlock { - public QuarkWoodenButtonBlock(String regname, QuarkModule module, Properties properties) { + public QuarkWoodenButtonBlock(String regname, ZetaModule module, Properties properties) { super(regname, module, CreativeModeTab.TAB_REDSTONE, properties); } diff --git a/src/main/java/vazkii/quark/base/client/handler/InventoryButtonHandler.java b/src/main/java/vazkii/quark/base/client/handler/InventoryButtonHandler.java index 13ed83e67a..b4cffa4c37 100644 --- a/src/main/java/vazkii/quark/base/client/handler/InventoryButtonHandler.java +++ b/src/main/java/vazkii/quark/base/client/handler/InventoryButtonHandler.java @@ -34,7 +34,7 @@ import vazkii.quark.base.Quark; import vazkii.quark.base.handler.GeneralConfig; import vazkii.quark.base.handler.InventoryTransferHandler; -import vazkii.quark.base.module.QuarkModule; +import vazkii.zeta.module.ZetaModule; import vazkii.zeta.event.client.ZKeyMapping; public final class InventoryButtonHandler { @@ -157,17 +157,17 @@ public static Collection