From 3df93fc66de5fdb35f29a591321ad84e99516864 Mon Sep 17 00:00:00 2001 From: Sebastian Hartte Date: Sun, 28 Jun 2020 16:18:11 +0200 Subject: [PATCH] Moving --- .../appeng/block/misc/LightDetectorBlock.java | 0 .../appeng/block/misc/SkyCompassBlock.java | 0 .../client/render/effects/ChargedOreFX.java | 0 .../client/render/effects/CraftingFx.java | 0 .../client/render/effects/EnergyFx.java | 0 .../render/effects/EnergyParticleData.java | 0 .../client/render/effects/LightningArcFX.java | 0 .../effects/LightningArcParticleData.java | 0 .../client/render/effects/LightningFX.java | 0 .../client/render/effects/MatterCannonFX.java | 0 .../client/render/effects/ParticleTypes.java | 0 .../client/render/effects/VibrantFX.java | 0 .../src}/main/java/appeng/core/AEConfig.java | 0 .../src}/main/java/appeng/core/AELog.java | 0 .../src}/main/java/appeng/core/AppEng.java | 0 .../appeng/core/features/ActivityState.java | 0 .../appeng/core/features/BlockDefinition.java | 0 .../appeng/core/features/BlockStackSrc.java | 0 .../core/features/ColoredItemDefinition.java | 0 .../core/features/DamagedItemDefinition.java | 0 .../java/appeng/core/features/IStackSrc.java | 0 .../appeng/core/features/ItemDefinition.java | 0 .../appeng/core/features/ItemStackSrc.java | 0 .../core/features/MaterialStackSrc.java | 0 .../appeng/core/features/TileDefinition.java | 0 .../core/localization/ButtonToolTips.java | 2 +- .../appeng/core/localization/GuiText.java | 0 .../core/localization/PlayerMessages.java | 0 .../appeng/core/localization/WailaText.java | 3 +-- .../java/appeng/core/settings/TickRates.java | 0 .../core/stats/AdvancementTriggers.java | 0 .../main/java/appeng/core/stats/AeStats.java | 0 .../core/stats/AppEngAdvancementTrigger.java | 0 .../core/stats/IAdvancementTrigger.java | 0 .../appeng/decorative/AEDecorativeBlock.java | 2 +- .../solid/ChargedQuartzOreBlock.java | 2 +- .../appeng/decorative/solid/GlassState.java | 0 .../decorative/solid/QuartzGlassBlock.java | 2 +- .../decorative/solid/QuartzLampBlock.java | 2 +- .../decorative/solid/QuartzOreBlock.java | 20 +++++++++++++------ .../decorative/solid/QuartzPillarBlock.java | 4 ++-- .../decorative/solid/SkyStoneBlock.java | 2 +- .../appeng/helpers/ICustomNameObject.java | 0 .../java/appeng/helpers/MetaRotation.java | 0 .../tile/misc/LightDetectorBlockEntity.java | 0 .../tile/misc/SkyCompassBlockEntity.java | 0 .../block/networking/ControllerBlock.java | 12 +++++------ .../block/networking/WirelessBlock.java | 8 ++++---- .../java/appeng/block/storage/ChestBlock.java | 2 +- .../block/storage/DriveSlotCellType.java | 6 +++--- .../appeng/block/storage/DriveSlotState.java | 6 +++--- .../client/render/FacingToRotation.java | 6 +++--- 52 files changed, 43 insertions(+), 36 deletions(-) rename {src => core/src}/main/java/appeng/block/misc/LightDetectorBlock.java (100%) rename {src => core/src}/main/java/appeng/block/misc/SkyCompassBlock.java (100%) rename {src => core/src}/main/java/appeng/client/render/effects/ChargedOreFX.java (100%) rename {src => core/src}/main/java/appeng/client/render/effects/CraftingFx.java (100%) rename {src => core/src}/main/java/appeng/client/render/effects/EnergyFx.java (100%) rename {src => core/src}/main/java/appeng/client/render/effects/EnergyParticleData.java (100%) rename {src => core/src}/main/java/appeng/client/render/effects/LightningArcFX.java (100%) rename {src => core/src}/main/java/appeng/client/render/effects/LightningArcParticleData.java (100%) rename {src => core/src}/main/java/appeng/client/render/effects/LightningFX.java (100%) rename {src => core/src}/main/java/appeng/client/render/effects/MatterCannonFX.java (100%) rename {src => core/src}/main/java/appeng/client/render/effects/ParticleTypes.java (100%) rename {src => core/src}/main/java/appeng/client/render/effects/VibrantFX.java (100%) rename {src => core/src}/main/java/appeng/core/AEConfig.java (100%) rename {src => core/src}/main/java/appeng/core/AELog.java (100%) rename {src => core/src}/main/java/appeng/core/AppEng.java (100%) rename {src => core/src}/main/java/appeng/core/features/ActivityState.java (100%) rename {src => core/src}/main/java/appeng/core/features/BlockDefinition.java (100%) rename {src => core/src}/main/java/appeng/core/features/BlockStackSrc.java (100%) rename {src => core/src}/main/java/appeng/core/features/ColoredItemDefinition.java (100%) rename {src => core/src}/main/java/appeng/core/features/DamagedItemDefinition.java (100%) rename {src => core/src}/main/java/appeng/core/features/IStackSrc.java (100%) rename {src => core/src}/main/java/appeng/core/features/ItemDefinition.java (100%) rename {src => core/src}/main/java/appeng/core/features/ItemStackSrc.java (100%) rename {src => core/src}/main/java/appeng/core/features/MaterialStackSrc.java (100%) rename {src => core/src}/main/java/appeng/core/features/TileDefinition.java (100%) rename {src => core/src}/main/java/appeng/core/localization/ButtonToolTips.java (98%) rename {src => core/src}/main/java/appeng/core/localization/GuiText.java (100%) rename {src => core/src}/main/java/appeng/core/localization/PlayerMessages.java (100%) rename {src => core/src}/main/java/appeng/core/localization/WailaText.java (94%) rename {src => core/src}/main/java/appeng/core/settings/TickRates.java (100%) rename {src => core/src}/main/java/appeng/core/stats/AdvancementTriggers.java (100%) rename {src => core/src}/main/java/appeng/core/stats/AeStats.java (100%) rename {src => core/src}/main/java/appeng/core/stats/AppEngAdvancementTrigger.java (100%) rename {src => core/src}/main/java/appeng/core/stats/IAdvancementTrigger.java (100%) rename {src => core/src}/main/java/appeng/decorative/AEDecorativeBlock.java (95%) rename {src => core/src}/main/java/appeng/decorative/solid/ChargedQuartzOreBlock.java (97%) rename {src => core/src}/main/java/appeng/decorative/solid/GlassState.java (100%) rename {src => core/src}/main/java/appeng/decorative/solid/QuartzGlassBlock.java (97%) rename {src => core/src}/main/java/appeng/decorative/solid/QuartzLampBlock.java (97%) rename {src => core/src}/main/java/appeng/decorative/solid/QuartzOreBlock.java (64%) rename {src => core/src}/main/java/appeng/decorative/solid/QuartzPillarBlock.java (95%) rename {src => core/src}/main/java/appeng/decorative/solid/SkyStoneBlock.java (98%) rename {src => core/src}/main/java/appeng/helpers/ICustomNameObject.java (100%) rename {src => core/src}/main/java/appeng/helpers/MetaRotation.java (100%) rename {src => core/src}/main/java/appeng/tile/misc/LightDetectorBlockEntity.java (100%) rename {src => core/src}/main/java/appeng/tile/misc/SkyCompassBlockEntity.java (100%) diff --git a/src/main/java/appeng/block/misc/LightDetectorBlock.java b/core/src/main/java/appeng/block/misc/LightDetectorBlock.java similarity index 100% rename from src/main/java/appeng/block/misc/LightDetectorBlock.java rename to core/src/main/java/appeng/block/misc/LightDetectorBlock.java diff --git a/src/main/java/appeng/block/misc/SkyCompassBlock.java b/core/src/main/java/appeng/block/misc/SkyCompassBlock.java similarity index 100% rename from src/main/java/appeng/block/misc/SkyCompassBlock.java rename to core/src/main/java/appeng/block/misc/SkyCompassBlock.java diff --git a/src/main/java/appeng/client/render/effects/ChargedOreFX.java b/core/src/main/java/appeng/client/render/effects/ChargedOreFX.java similarity index 100% rename from src/main/java/appeng/client/render/effects/ChargedOreFX.java rename to core/src/main/java/appeng/client/render/effects/ChargedOreFX.java diff --git a/src/main/java/appeng/client/render/effects/CraftingFx.java b/core/src/main/java/appeng/client/render/effects/CraftingFx.java similarity index 100% rename from src/main/java/appeng/client/render/effects/CraftingFx.java rename to core/src/main/java/appeng/client/render/effects/CraftingFx.java diff --git a/src/main/java/appeng/client/render/effects/EnergyFx.java b/core/src/main/java/appeng/client/render/effects/EnergyFx.java similarity index 100% rename from src/main/java/appeng/client/render/effects/EnergyFx.java rename to core/src/main/java/appeng/client/render/effects/EnergyFx.java diff --git a/src/main/java/appeng/client/render/effects/EnergyParticleData.java b/core/src/main/java/appeng/client/render/effects/EnergyParticleData.java similarity index 100% rename from src/main/java/appeng/client/render/effects/EnergyParticleData.java rename to core/src/main/java/appeng/client/render/effects/EnergyParticleData.java diff --git a/src/main/java/appeng/client/render/effects/LightningArcFX.java b/core/src/main/java/appeng/client/render/effects/LightningArcFX.java similarity index 100% rename from src/main/java/appeng/client/render/effects/LightningArcFX.java rename to core/src/main/java/appeng/client/render/effects/LightningArcFX.java diff --git a/src/main/java/appeng/client/render/effects/LightningArcParticleData.java b/core/src/main/java/appeng/client/render/effects/LightningArcParticleData.java similarity index 100% rename from src/main/java/appeng/client/render/effects/LightningArcParticleData.java rename to core/src/main/java/appeng/client/render/effects/LightningArcParticleData.java diff --git a/src/main/java/appeng/client/render/effects/LightningFX.java b/core/src/main/java/appeng/client/render/effects/LightningFX.java similarity index 100% rename from src/main/java/appeng/client/render/effects/LightningFX.java rename to core/src/main/java/appeng/client/render/effects/LightningFX.java diff --git a/src/main/java/appeng/client/render/effects/MatterCannonFX.java b/core/src/main/java/appeng/client/render/effects/MatterCannonFX.java similarity index 100% rename from src/main/java/appeng/client/render/effects/MatterCannonFX.java rename to core/src/main/java/appeng/client/render/effects/MatterCannonFX.java diff --git a/src/main/java/appeng/client/render/effects/ParticleTypes.java b/core/src/main/java/appeng/client/render/effects/ParticleTypes.java similarity index 100% rename from src/main/java/appeng/client/render/effects/ParticleTypes.java rename to core/src/main/java/appeng/client/render/effects/ParticleTypes.java diff --git a/src/main/java/appeng/client/render/effects/VibrantFX.java b/core/src/main/java/appeng/client/render/effects/VibrantFX.java similarity index 100% rename from src/main/java/appeng/client/render/effects/VibrantFX.java rename to core/src/main/java/appeng/client/render/effects/VibrantFX.java diff --git a/src/main/java/appeng/core/AEConfig.java b/core/src/main/java/appeng/core/AEConfig.java similarity index 100% rename from src/main/java/appeng/core/AEConfig.java rename to core/src/main/java/appeng/core/AEConfig.java diff --git a/src/main/java/appeng/core/AELog.java b/core/src/main/java/appeng/core/AELog.java similarity index 100% rename from src/main/java/appeng/core/AELog.java rename to core/src/main/java/appeng/core/AELog.java diff --git a/src/main/java/appeng/core/AppEng.java b/core/src/main/java/appeng/core/AppEng.java similarity index 100% rename from src/main/java/appeng/core/AppEng.java rename to core/src/main/java/appeng/core/AppEng.java diff --git a/src/main/java/appeng/core/features/ActivityState.java b/core/src/main/java/appeng/core/features/ActivityState.java similarity index 100% rename from src/main/java/appeng/core/features/ActivityState.java rename to core/src/main/java/appeng/core/features/ActivityState.java diff --git a/src/main/java/appeng/core/features/BlockDefinition.java b/core/src/main/java/appeng/core/features/BlockDefinition.java similarity index 100% rename from src/main/java/appeng/core/features/BlockDefinition.java rename to core/src/main/java/appeng/core/features/BlockDefinition.java diff --git a/src/main/java/appeng/core/features/BlockStackSrc.java b/core/src/main/java/appeng/core/features/BlockStackSrc.java similarity index 100% rename from src/main/java/appeng/core/features/BlockStackSrc.java rename to core/src/main/java/appeng/core/features/BlockStackSrc.java diff --git a/src/main/java/appeng/core/features/ColoredItemDefinition.java b/core/src/main/java/appeng/core/features/ColoredItemDefinition.java similarity index 100% rename from src/main/java/appeng/core/features/ColoredItemDefinition.java rename to core/src/main/java/appeng/core/features/ColoredItemDefinition.java diff --git a/src/main/java/appeng/core/features/DamagedItemDefinition.java b/core/src/main/java/appeng/core/features/DamagedItemDefinition.java similarity index 100% rename from src/main/java/appeng/core/features/DamagedItemDefinition.java rename to core/src/main/java/appeng/core/features/DamagedItemDefinition.java diff --git a/src/main/java/appeng/core/features/IStackSrc.java b/core/src/main/java/appeng/core/features/IStackSrc.java similarity index 100% rename from src/main/java/appeng/core/features/IStackSrc.java rename to core/src/main/java/appeng/core/features/IStackSrc.java diff --git a/src/main/java/appeng/core/features/ItemDefinition.java b/core/src/main/java/appeng/core/features/ItemDefinition.java similarity index 100% rename from src/main/java/appeng/core/features/ItemDefinition.java rename to core/src/main/java/appeng/core/features/ItemDefinition.java diff --git a/src/main/java/appeng/core/features/ItemStackSrc.java b/core/src/main/java/appeng/core/features/ItemStackSrc.java similarity index 100% rename from src/main/java/appeng/core/features/ItemStackSrc.java rename to core/src/main/java/appeng/core/features/ItemStackSrc.java diff --git a/src/main/java/appeng/core/features/MaterialStackSrc.java b/core/src/main/java/appeng/core/features/MaterialStackSrc.java similarity index 100% rename from src/main/java/appeng/core/features/MaterialStackSrc.java rename to core/src/main/java/appeng/core/features/MaterialStackSrc.java diff --git a/src/main/java/appeng/core/features/TileDefinition.java b/core/src/main/java/appeng/core/features/TileDefinition.java similarity index 100% rename from src/main/java/appeng/core/features/TileDefinition.java rename to core/src/main/java/appeng/core/features/TileDefinition.java diff --git a/src/main/java/appeng/core/localization/ButtonToolTips.java b/core/src/main/java/appeng/core/localization/ButtonToolTips.java similarity index 98% rename from src/main/java/appeng/core/localization/ButtonToolTips.java rename to core/src/main/java/appeng/core/localization/ButtonToolTips.java index 035179722..5eb4cca2a 100644 --- a/src/main/java/appeng/core/localization/ButtonToolTips.java +++ b/core/src/main/java/appeng/core/localization/ButtonToolTips.java @@ -82,7 +82,7 @@ public enum ButtonToolTips { @Deprecated public String getLocal() { - return getTranslationKey().getFormattedText(); + return getTranslationKey().getString(); } public Text getTranslationKey() { diff --git a/src/main/java/appeng/core/localization/GuiText.java b/core/src/main/java/appeng/core/localization/GuiText.java similarity index 100% rename from src/main/java/appeng/core/localization/GuiText.java rename to core/src/main/java/appeng/core/localization/GuiText.java diff --git a/src/main/java/appeng/core/localization/PlayerMessages.java b/core/src/main/java/appeng/core/localization/PlayerMessages.java similarity index 100% rename from src/main/java/appeng/core/localization/PlayerMessages.java rename to core/src/main/java/appeng/core/localization/PlayerMessages.java diff --git a/src/main/java/appeng/core/localization/WailaText.java b/core/src/main/java/appeng/core/localization/WailaText.java similarity index 94% rename from src/main/java/appeng/core/localization/WailaText.java rename to core/src/main/java/appeng/core/localization/WailaText.java index 71b2212dd..143659673 100644 --- a/src/main/java/appeng/core/localization/WailaText.java +++ b/core/src/main/java/appeng/core/localization/WailaText.java @@ -18,7 +18,6 @@ package appeng.core.localization; -import net.minecraft.client.resources.I18n; import net.minecraft.text.Text; import net.minecraft.text.TranslatableText; @@ -44,7 +43,7 @@ public enum WailaText { } public String getLocal() { - return I18n.format(this.getTranslationKey()); + return textComponent().getString(); } public String getTranslationKey() { diff --git a/src/main/java/appeng/core/settings/TickRates.java b/core/src/main/java/appeng/core/settings/TickRates.java similarity index 100% rename from src/main/java/appeng/core/settings/TickRates.java rename to core/src/main/java/appeng/core/settings/TickRates.java diff --git a/src/main/java/appeng/core/stats/AdvancementTriggers.java b/core/src/main/java/appeng/core/stats/AdvancementTriggers.java similarity index 100% rename from src/main/java/appeng/core/stats/AdvancementTriggers.java rename to core/src/main/java/appeng/core/stats/AdvancementTriggers.java diff --git a/src/main/java/appeng/core/stats/AeStats.java b/core/src/main/java/appeng/core/stats/AeStats.java similarity index 100% rename from src/main/java/appeng/core/stats/AeStats.java rename to core/src/main/java/appeng/core/stats/AeStats.java diff --git a/src/main/java/appeng/core/stats/AppEngAdvancementTrigger.java b/core/src/main/java/appeng/core/stats/AppEngAdvancementTrigger.java similarity index 100% rename from src/main/java/appeng/core/stats/AppEngAdvancementTrigger.java rename to core/src/main/java/appeng/core/stats/AppEngAdvancementTrigger.java diff --git a/src/main/java/appeng/core/stats/IAdvancementTrigger.java b/core/src/main/java/appeng/core/stats/IAdvancementTrigger.java similarity index 100% rename from src/main/java/appeng/core/stats/IAdvancementTrigger.java rename to core/src/main/java/appeng/core/stats/IAdvancementTrigger.java diff --git a/src/main/java/appeng/decorative/AEDecorativeBlock.java b/core/src/main/java/appeng/decorative/AEDecorativeBlock.java similarity index 95% rename from src/main/java/appeng/decorative/AEDecorativeBlock.java rename to core/src/main/java/appeng/decorative/AEDecorativeBlock.java index ba029e816..efea6cb98 100644 --- a/src/main/java/appeng/decorative/AEDecorativeBlock.java +++ b/core/src/main/java/appeng/decorative/AEDecorativeBlock.java @@ -21,7 +21,7 @@ package appeng.decorative; import appeng.block.AEBaseBlock; public class AEDecorativeBlock extends AEBaseBlock { - public AEDecorativeBlock(Properties props) { + public AEDecorativeBlock(Settings props) { super(props); } } diff --git a/src/main/java/appeng/decorative/solid/ChargedQuartzOreBlock.java b/core/src/main/java/appeng/decorative/solid/ChargedQuartzOreBlock.java similarity index 97% rename from src/main/java/appeng/decorative/solid/ChargedQuartzOreBlock.java rename to core/src/main/java/appeng/decorative/solid/ChargedQuartzOreBlock.java index 69308e902..8073c9c61 100644 --- a/src/main/java/appeng/decorative/solid/ChargedQuartzOreBlock.java +++ b/core/src/main/java/appeng/decorative/solid/ChargedQuartzOreBlock.java @@ -32,7 +32,7 @@ import appeng.core.AEConfig; import appeng.core.AppEng; public class ChargedQuartzOreBlock extends QuartzOreBlock { - public ChargedQuartzOreBlock(Properties props) { + public ChargedQuartzOreBlock(Settings props) { super(props); } diff --git a/src/main/java/appeng/decorative/solid/GlassState.java b/core/src/main/java/appeng/decorative/solid/GlassState.java similarity index 100% rename from src/main/java/appeng/decorative/solid/GlassState.java rename to core/src/main/java/appeng/decorative/solid/GlassState.java diff --git a/src/main/java/appeng/decorative/solid/QuartzGlassBlock.java b/core/src/main/java/appeng/decorative/solid/QuartzGlassBlock.java similarity index 97% rename from src/main/java/appeng/decorative/solid/QuartzGlassBlock.java rename to core/src/main/java/appeng/decorative/solid/QuartzGlassBlock.java index d837ceb33..ab06bb9d3 100644 --- a/src/main/java/appeng/decorative/solid/QuartzGlassBlock.java +++ b/core/src/main/java/appeng/decorative/solid/QuartzGlassBlock.java @@ -27,7 +27,7 @@ import appeng.helpers.AEGlassMaterial; public class QuartzGlassBlock extends AbstractGlassBlock { - public QuartzGlassBlock(Properties props) { + public QuartzGlassBlock(Settings props) { super(props); } diff --git a/src/main/java/appeng/decorative/solid/QuartzLampBlock.java b/core/src/main/java/appeng/decorative/solid/QuartzLampBlock.java similarity index 97% rename from src/main/java/appeng/decorative/solid/QuartzLampBlock.java rename to core/src/main/java/appeng/decorative/solid/QuartzLampBlock.java index 069cebad4..5cf44ffef 100644 --- a/src/main/java/appeng/decorative/solid/QuartzLampBlock.java +++ b/core/src/main/java/appeng/decorative/solid/QuartzLampBlock.java @@ -32,7 +32,7 @@ import appeng.core.AppEng; public class QuartzLampBlock extends QuartzGlassBlock { - public QuartzLampBlock(Properties props) { + public QuartzLampBlock(Settings props) { super(props); } diff --git a/src/main/java/appeng/decorative/solid/QuartzOreBlock.java b/core/src/main/java/appeng/decorative/solid/QuartzOreBlock.java similarity index 64% rename from src/main/java/appeng/decorative/solid/QuartzOreBlock.java rename to core/src/main/java/appeng/decorative/solid/QuartzOreBlock.java index afeda7220..396b5c29e 100644 --- a/src/main/java/appeng/decorative/solid/QuartzOreBlock.java +++ b/core/src/main/java/appeng/decorative/solid/QuartzOreBlock.java @@ -18,21 +18,29 @@ package appeng.decorative.solid; +import appeng.block.AEBaseBlock; import net.minecraft.block.BlockState; +import net.minecraft.enchantment.EnchantmentHelper; +import net.minecraft.enchantment.Enchantments; +import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MathHelper; - -import appeng.block.AEBaseBlock; +import net.minecraft.world.World; public class QuartzOreBlock extends AEBaseBlock { - public QuartzOreBlock(Properties props) { + public QuartzOreBlock(Settings props) { super(props); } @Override - public int getExpDrop(BlockState state, net.minecraft.world.WorldView reader, BlockPos pos, int fortune, - int silktouch) { - return silktouch == 0 ? MathHelper.nextInt(RANDOM, 2, 5) : 0; + public void onStacksDropped(BlockState state, World world, BlockPos pos, ItemStack stack) { + super.onStacksDropped(state, world, pos, stack); + if (EnchantmentHelper.getLevel(Enchantments.SILK_TOUCH, stack) == 0) { + int i = MathHelper.nextInt(world.random, 2, 5); + if (i > 0) { + this.dropExperience(world, pos, i); + } + } } } diff --git a/src/main/java/appeng/decorative/solid/QuartzPillarBlock.java b/core/src/main/java/appeng/decorative/solid/QuartzPillarBlock.java similarity index 95% rename from src/main/java/appeng/decorative/solid/QuartzPillarBlock.java rename to core/src/main/java/appeng/decorative/solid/QuartzPillarBlock.java index 87721227e..c850e7d27 100644 --- a/src/main/java/appeng/decorative/solid/QuartzPillarBlock.java +++ b/core/src/main/java/appeng/decorative/solid/QuartzPillarBlock.java @@ -20,7 +20,7 @@ package appeng.decorative.solid; import net.minecraft.block.Block; import net.minecraft.block.BlockState; -import net.minecraft.state.EnumProperty; +import net.minecraft.state.property.EnumProperty; import net.minecraft.state.StateManager; import net.minecraft.state.property.Properties; import net.minecraft.util.math.Direction; @@ -35,7 +35,7 @@ import appeng.helpers.MetaRotation; public class QuartzPillarBlock extends AEDecorativeBlock implements IOrientableBlock { public static final EnumProperty AXIS = Properties.AXIS; - public QuartzPillarBlock(Properties props) { + public QuartzPillarBlock(Settings props) { super(props); // The upwards facing pillar is the default (i.e. for the item model) diff --git a/src/main/java/appeng/decorative/solid/SkyStoneBlock.java b/core/src/main/java/appeng/decorative/solid/SkyStoneBlock.java similarity index 98% rename from src/main/java/appeng/decorative/solid/SkyStoneBlock.java rename to core/src/main/java/appeng/decorative/solid/SkyStoneBlock.java index ec200f862..8c645955a 100644 --- a/src/main/java/appeng/decorative/solid/SkyStoneBlock.java +++ b/core/src/main/java/appeng/decorative/solid/SkyStoneBlock.java @@ -40,7 +40,7 @@ public class SkyStoneBlock extends AEBaseBlock { private static final double BREAK_SPEAK_THRESHOLD = 7.0; private final SkystoneType type; - public SkyStoneBlock(SkystoneType type, Properties props) { + public SkyStoneBlock(SkystoneType type, Settings props) { super(props); this.type = type; diff --git a/src/main/java/appeng/helpers/ICustomNameObject.java b/core/src/main/java/appeng/helpers/ICustomNameObject.java similarity index 100% rename from src/main/java/appeng/helpers/ICustomNameObject.java rename to core/src/main/java/appeng/helpers/ICustomNameObject.java diff --git a/src/main/java/appeng/helpers/MetaRotation.java b/core/src/main/java/appeng/helpers/MetaRotation.java similarity index 100% rename from src/main/java/appeng/helpers/MetaRotation.java rename to core/src/main/java/appeng/helpers/MetaRotation.java diff --git a/src/main/java/appeng/tile/misc/LightDetectorBlockEntity.java b/core/src/main/java/appeng/tile/misc/LightDetectorBlockEntity.java similarity index 100% rename from src/main/java/appeng/tile/misc/LightDetectorBlockEntity.java rename to core/src/main/java/appeng/tile/misc/LightDetectorBlockEntity.java diff --git a/src/main/java/appeng/tile/misc/SkyCompassBlockEntity.java b/core/src/main/java/appeng/tile/misc/SkyCompassBlockEntity.java similarity index 100% rename from src/main/java/appeng/tile/misc/SkyCompassBlockEntity.java rename to core/src/main/java/appeng/tile/misc/SkyCompassBlockEntity.java diff --git a/src/main/java/appeng/block/networking/ControllerBlock.java b/src/main/java/appeng/block/networking/ControllerBlock.java index 5b96d8ba6..98f3fac1e 100644 --- a/src/main/java/appeng/block/networking/ControllerBlock.java +++ b/src/main/java/appeng/block/networking/ControllerBlock.java @@ -21,10 +21,10 @@ package appeng.block.networking; import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.block.Material; -import net.minecraft.state.EnumProperty; +import net.minecraft.state.property.EnumProperty; import net.minecraft.state.StateManager; +import net.minecraft.util.StringIdentifiable; import net.minecraft.util.math.Direction; -import net.minecraft.util.IStringSerializable; import net.minecraft.util.math.BlockPos; import net.minecraft.world.WorldAccess; import net.minecraft.world.World; @@ -34,11 +34,11 @@ import appeng.tile.networking.ControllerBlockEntity; public class ControllerBlock extends AEBaseTileBlock { - public enum ControllerBlockState implements IStringSerializable { + public enum ControllerBlockState implements StringIdentifiable { offline, online, conflicted; @Override - public String getName() { + public String asString() { return this.name(); } @@ -50,11 +50,11 @@ public class ControllerBlock extends AEBaseTileBlock { * enclosed by other controllers, and since they are always offline, they do not * have the usual sub-states. */ - public enum ControllerRenderType implements IStringSerializable { + public enum ControllerRenderType implements StringIdentifiable { block, column_x, column_y, column_z, inside_a, inside_b; @Override - public String getName() { + public String asString() { return this.name(); } diff --git a/src/main/java/appeng/block/networking/WirelessBlock.java b/src/main/java/appeng/block/networking/WirelessBlock.java index e82a65bab..f8a11a215 100644 --- a/src/main/java/appeng/block/networking/WirelessBlock.java +++ b/src/main/java/appeng/block/networking/WirelessBlock.java @@ -21,13 +21,13 @@ package appeng.block.networking; import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.state.EnumProperty; +import net.minecraft.state.property.EnumProperty; import net.minecraft.state.StateManager; import net.minecraft.util.ActionResult; import net.minecraft.util.hit.BlockHitResult; import net.minecraft.util.math.Direction; import net.minecraft.util.Hand; -import net.minecraft.util.IStringSerializable; +import net.minecraft.util.StringIdentifiable; import net.minecraft.util.math.Box; import net.minecraft.util.math.BlockPos; import net.minecraft.block.ShapeContext; @@ -46,11 +46,11 @@ import appeng.util.Platform; public class WirelessBlock extends AEBaseTileBlock { - enum State implements IStringSerializable { + enum State implements StringIdentifiable { OFF, ON, HAS_CHANNEL; @Override - public String getName() { + public String asString() { return this.name().toLowerCase(); } } diff --git a/src/main/java/appeng/block/storage/ChestBlock.java b/src/main/java/appeng/block/storage/ChestBlock.java index d6c6b79ee..c899ec660 100644 --- a/src/main/java/appeng/block/storage/ChestBlock.java +++ b/src/main/java/appeng/block/storage/ChestBlock.java @@ -25,7 +25,7 @@ import net.minecraft.block.BlockState; import net.minecraft.block.Material; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; -import net.minecraft.state.EnumProperty; +import net.minecraft.state.property.EnumProperty; import net.minecraft.state.StateManager; import net.minecraft.util.ActionResult; import net.minecraft.util.Hand; diff --git a/src/main/java/appeng/block/storage/DriveSlotCellType.java b/src/main/java/appeng/block/storage/DriveSlotCellType.java index c808d614d..c49d05693 100644 --- a/src/main/java/appeng/block/storage/DriveSlotCellType.java +++ b/src/main/java/appeng/block/storage/DriveSlotCellType.java @@ -18,12 +18,12 @@ package appeng.block.storage; -import net.minecraft.util.IStringSerializable; +import net.minecraft.util.StringIdentifiable; /** * Describes the type of cell present in a slot. */ -public enum DriveSlotCellType implements IStringSerializable { +public enum DriveSlotCellType implements StringIdentifiable { EMPTY("empty"), @@ -38,7 +38,7 @@ public enum DriveSlotCellType implements IStringSerializable { } @Override - public String getName() { + public String asString() { return this.name; } diff --git a/src/main/java/appeng/block/storage/DriveSlotState.java b/src/main/java/appeng/block/storage/DriveSlotState.java index 4cd8306ba..a7aefdb41 100644 --- a/src/main/java/appeng/block/storage/DriveSlotState.java +++ b/src/main/java/appeng/block/storage/DriveSlotState.java @@ -18,7 +18,7 @@ package appeng.block.storage; -import net.minecraft.util.IStringSerializable; +import net.minecraft.util.StringIdentifiable; import appeng.api.storage.cells.CellState; @@ -26,7 +26,7 @@ import appeng.api.storage.cells.CellState; * Describes the different states a single slot of a BlockDrive can be in in * terms of rendering. */ -public enum DriveSlotState implements IStringSerializable { +public enum DriveSlotState implements StringIdentifiable { // No cell in slot EMPTY("empty"), @@ -50,7 +50,7 @@ public enum DriveSlotState implements IStringSerializable { } @Override - public String getName() { + public String asString() { return this.name; } diff --git a/src/main/java/appeng/client/render/FacingToRotation.java b/src/main/java/appeng/client/render/FacingToRotation.java index 3ec87772b..799844cc4 100644 --- a/src/main/java/appeng/client/render/FacingToRotation.java +++ b/src/main/java/appeng/client/render/FacingToRotation.java @@ -24,14 +24,14 @@ import net.minecraft.client.renderer.Matrix4f; import net.minecraft.client.renderer.Quaternion; import net.minecraft.client.util.math.Vector3f; import net.minecraft.client.renderer.Vector4f; +import net.minecraft.util.StringIdentifiable; import net.minecraft.util.math.Direction; -import net.minecraft.util.IStringSerializable; import net.minecraft.util.math.Vec3i; /** * TODO: Removed useless stuff. */ -public enum FacingToRotation implements IStringSerializable { +public enum FacingToRotation implements StringIdentifiable { // DUNSWE // @formatter:off @@ -110,7 +110,7 @@ public enum FacingToRotation implements IStringSerializable { } @Override - public String getName() { + public String asString() { return name().toLowerCase(); } }