fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

The Great Renamening of 2020

Browse Source
This commit is contained in:
Sebastian Hartte
2020-06-22 12:14:54 +02:00
parent abe3334488
commit b4471b1abb
441 changed files with 3395 additions and 3468 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/items/materials/ItemMaterial.java → src/main/java/appeng/items/materials/MaterialItem.java
+2 -2
View File
@@ -55,7 +55,7 @@ import appeng.items.AEBaseItem;
import appeng.util.InventoryAdaptor;
import appeng.util.inv.AdaptorItemHandler;
public final class ItemMaterial extends AEBaseItem implements IStorageComponent, IUpgradeModule {
public final class MaterialItem extends AEBaseItem implements IStorageComponent, IUpgradeModule {
/**
* NBT property used by the name press to store the name to be inscribed.
@@ -66,7 +66,7 @@ public final class ItemMaterial extends AEBaseItem implements IStorageComponent,
private final MaterialType materialType;
public ItemMaterial(Properties properties, MaterialType materialType) {
public MaterialItem(Properties properties, MaterialType materialType) {
super(properties);
this.materialType = materialType;
}
src/main/java/appeng/items/materials/MaterialType.java
+6 -6
View File
@@ -29,13 +29,13 @@ import net.minecraft.util.ResourceLocation;
import appeng.api.features.AEFeature;
import appeng.core.AppEng;
import appeng.core.features.MaterialStackSrc;
import appeng.entity.EntityChargedQuartz;
import appeng.entity.EntitySingularity;
import appeng.entity.ChargedQuartzEntity;
import appeng.entity.SingularityEntity;
public enum MaterialType {
CERTUS_QUARTZ_CRYSTAL("certus_quartz_crystal", EnumSet.of(AEFeature.CERTUS), "crystalCertusQuartz"),
CERTUS_QUARTZ_CRYSTAL_CHARGED("charged_certus_quartz_crystal", EnumSet.of(AEFeature.CERTUS),
EntityChargedQuartz.class),
ChargedQuartzEntity.class),
CERTUS_QUARTZ_DUST("certus_quartz_dust", EnumSet.of(AEFeature.DUSTS, AEFeature.CERTUS), "dustCertusQuartz"),
NETHER_QUARTZ_DUST("nether_quartz_dust", EnumSet.of(AEFeature.DUSTS), "dustNetherQuartz,dustQuartz"),
@@ -106,10 +106,10 @@ public enum MaterialType {
SKY_DUST("sky_dust", EnumSet.of(AEFeature.DUSTS)),
ENDER_DUST("ender_dust", EnumSet.of(AEFeature.QUANTUM_NETWORK_BRIDGE), "dustEnder,dustEnderPearl",
EntitySingularity.class),
SINGULARITY("singularity", EnumSet.of(AEFeature.QUANTUM_NETWORK_BRIDGE), EntitySingularity.class),
SingularityEntity.class),
SINGULARITY("singularity", EnumSet.of(AEFeature.QUANTUM_NETWORK_BRIDGE), SingularityEntity.class),
QUANTUM_ENTANGLED_SINGULARITY("quantum_entangled_singularity", EnumSet.of(AEFeature.QUANTUM_NETWORK_BRIDGE),
EntitySingularity.class),
SingularityEntity.class),
BLANK_PATTERN("blank_pattern", EnumSet.of(AEFeature.PATTERNS)),
CARD_CRAFTING("crafting_card", EnumSet.of(AEFeature.ADVANCED_CARDS, AEFeature.CRAFTING_CPU)),
src/main/java/appeng/items/misc/ItemCrystalSeed.java → src/main/java/appeng/items/misc/CrystalSeedItem.java
+4 -4
View File
@@ -43,14 +43,14 @@ import net.minecraftforge.api.distmarker.OnlyIn;
import appeng.api.implementations.items.IGrowableCrystal;
import appeng.core.localization.ButtonToolTips;
import appeng.entity.EntityGrowingCrystal;
import appeng.entity.GrowingCrystalEntity;
import appeng.items.AEBaseItem;
/**
* This item reprents one of the seeds used to grow various forms of quartz by
* throwing them into water (for that behavior, see the linked entity)
*/
public class ItemCrystalSeed extends AEBaseItem implements IGrowableCrystal {
public class CrystalSeedItem extends AEBaseItem implements IGrowableCrystal {
/**
* Name of NBT tag used to store the growth progress value.
@@ -67,7 +67,7 @@ public class ItemCrystalSeed extends AEBaseItem implements IGrowableCrystal {
*/
private final IItemProvider grownItem;
public ItemCrystalSeed(Properties properties, IItemProvider grownItem) {
public CrystalSeedItem(Properties properties, IItemProvider grownItem) {
super(properties);
this.grownItem = Preconditions.checkNotNull(grownItem);
// Expose the growth of the seed to the model system
@@ -129,7 +129,7 @@ public class ItemCrystalSeed extends AEBaseItem implements IGrowableCrystal {
@Override
public Entity createEntity(final World world, final Entity location, final ItemStack itemstack) {
final EntityGrowingCrystal egc = new EntityGrowingCrystal(world, location.getPosX(), location.getPosY(),
final GrowingCrystalEntity egc = new GrowingCrystalEntity(world, location.getPosX(), location.getPosY(),
location.getPosZ(), itemstack);
egc.setMotion(location.getMotion());
src/main/java/appeng/items/misc/ItemEncodedPattern.java → src/main/java/appeng/items/misc/EncodedPatternItem.java
+2 -2
View File
@@ -48,11 +48,11 @@ import appeng.helpers.PatternHelper;
import appeng.items.AEBaseItem;
import appeng.util.Platform;
public class ItemEncodedPattern extends AEBaseItem implements ICraftingPatternItem {
public class EncodedPatternItem extends AEBaseItem implements ICraftingPatternItem {
// rather simple client side caching.
private static final Map<ItemStack, ItemStack> SIMPLE_CACHE = new WeakHashMap<>();
public ItemEncodedPattern(Properties properties) {
public EncodedPatternItem(Properties properties) {
super(properties);
}
src/main/java/appeng/items/misc/ItemPaintBall.java → src/main/java/appeng/items/misc/PaintBallItem.java
+2 -2
View File
@@ -21,13 +21,13 @@ package appeng.items.misc;
import appeng.api.util.AEColor;
import appeng.items.AEBaseItem;
public class ItemPaintBall extends AEBaseItem {
public class PaintBallItem extends AEBaseItem {
private final AEColor color;
private final boolean lumen;
public ItemPaintBall(Properties properties, AEColor color, boolean lumen) {
public PaintBallItem(Properties properties, AEColor color, boolean lumen) {
super(properties);
this.color = color;
this.lumen = lumen;
src/main/java/appeng/items/misc/ItemPaintBallRendering.java → src/main/java/appeng/items/misc/PaintBallItemRendering.java
+2 -2
View File
@@ -22,13 +22,13 @@ import appeng.api.util.AEColor;
import appeng.bootstrap.IItemRendering;
import appeng.bootstrap.ItemRenderingCustomizer;
public class ItemPaintBallRendering extends ItemRenderingCustomizer {
public class PaintBallItemRendering extends ItemRenderingCustomizer {
private final boolean lumen;
private final AEColor color;
public ItemPaintBallRendering(AEColor color, boolean lumen) {
public PaintBallItemRendering(AEColor color, boolean lumen) {
this.lumen = lumen;
this.color = color;
}
src/main/java/appeng/items/parts/ColoredPartItem.java
+1 -1
View File
@@ -7,7 +7,7 @@ import net.minecraft.item.ItemStack;
import appeng.api.parts.IPart;
import appeng.api.util.AEColor;
public class ColoredPartItem<T extends IPart> extends ItemPart<T> {
public class ColoredPartItem<T extends IPart> extends PartItem<T> {
private final AEColor color;
src/main/java/appeng/items/parts/ItemFacade.java → src/main/java/appeng/items/parts/FacadeItem.java
+2 -2
View File
@@ -48,7 +48,7 @@ import appeng.facade.FacadePart;
import appeng.facade.IFacadeItem;
import appeng.items.AEBaseItem;
public class ItemFacade extends AEBaseItem implements IFacadeItem, IAlphaPassItem {
public class FacadeItem extends AEBaseItem implements IFacadeItem, IAlphaPassItem {
/**
* Block tag used to explicitly whitelist blocks for use in facades.
@@ -57,7 +57,7 @@ public class ItemFacade extends AEBaseItem implements IFacadeItem, IAlphaPassIte
private static final String NBT_ITEM_ID = "item";
public ItemFacade(Properties properties) {
public FacadeItem(Properties properties) {
super(properties);
}
src/main/java/appeng/items/parts/ItemPart.java → src/main/java/appeng/items/parts/PartItem.java
+4 -4
View File
@@ -35,12 +35,12 @@ import appeng.api.parts.IPartItem;
import appeng.core.localization.GuiText;
import appeng.items.AEBaseItem;
public class ItemPart<T extends IPart> extends AEBaseItem implements IPartItem<T>, IItemGroup {
public class PartItem<T extends IPart> extends AEBaseItem implements IPartItem<T>, IItemGroup {
private final PartType type;
private final Function<ItemStack, T> factory;
public ItemPart(Properties properties, PartType type, Function<ItemStack, T> factory) {
public PartItem(Properties properties, PartType type, Function<ItemStack, T> factory) {
super(properties);
this.type = type;
this.factory = factory;
@@ -68,8 +68,8 @@ public class ItemPart<T extends IPart> extends AEBaseItem implements IPartItem<T
}
private static PartType getTypeByStack(ItemStack is) {
if (is.getItem() instanceof ItemPart) {
return ((ItemPart<?>) is.getItem()).getType();
if (is.getItem() instanceof PartItem) {
return ((PartItem<?>) is.getItem()).getType();
}
return PartType.INVALID_TYPE;
}
src/main/java/appeng/items/parts/ItemPartRendering.java → src/main/java/appeng/items/parts/PartItemRendering.java
+3 -3
View File
@@ -26,15 +26,15 @@ import appeng.bootstrap.IItemRendering;
import appeng.bootstrap.ItemRenderingCustomizer;
import appeng.client.render.StaticItemColor;
public class ItemPartRendering extends ItemRenderingCustomizer {
public class PartItemRendering extends ItemRenderingCustomizer {
private final AEColor color;
public ItemPartRendering() {
public PartItemRendering() {
this.color = AEColor.TRANSPARENT;
}
public ItemPartRendering(AEColor color) {
public PartItemRendering(AEColor color) {
this.color = color;
}
src/main/java/appeng/items/parts/PartType.java
+80 -82
View File
@@ -24,63 +24,61 @@ import java.util.HashSet;
import java.util.Set;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
import appeng.api.features.AEFeature;
import appeng.api.parts.IPart;
import appeng.fluids.parts.PartFluidAnnihilationPlane;
import appeng.fluids.parts.PartFluidExportBus;
import appeng.fluids.parts.PartFluidFormationPlane;
import appeng.fluids.parts.PartFluidImportBus;
import appeng.fluids.parts.PartFluidInterface;
import appeng.fluids.parts.PartFluidLevelEmitter;
import appeng.fluids.parts.PartFluidStorageBus;
import appeng.fluids.parts.PartFluidTerminal;
import appeng.parts.automation.PartAnnihilationPlane;
import appeng.parts.automation.PartExportBus;
import appeng.parts.automation.PartFormationPlane;
import appeng.parts.automation.PartIdentityAnnihilationPlane;
import appeng.parts.automation.PartImportBus;
import appeng.parts.automation.PartLevelEmitter;
import appeng.parts.misc.PartCableAnchor;
import appeng.parts.misc.PartInterface;
import appeng.parts.misc.PartInvertedToggleBus;
import appeng.parts.misc.PartStorageBus;
import appeng.parts.misc.PartToggleBus;
import appeng.parts.networking.PartCableCovered;
import appeng.parts.networking.PartCableGlass;
import appeng.parts.networking.PartCableSmart;
import appeng.parts.networking.PartDenseCableCovered;
import appeng.parts.networking.PartDenseCableSmart;
import appeng.parts.networking.PartQuartzFiber;
import appeng.parts.p2p.PartP2PFEPower;
import appeng.parts.p2p.PartP2PFluids;
import appeng.parts.p2p.PartP2PItems;
import appeng.parts.p2p.PartP2PLight;
import appeng.parts.p2p.PartP2PRedstone;
import appeng.parts.p2p.PartP2PTunnelME;
import appeng.parts.reporting.PartConversionMonitor;
import appeng.parts.reporting.PartCraftingTerminal;
import appeng.parts.reporting.PartDarkPanel;
import appeng.parts.reporting.PartInterfaceTerminal;
import appeng.parts.reporting.PartPanel;
import appeng.parts.reporting.PartPatternTerminal;
import appeng.parts.reporting.PartSemiDarkPanel;
import appeng.parts.reporting.PartStorageMonitor;
import appeng.parts.reporting.PartTerminal;
import appeng.fluids.parts.FluidAnnihilationPlanePart;
import appeng.fluids.parts.FluidExportBusPart;
import appeng.fluids.parts.FluidFormationPlanePart;
import appeng.fluids.parts.FluidImportBusPart;
import appeng.fluids.parts.FluidInterfacePart;
import appeng.fluids.parts.FluidLevelEmitterPart;
import appeng.fluids.parts.FluidStorageBusPart;
import appeng.fluids.parts.FluidTerminalPart;
import appeng.parts.automation.AnnihilationPlanePart;
import appeng.parts.automation.ExportBusPart;
import appeng.parts.automation.FormationPlanePart;
import appeng.parts.automation.IdentityAnnihilationPlanePart;
import appeng.parts.automation.ImportBusPart;
import appeng.parts.automation.LevelEmitterPart;
import appeng.parts.misc.CableAnchorPart;
import appeng.parts.misc.InterfacePart;
import appeng.parts.misc.InvertedToggleBusPart;
import appeng.parts.misc.StorageBusPart;
import appeng.parts.misc.ToggleBusPart;
import appeng.parts.networking.CoveredCablePart;
import appeng.parts.networking.GlassCablePart;
import appeng.parts.networking.SmartCablePart;
import appeng.parts.networking.CoveredDenseCablePart;
import appeng.parts.networking.SmartDenseCablePart;
import appeng.parts.networking.QuartzFiberPart;
import appeng.parts.p2p.FEP2PTunnelPart;
import appeng.parts.p2p.FluidP2PTunnelPart;
import appeng.parts.p2p.ItemP2PTunnelPart;
import appeng.parts.p2p.LightP2PTunnelPart;
import appeng.parts.p2p.RedstoneP2PTunnelPart;
import appeng.parts.p2p.MEP2PTunnelPart;
import appeng.parts.reporting.ConversionMonitorPart;
import appeng.parts.reporting.CraftingTerminalPart;
import appeng.parts.reporting.DarkPanelPart;
import appeng.parts.reporting.InterfaceTerminalPart;
import appeng.parts.reporting.PanelPart;
import appeng.parts.reporting.PatternTerminalPart;
import appeng.parts.reporting.SemiDarkPanelPart;
import appeng.parts.reporting.StorageMonitorPart;
import appeng.parts.reporting.TerminalPart;
public enum PartType {
INVALID_TYPE(EnumSet.of(AEFeature.CORE), EnumSet.noneOf(IntegrationType.class), null),
CABLE_GLASS(EnumSet.of(AEFeature.GLASS_CABLES), EnumSet.noneOf(IntegrationType.class), PartCableGlass.class) {
CABLE_GLASS(EnumSet.of(AEFeature.GLASS_CABLES), EnumSet.noneOf(IntegrationType.class), GlassCablePart.class) {
@Override
public boolean isCable() {
return true;
}
},
CABLE_COVERED(EnumSet.of(AEFeature.COVERED_CABLES), EnumSet.noneOf(IntegrationType.class), PartCableCovered.class) {
CABLE_COVERED(EnumSet.of(AEFeature.COVERED_CABLES), EnumSet.noneOf(IntegrationType.class), CoveredCablePart.class) {
@Override
public boolean isCable() {
return true;
@@ -88,7 +86,7 @@ public enum PartType {
},
CABLE_SMART(EnumSet.of(AEFeature.CHANNELS, AEFeature.SMART_CABLES), EnumSet.noneOf(IntegrationType.class),
PartCableSmart.class) {
SmartCablePart.class) {
@Override
public boolean isCable() {
return true;
@@ -96,7 +94,7 @@ public enum PartType {
},
CABLE_DENSE_SMART(EnumSet.of(AEFeature.CHANNELS, AEFeature.DENSE_CABLES), EnumSet.noneOf(IntegrationType.class),
PartDenseCableSmart.class) {
SmartDenseCablePart.class) {
@Override
public boolean isCable() {
return true;
@@ -104,98 +102,98 @@ public enum PartType {
},
CABLE_DENSE_COVERED(EnumSet.of(AEFeature.CHANNELS, AEFeature.DENSE_CABLES), EnumSet.noneOf(IntegrationType.class),
PartDenseCableCovered.class) {
CoveredDenseCablePart.class) {
@Override
public boolean isCable() {
return true;
}
},
TOGGLE_BUS(EnumSet.of(AEFeature.TOGGLE_BUS), EnumSet.noneOf(IntegrationType.class), PartToggleBus.class),
TOGGLE_BUS(EnumSet.of(AEFeature.TOGGLE_BUS), EnumSet.noneOf(IntegrationType.class), ToggleBusPart.class),
INVERTED_TOGGLE_BUS(EnumSet.of(AEFeature.TOGGLE_BUS), EnumSet.noneOf(IntegrationType.class),
PartInvertedToggleBus.class),
InvertedToggleBusPart.class),
CABLE_ANCHOR(EnumSet.of(AEFeature.CABLE_ANCHOR), EnumSet.noneOf(IntegrationType.class), PartCableAnchor.class),
CABLE_ANCHOR(EnumSet.of(AEFeature.CABLE_ANCHOR), EnumSet.noneOf(IntegrationType.class), CableAnchorPart.class),
QUARTZ_FIBER(EnumSet.of(AEFeature.QUARTZ_FIBER), EnumSet.noneOf(IntegrationType.class), PartQuartzFiber.class),
QUARTZ_FIBER(EnumSet.of(AEFeature.QUARTZ_FIBER), EnumSet.noneOf(IntegrationType.class), QuartzFiberPart.class),
MONITOR(EnumSet.of(AEFeature.PANELS), EnumSet.noneOf(IntegrationType.class), PartPanel.class),
MONITOR(EnumSet.of(AEFeature.PANELS), EnumSet.noneOf(IntegrationType.class), PanelPart.class),
SEMI_DARK_MONITOR(EnumSet.of(AEFeature.PANELS), EnumSet.noneOf(IntegrationType.class), PartSemiDarkPanel.class),
SEMI_DARK_MONITOR(EnumSet.of(AEFeature.PANELS), EnumSet.noneOf(IntegrationType.class), SemiDarkPanelPart.class),
DARK_MONITOR(EnumSet.of(AEFeature.PANELS), EnumSet.noneOf(IntegrationType.class), PartDarkPanel.class),
DARK_MONITOR(EnumSet.of(AEFeature.PANELS), EnumSet.noneOf(IntegrationType.class), DarkPanelPart.class),
STORAGE_BUS(EnumSet.of(AEFeature.STORAGE_BUS), EnumSet.noneOf(IntegrationType.class), PartStorageBus.class),
STORAGE_BUS(EnumSet.of(AEFeature.STORAGE_BUS), EnumSet.noneOf(IntegrationType.class), StorageBusPart.class),
FLUID_STORAGE_BUS(EnumSet.of(AEFeature.FLUID_STORAGE_BUS), EnumSet.noneOf(IntegrationType.class),
PartFluidStorageBus.class),
FluidStorageBusPart.class),
IMPORT_BUS(EnumSet.of(AEFeature.IMPORT_BUS), EnumSet.noneOf(IntegrationType.class), PartImportBus.class),
IMPORT_BUS(EnumSet.of(AEFeature.IMPORT_BUS), EnumSet.noneOf(IntegrationType.class), ImportBusPart.class),
FLUID_IMPORT_BUS(EnumSet.of(AEFeature.FLUID_IMPORT_BUS), EnumSet.noneOf(IntegrationType.class),
PartFluidImportBus.class),
FluidImportBusPart.class),
EXPORT_BUS(EnumSet.of(AEFeature.EXPORT_BUS), EnumSet.noneOf(IntegrationType.class), PartExportBus.class),
EXPORT_BUS(EnumSet.of(AEFeature.EXPORT_BUS), EnumSet.noneOf(IntegrationType.class), ExportBusPart.class),
FLUID_EXPORT_BUS(EnumSet.of(AEFeature.FLUID_EXPORT_BUS), EnumSet.noneOf(IntegrationType.class),
PartFluidExportBus.class),
FluidExportBusPart.class),
LEVEL_EMITTER(EnumSet.of(AEFeature.LEVEL_EMITTER), EnumSet.noneOf(IntegrationType.class), PartLevelEmitter.class),
LEVEL_EMITTER(EnumSet.of(AEFeature.LEVEL_EMITTER), EnumSet.noneOf(IntegrationType.class), LevelEmitterPart.class),
FLUID_LEVEL_EMITTER(EnumSet.of(AEFeature.FLUID_LEVEL_EMITTER), EnumSet.noneOf(IntegrationType.class),
PartFluidLevelEmitter.class),
FluidLevelEmitterPart.class),
ANNIHILATION_PLANE(EnumSet.of(AEFeature.ANNIHILATION_PLANE), EnumSet.noneOf(IntegrationType.class),
PartAnnihilationPlane.class),
AnnihilationPlanePart.class),
IDENTITY_ANNIHILATION_PLANE(EnumSet.of(AEFeature.ANNIHILATION_PLANE, AEFeature.IDENTITY_ANNIHILATION_PLANE),
EnumSet.noneOf(IntegrationType.class), PartIdentityAnnihilationPlane.class),
EnumSet.noneOf(IntegrationType.class), IdentityAnnihilationPlanePart.class),
FLUID_ANNIHILATION_PLANE(EnumSet.of(AEFeature.FLUID_ANNIHILATION_PLANE), EnumSet.noneOf(IntegrationType.class),
PartFluidAnnihilationPlane.class),
FluidAnnihilationPlanePart.class),
FORMATION_PLANE(EnumSet.of(AEFeature.FORMATION_PLANE), EnumSet.noneOf(IntegrationType.class),
PartFormationPlane.class),
FormationPlanePart.class),
FLUID_FORMATION_PLANE(EnumSet.of(AEFeature.FLUID_FORMATION_PLANE), EnumSet.noneOf(IntegrationType.class),
PartFluidFormationPlane.class),
FluidFormationPlanePart.class),
PATTERN_TERMINAL(EnumSet.of(AEFeature.PATTERNS), EnumSet.noneOf(IntegrationType.class), PartPatternTerminal.class),
PATTERN_TERMINAL(EnumSet.of(AEFeature.PATTERNS), EnumSet.noneOf(IntegrationType.class), PatternTerminalPart.class),
CRAFTING_TERMINAL(EnumSet.of(AEFeature.CRAFTING_TERMINAL), EnumSet.noneOf(IntegrationType.class),
PartCraftingTerminal.class),
CraftingTerminalPart.class),
TERMINAL(EnumSet.of(AEFeature.TERMINAL), EnumSet.noneOf(IntegrationType.class), PartTerminal.class),
TERMINAL(EnumSet.of(AEFeature.TERMINAL), EnumSet.noneOf(IntegrationType.class), TerminalPart.class),
STORAGE_MONITOR(EnumSet.of(AEFeature.STORAGE_MONITOR), EnumSet.noneOf(IntegrationType.class),
PartStorageMonitor.class),
StorageMonitorPart.class),
CONVERSION_MONITOR(EnumSet.of(AEFeature.PART_CONVERSION_MONITOR), EnumSet.noneOf(IntegrationType.class),
PartConversionMonitor.class),
ConversionMonitorPart.class),
INTERFACE(EnumSet.of(AEFeature.INTERFACE), EnumSet.noneOf(IntegrationType.class), PartInterface.class),
INTERFACE(EnumSet.of(AEFeature.INTERFACE), EnumSet.noneOf(IntegrationType.class), InterfacePart.class),
FLUID_INTERFACE(EnumSet.of(AEFeature.FLUID_INTERFACE), EnumSet.noneOf(IntegrationType.class),
PartFluidInterface.class),
FluidInterfacePart.class),
P2P_TUNNEL_ME(EnumSet.of(AEFeature.P2P_TUNNEL, AEFeature.P2P_TUNNEL_ME), EnumSet.noneOf(IntegrationType.class),
PartP2PTunnelME.class),
MEP2PTunnelPart.class),
P2P_TUNNEL_REDSTONE(EnumSet.of(AEFeature.P2P_TUNNEL, AEFeature.P2P_TUNNEL_REDSTONE),
EnumSet.noneOf(IntegrationType.class), PartP2PRedstone.class),
EnumSet.noneOf(IntegrationType.class), RedstoneP2PTunnelPart.class),
P2P_TUNNEL_ITEM(EnumSet.of(AEFeature.P2P_TUNNEL, AEFeature.P2P_TUNNEL_ITEMS), EnumSet.noneOf(IntegrationType.class),
PartP2PItems.class),
ItemP2PTunnelPart.class),
P2P_TUNNEL_FLUID(EnumSet.of(AEFeature.P2P_TUNNEL, AEFeature.P2P_TUNNEL_FLUIDS),
EnumSet.noneOf(IntegrationType.class), PartP2PFluids.class),
EnumSet.noneOf(IntegrationType.class), FluidP2PTunnelPart.class),
//FIXME P2P_TUNNEL_IC2( 465, "p2p_tunnel_ic2", EnumSet.of( AEFeature.P2P_TUNNEL, AEFeature.P2P_TUNNEL_EU ), EnumSet
//FIXME .of( IntegrationType.IC2 ), PartP2PIC2Power.class ),
P2P_TUNNEL_LIGHT(EnumSet.of(AEFeature.P2P_TUNNEL, AEFeature.P2P_TUNNEL_LIGHT),
EnumSet.noneOf(IntegrationType.class), PartP2PLight.class),
EnumSet.noneOf(IntegrationType.class), LightP2PTunnelPart.class),
P2P_TUNNEL_FE(EnumSet.of(AEFeature.P2P_TUNNEL, AEFeature.P2P_TUNNEL_FE), EnumSet.noneOf(IntegrationType.class),
PartP2PFEPower.class),
FEP2PTunnelPart.class),
// P2PTunnelOpenComputers( 468, EnumSet.of( AEFeature.P2PTunnel,
// AEFeature.P2PTunnelOpenComputers ), EnumSet.of(
@@ -203,10 +201,10 @@ public enum PartType {
// ),
INTERFACE_TERMINAL(EnumSet.of(AEFeature.INTERFACE_TERMINAL), EnumSet.noneOf(IntegrationType.class),
PartInterfaceTerminal.class),
InterfaceTerminalPart.class),
FLUID_TERMINAL(EnumSet.of(AEFeature.FLUID_TERMINAL), EnumSet.noneOf(IntegrationType.class),
PartFluidTerminal.class);
FluidTerminalPart.class);
private final Set<AEFeature> features;
private final Set<IntegrationType> integrations;
src/main/java/appeng/items/storage/BasicItemStorageCell.java → src/main/java/appeng/items/storage/BasicStorageCellItem.java
+2 -2
View File
@@ -28,12 +28,12 @@ import appeng.api.storage.data.IAEItemStack;
import appeng.items.materials.MaterialType;
import appeng.util.InventoryAdaptor;
public final class BasicItemStorageCell extends AbstractStorageCell<IAEItemStack> {
public final class BasicStorageCellItem extends AbstractStorageCell<IAEItemStack> {
protected final int perType;
protected final double idleDrain;
public BasicItemStorageCell(Properties props, final MaterialType whichCell, final int kilobytes) {
public BasicStorageCellItem(Properties props, final MaterialType whichCell, final int kilobytes) {
super(props, whichCell, kilobytes);
switch (whichCell) {
case ITEM_1K_CELL_COMPONENT:
src/main/java/appeng/items/storage/ItemCreativeStorageCell.java → src/main/java/appeng/items/storage/CreativeStorageCellItem.java
+2 -2
View File
@@ -37,9 +37,9 @@ import appeng.api.storage.channels.IItemStorageChannel;
import appeng.items.AEBaseItem;
import appeng.items.contents.CellConfig;
public class ItemCreativeStorageCell extends AEBaseItem implements ICellWorkbenchItem {
public class CreativeStorageCellItem extends AEBaseItem implements ICellWorkbenchItem {
public ItemCreativeStorageCell(Properties props) {
public CreativeStorageCellItem(Properties props) {
super(props);
}
src/main/java/appeng/items/storage/ItemSpatialStorageCell.java → src/main/java/appeng/items/storage/SpatialStorageCellItem.java
+2 -2
View File
@@ -43,12 +43,12 @@ import appeng.items.AEBaseItem;
import appeng.spatial.SpatialDimensionManager;
import appeng.spatial.StorageHelper;
public class ItemSpatialStorageCell extends AEBaseItem implements ISpatialStorageCell {
public class SpatialStorageCellItem extends AEBaseItem implements ISpatialStorageCell {
private static final String TAG_DIMENSION_ID = "dimension_id";
private final int maxRegion;
public ItemSpatialStorageCell(Properties props, final int spatialScale) {
public SpatialStorageCellItem(Properties props, final int spatialScale) {
super(props);
this.maxRegion = spatialScale;
}
src/main/java/appeng/items/storage/ItemViewCell.java → src/main/java/appeng/items/storage/ViewCellItem.java
+3 -3
View File
@@ -38,9 +38,9 @@ import appeng.util.prioritylist.IPartitionList;
import appeng.util.prioritylist.MergedPriorityList;
import appeng.util.prioritylist.PrecisePriorityList;
public class ItemViewCell extends AEBaseItem implements ICellWorkbenchItem {
public class ViewCellItem extends AEBaseItem implements ICellWorkbenchItem {
public ItemViewCell(Properties properties) {
public ViewCellItem(Properties properties) {
super(properties);
}
@@ -54,7 +54,7 @@ public class ItemViewCell extends AEBaseItem implements ICellWorkbenchItem {
continue;
}
if ((currentViewCell.getItem() instanceof ItemViewCell)) {
if ((currentViewCell.getItem() instanceof ViewCellItem)) {
final IItemList<IAEItemStack> priorityList = AEApi.instance().storage()
.getStorageChannel(IItemStorageChannel.class).createList();
src/main/java/appeng/items/tools/ToolBiometricCard.java → src/main/java/appeng/items/tools/BiometricCardItem.java
+2 -2
View File
@@ -44,8 +44,8 @@ import appeng.api.networking.security.ISecurityRegistry;
import appeng.core.localization.GuiText;
import appeng.items.AEBaseItem;
public class ToolBiometricCard extends AEBaseItem implements IBiometricCard {
public ToolBiometricCard(Properties properties) {
public class BiometricCardItem extends AEBaseItem implements IBiometricCard {
public BiometricCardItem(Properties properties) {
super(properties);
}
src/main/java/appeng/items/tools/ToolMemoryCard.java → src/main/java/appeng/items/tools/MemoryCardItem.java
+2 -2
View File
@@ -46,13 +46,13 @@ import appeng.core.localization.PlayerMessages;
import appeng.items.AEBaseItem;
import appeng.util.Platform;
public class ToolMemoryCard extends AEBaseItem implements IMemoryCard {
public class MemoryCardItem extends AEBaseItem implements IMemoryCard {
private static final AEColor[] DEFAULT_COLOR_CODE = new AEColor[] { AEColor.TRANSPARENT, AEColor.TRANSPARENT,
AEColor.TRANSPARENT, AEColor.TRANSPARENT, AEColor.TRANSPARENT, AEColor.TRANSPARENT, AEColor.TRANSPARENT,
AEColor.TRANSPARENT, };
public ToolMemoryCard(Properties properties) {
public MemoryCardItem(Properties properties) {
super(properties);
}
src/main/java/appeng/items/tools/ToolNetworkTool.java → src/main/java/appeng/items/tools/NetworkToolItem.java
+9 -9
View File
@@ -46,18 +46,18 @@ import appeng.api.util.INetworkToolAgent;
import appeng.container.AEBaseContainer;
import appeng.container.ContainerLocator;
import appeng.container.ContainerOpener;
import appeng.container.implementations.ContainerNetworkStatus;
import appeng.container.implementations.ContainerNetworkTool;
import appeng.container.implementations.NetworkStatusContainer;
import appeng.container.implementations.NetworkToolContainer;
import appeng.core.AppEng;
import appeng.core.sync.network.NetworkHandler;
import appeng.core.sync.packets.PacketClick;
import appeng.core.sync.packets.ClickPacket;
import appeng.items.AEBaseItem;
import appeng.items.contents.NetworkToolViewer;
import appeng.util.Platform;
public class ToolNetworkTool extends AEBaseItem implements IGuiItem, IAEWrench {
public class NetworkToolItem extends AEBaseItem implements IGuiItem, IAEWrench {
public ToolNetworkTool(Properties properties) {
public NetworkToolItem(Properties properties) {
super(properties);
}
@@ -77,7 +77,7 @@ public class ToolNetworkTool extends AEBaseItem implements IGuiItem, IAEWrench {
final RayTraceResult mop = AppEng.proxy.getRTR();
if (mop == null || mop.getType() == RayTraceResult.Type.MISS) {
NetworkHandler.instance().sendToServer(new PacketClick(hand));
NetworkHandler.instance().sendToServer(new ClickPacket(hand));
}
}
@@ -105,7 +105,7 @@ public class ToolNetworkTool extends AEBaseItem implements IGuiItem, IAEWrench {
}
if (Platform.isClient()) {
NetworkHandler.instance().sendToServer(new PacketClick(context));
NetworkHandler.instance().sendToServer(new ClickPacket(context));
}
return ActionResultType.SUCCESS;
@@ -147,10 +147,10 @@ public class ToolNetworkTool extends AEBaseItem implements IGuiItem, IAEWrench {
final TileEntity te = w.getTileEntity(pos);
if (te instanceof IGridHost) {
ContainerOpener.openContainer(ContainerNetworkStatus.TYPE, p,
ContainerOpener.openContainer(NetworkStatusContainer.TYPE, p,
ContainerLocator.forItemUseContext(useContext));
} else {
ContainerOpener.openContainer(ContainerNetworkTool.TYPE, p, ContainerLocator.forHand(p, hand));
ContainerOpener.openContainer(NetworkToolContainer.TYPE, p, ContainerLocator.forHand(p, hand));
}
return true;
src/main/java/appeng/items/tools/powered/ToolChargedStaff.java → src/main/java/appeng/items/tools/powered/ChargedStaffItem.java
+4 -4
View File
@@ -27,13 +27,13 @@ import net.minecraft.util.math.AxisAlignedBB;
import appeng.api.config.Actionable;
import appeng.core.AEConfig;
import appeng.core.AppEng;
import appeng.core.sync.packets.PacketLightning;
import appeng.core.sync.packets.LightningPacket;
import appeng.items.tools.powered.powersink.AEBasePoweredItem;
import appeng.util.Platform;
public class ToolChargedStaff extends AEBasePoweredItem {
public class ChargedStaffItem extends AEBasePoweredItem {
public ToolChargedStaff(Item.Properties props) {
public ChargedStaffItem(Item.Properties props) {
super(AEConfig.instance().getChargedStaffBattery(), props);
}
@@ -48,7 +48,7 @@ public class ToolChargedStaff extends AEBasePoweredItem {
final float dy = (float) (Platform.getRandomFloat() * target.getHeight() + entityBoundingBox.minY);
final float dz = (float) (Platform.getRandomFloat() * target.getWidth() + entityBoundingBox.minZ);
AppEng.proxy.sendToAllNearExcept(null, dx, dy, dz, 32.0, target.world,
new PacketLightning(dx, dy, dz));
new LightningPacket(dx, dy, dz));
}
}
target.attackEntityFrom(DamageSource.MAGIC, 6);
src/main/java/appeng/items/tools/powered/ToolColorApplicator.java → src/main/java/appeng/items/tools/powered/ColorApplicatorItem.java
+13 -13
View File
@@ -63,8 +63,8 @@ import appeng.api.storage.data.IAEItemStack;
import appeng.api.storage.data.IItemList;
import appeng.api.util.AEColor;
import appeng.api.util.DimensionalCoord;
import appeng.block.networking.BlockCableBus;
import appeng.block.paint.BlockPaint;
import appeng.block.networking.CableBusBlock;
import appeng.block.paint.PaintSplotchesBlock;
import appeng.core.AEConfig;
import appeng.core.AppEng;
import appeng.core.localization.GuiText;
@@ -72,14 +72,14 @@ import appeng.helpers.IMouseWheelItem;
import appeng.hooks.IBlockTool;
import appeng.items.contents.CellConfig;
import appeng.items.contents.CellUpgrades;
import appeng.items.misc.ItemPaintBall;
import appeng.items.misc.PaintBallItem;
import appeng.items.tools.powered.powersink.AEBasePoweredItem;
import appeng.me.helpers.BaseActionSource;
import appeng.tile.misc.TilePaint;
import appeng.tile.misc.PaintSplotchesTileEntity;
import appeng.util.Platform;
import appeng.util.item.AEItemStack;
public class ToolColorApplicator extends AEBasePoweredItem
public class ColorApplicatorItem extends AEBasePoweredItem
implements IStorageCell<IAEItemStack>, IItemGroup, IBlockTool, IMouseWheelItem {
private static final Map<ResourceLocation, AEColor> TAG_TO_COLOR = ImmutableMap.<ResourceLocation, AEColor>builder()
@@ -102,7 +102,7 @@ public class ToolColorApplicator extends AEBasePoweredItem
private static final String TAG_COLOR = "color";
public ToolColorApplicator(Item.Properties props) {
public ColorApplicatorItem(Item.Properties props) {
super(AEConfig.instance().getColorApplicatorBattery(), props);
addPropertyOverride(new ResourceLocation(AppEng.MOD_ID, "colored"), (itemStack, world, entity) -> {
// If the stack has no color, don't use the colored model since the impact of
@@ -165,11 +165,11 @@ public class ToolColorApplicator extends AEBasePoweredItem
// clean paint balls..
final Block testBlk = w.getBlockState(pos.offset(side)).getBlock();
final TileEntity painted = w.getTileEntity(pos.offset(side));
if (this.getAECurrentPower(is) > powerPerUse && testBlk instanceof BlockPaint
&& painted instanceof TilePaint) {
if (this.getAECurrentPower(is) > powerPerUse && testBlk instanceof PaintSplotchesBlock
&& painted instanceof PaintSplotchesTileEntity) {
inv.extractItems(AEItemStack.fromItemStack(paintBall), Actionable.MODULATE, new BaseActionSource());
this.extractAEPower(is, powerPerUse, Actionable.MODULATE);
((TilePaint) painted).cleanSide(side.getOpposite());
((PaintSplotchesTileEntity) painted).cleanSide(side.getOpposite());
return ActionResultType.SUCCESS;
}
} else if (!paintBall.isEmpty()) {
@@ -219,8 +219,8 @@ public class ToolColorApplicator extends AEBasePoweredItem
return AEColor.TRANSPARENT;
}
if (paintBall.getItem() instanceof ItemPaintBall) {
final ItemPaintBall ipb = (ItemPaintBall) paintBall.getItem();
if (paintBall.getItem() instanceof PaintBallItem) {
final PaintBallItem ipb = (PaintBallItem) paintBall.getItem();
return ipb.getColor();
} else {
for (Map.Entry<ResourceLocation, AEColor> entry : TAG_TO_COLOR.entrySet()) {
@@ -331,8 +331,8 @@ public class ToolColorApplicator extends AEBasePoweredItem
return w.setBlockState(pos, newState);
}
if (blk instanceof BlockCableBus && p != null) {
return ((BlockCableBus) blk).recolorBlock(w, pos, side, newColor.dye, p);
if (blk instanceof CableBusBlock && p != null) {
return ((CableBusBlock) blk).recolorBlock(w, pos, side, newColor.dye, p);
}
return blk.recolorBlock(state, w, pos, side, newColor.dye);
src/main/java/appeng/items/tools/powered/ToolColorApplicatorRendering.java → src/main/java/appeng/items/tools/powered/ColorApplicatorItemRendering.java
+2 -5
View File
@@ -1,17 +1,14 @@
package appeng.items.tools.powered;
import net.minecraft.client.renderer.model.ModelResourceLocation;
import net.minecraft.item.ItemStack;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
import appeng.api.util.AEColor;
import appeng.bootstrap.IItemRendering;
import appeng.bootstrap.ItemRenderingCustomizer;
import appeng.core.AppEng;
public class ToolColorApplicatorRendering extends ItemRenderingCustomizer {
public class ColorApplicatorItemRendering extends ItemRenderingCustomizer {
@Override
@OnlyIn(Dist.CLIENT)
@@ -24,7 +21,7 @@ public class ToolColorApplicatorRendering extends ItemRenderingCustomizer {
return -1;
}
final AEColor col = ((ToolColorApplicator) itemStack.getItem()).getActiveColor(itemStack);
final AEColor col = ((ColorApplicatorItem) itemStack.getItem()).getActiveColor(itemStack);
if (col == null) {
return -1;
src/main/java/appeng/items/tools/powered/ToolEntropyManipulator.java → src/main/java/appeng/items/tools/powered/EntropyManipulatorItem.java
+5 -5
View File
@@ -45,7 +45,7 @@ import net.minecraft.world.server.ServerWorld;
import appeng.api.config.Actionable;
import appeng.api.util.DimensionalCoord;
import appeng.block.misc.BlockTinyTNT;
import appeng.block.misc.TinyTNTBlock;
import appeng.container.ContainerNull;
import appeng.core.AEConfig;
import appeng.hooks.IBlockTool;
@@ -53,11 +53,11 @@ import appeng.items.tools.powered.powersink.AEBasePoweredItem;
import appeng.util.InWorldToolOperationResult;
import appeng.util.Platform;
public class ToolEntropyManipulator extends AEBasePoweredItem implements IBlockTool {
public class EntropyManipulatorItem extends AEBasePoweredItem implements IBlockTool {
private final Map<InWorldToolOperationIngredient, InWorldToolOperationResult> heatUp;
private final Map<InWorldToolOperationIngredient, InWorldToolOperationResult> coolDown;
public ToolEntropyManipulator(Item.Properties props) {
public EntropyManipulatorItem(Item.Properties props) {
super(AEConfig.instance().getEntropyManipulatorBattery(), props);
this.heatUp = new HashMap<>();
@@ -261,9 +261,9 @@ public class ToolEntropyManipulator extends AEBasePoweredItem implements IBlockT
return ActionResultType.SUCCESS;
}
if (block instanceof BlockTinyTNT) {
if (block instanceof TinyTNTBlock) {
w.removeBlock(pos, false);
((BlockTinyTNT) block).startFuse(w, pos, p);
((TinyTNTBlock) block).startFuse(w, pos, p);
return ActionResultType.SUCCESS;
}
src/main/java/appeng/items/tools/powered/ToolMatterCannon.java → src/main/java/appeng/items/tools/powered/MatterCannonItem.java
+13 -13
View File
@@ -69,26 +69,26 @@ import appeng.core.AELog;
import appeng.core.AppEng;
import appeng.core.localization.PlayerMessages;
import appeng.core.sync.network.NetworkHandler;
import appeng.core.sync.packets.PacketMatterCannon;
import appeng.core.sync.packets.MatterCannonPacket;
import appeng.hooks.TickHandler;
import appeng.hooks.TickHandler.PlayerColor;
import appeng.items.contents.CellConfig;
import appeng.items.contents.CellUpgrades;
import appeng.items.misc.ItemPaintBall;
import appeng.items.misc.PaintBallItem;
import appeng.items.tools.powered.powersink.AEBasePoweredItem;
import appeng.me.helpers.PlayerSource;
import appeng.tile.misc.TilePaint;
import appeng.tile.misc.PaintSplotchesTileEntity;
import appeng.util.LookDirection;
import appeng.util.Platform;
public class ToolMatterCannon extends AEBasePoweredItem implements IStorageCell<IAEItemStack> {
public class MatterCannonItem extends AEBasePoweredItem implements IStorageCell<IAEItemStack> {
/**
* AE energy units consumer per shot fired.
*/
private static final int ENERGY_PER_SHOT = 1600;
public ToolMatterCannon(Item.Properties props) {
public MatterCannonItem(Item.Properties props) {
super(AEConfig.instance().getMatterCannonBattery(), props);
}
@@ -155,7 +155,7 @@ public class ToolMatterCannon extends AEBasePoweredItem implements IStorageCell<
final float penetration = AEApi.instance().registries().matterCannon().getPenetration(ammo); // 196.96655f;
if (penetration <= 0) {
final ItemStack type = aeAmmo.asItemStackRepresentation();
if (type.getItem() instanceof ItemPaintBall) {
if (type.getItem() instanceof PaintBallItem) {
this.shootPaintBalls(type, w, p, rayFrom, rayTo, direction, d0, d1, d2);
}
return new ActionResult<>(ActionResultType.SUCCESS, p.getHeldItem(hand));
@@ -227,15 +227,15 @@ public class ToolMatterCannon extends AEBasePoweredItem implements IStorageCell<
try {
AppEng.proxy.sendToAllNearExcept(null, d0, d1, d2, 128, w,
new PacketMatterCannon(d0, d1, d2, (float) direction.x, (float) direction.y, (float) direction.z,
new MatterCannonPacket(d0, d1, d2, (float) direction.x, (float) direction.y, (float) direction.z,
(byte) (pos.getType() == RayTraceResult.Type.MISS ? 32
: pos.getHitVec().squareDistanceTo(vec) + 1)));
} catch (final Exception err) {
AELog.debug(err);
}
if (pos.getType() != RayTraceResult.Type.MISS && type != null && type.getItem() instanceof ItemPaintBall) {
final ItemPaintBall ipb = (ItemPaintBall) type.getItem();
if (pos.getType() != RayTraceResult.Type.MISS && type != null && type.getItem() instanceof PaintBallItem) {
final PaintBallItem ipb = (PaintBallItem) type.getItem();
final AEColor col = ipb.getColor();
// boolean lit = ipb.isLumen( type );
@@ -272,9 +272,9 @@ public class ToolMatterCannon extends AEBasePoweredItem implements IStorageCell<
}
final TileEntity te = w.getTileEntity(hitPos);
if (te instanceof TilePaint) {
if (te instanceof PaintSplotchesTileEntity) {
final Vec3d hp = pos.getHitVec().subtract(hitPos.getX(), hitPos.getY(), hitPos.getZ());
((TilePaint) te).addBlot(type, side.getOpposite(), hp);
((PaintSplotchesTileEntity) te).addBlot(type, side.getOpposite(), hp);
}
}
}
@@ -336,7 +336,7 @@ public class ToolMatterCannon extends AEBasePoweredItem implements IStorageCell<
try {
AppEng.proxy.sendToAllNearExcept(null, d0, d1, d2, 128, w,
new PacketMatterCannon(d0, d1, d2, (float) direction.x, (float) direction.y,
new MatterCannonPacket(d0, d1, d2, (float) direction.x, (float) direction.y,
(float) direction.z, (byte) (pos.getType() == RayTraceResult.Type.MISS ? 32
: pos.getHitVec().squareDistanceTo(vec) + 1)));
} catch (final Exception err) {
@@ -445,7 +445,7 @@ public class ToolMatterCannon extends AEBasePoweredItem implements IStorageCell<
return false;
}
if (requestedAddition.getItem() instanceof ItemPaintBall) {
if (requestedAddition.getItem() instanceof PaintBallItem) {
return false;
}
src/main/java/appeng/items/tools/powered/ToolPortableCell.java → src/main/java/appeng/items/tools/powered/PortableCellItem.java
+4 -4
View File
@@ -47,7 +47,7 @@ import appeng.api.storage.channels.IItemStorageChannel;
import appeng.api.storage.data.IAEItemStack;
import appeng.container.ContainerLocator;
import appeng.container.ContainerOpener;
import appeng.container.implementations.ContainerMEPortableCell;
import appeng.container.implementations.MEPortableCellContainer;
import appeng.core.AEConfig;
import appeng.core.localization.GuiText;
import appeng.items.contents.CellConfig;
@@ -55,14 +55,14 @@ import appeng.items.contents.CellUpgrades;
import appeng.items.contents.PortableCellViewer;
import appeng.items.tools.powered.powersink.AEBasePoweredItem;
public class ToolPortableCell extends AEBasePoweredItem implements IStorageCell<IAEItemStack>, IGuiItem, IItemGroup {
public ToolPortableCell(Item.Properties props) {
public class PortableCellItem extends AEBasePoweredItem implements IStorageCell<IAEItemStack>, IGuiItem, IItemGroup {
public PortableCellItem(Item.Properties props) {
super(AEConfig.instance().getPortableCellBattery(), props);
}
@Override
public ActionResult<ItemStack> onItemRightClick(final World w, final PlayerEntity player, final Hand hand) {
ContainerOpener.openContainer(ContainerMEPortableCell.TYPE, player, ContainerLocator.forHand(player, hand));
ContainerOpener.openContainer(MEPortableCellContainer.TYPE, player, ContainerLocator.forHand(player, hand));
return new ActionResult<>(ActionResultType.SUCCESS, player.getHeldItem(hand));
}
src/main/java/appeng/items/tools/powered/ToolWirelessTerminal.java → src/main/java/appeng/items/tools/powered/WirelessTerminalItem.java
+2 -2
View File
@@ -47,9 +47,9 @@ import appeng.core.localization.GuiText;
import appeng.items.tools.powered.powersink.AEBasePoweredItem;
import appeng.util.ConfigManager;
public class ToolWirelessTerminal extends AEBasePoweredItem implements IWirelessTermHandler {
public class WirelessTerminalItem extends AEBasePoweredItem implements IWirelessTermHandler {
public ToolWirelessTerminal(Item.Properties props) {
public WirelessTerminalItem(Item.Properties props) {
super(AEConfig.instance().getWirelessTerminalBattery(), props);
}
src/main/java/appeng/items/tools/quartz/ToolQuartzAxe.java → src/main/java/appeng/items/tools/quartz/QuartzAxeItem.java
+2 -2
View File
@@ -26,10 +26,10 @@ import net.minecraft.item.ItemTier;
import appeng.api.features.AEFeature;
import appeng.util.Platform;
public class ToolQuartzAxe extends AxeItem {
public class QuartzAxeItem extends AxeItem {
private final AEFeature type;
public ToolQuartzAxe(Item.Properties props, final AEFeature type) {
public QuartzAxeItem(Item.Properties props, final AEFeature type) {
super(ItemTier.IRON, 6.0F, -3.1F, props);
this.type = type;
}
src/main/java/appeng/items/tools/quartz/ToolQuartzCuttingKnife.java → src/main/java/appeng/items/tools/quartz/QuartzCuttingKnifeItem.java
+5 -5
View File
@@ -33,15 +33,15 @@ import appeng.api.implementations.guiobjects.IGuiItem;
import appeng.api.implementations.guiobjects.IGuiItemObject;
import appeng.container.ContainerLocator;
import appeng.container.ContainerOpener;
import appeng.container.implementations.ContainerQuartzKnife;
import appeng.container.implementations.QuartzKnifeContainer;
import appeng.items.AEBaseItem;
import appeng.items.contents.QuartzKnifeObj;
import appeng.util.Platform;
public class ToolQuartzCuttingKnife extends AEBaseItem implements IGuiItem {
public class QuartzCuttingKnifeItem extends AEBaseItem implements IGuiItem {
private final AEFeature type;
public ToolQuartzCuttingKnife(Item.Properties props, final AEFeature type) {
public QuartzCuttingKnifeItem(Item.Properties props, final AEFeature type) {
super(props);
this.type = type;
}
@@ -50,7 +50,7 @@ public class ToolQuartzCuttingKnife extends AEBaseItem implements IGuiItem {
public ActionResultType onItemUse(ItemUseContext context) {
PlayerEntity player = context.getPlayer();
if (Platform.isServer() && player != null) {
ContainerOpener.openContainer(ContainerQuartzKnife.TYPE, context.getPlayer(),
ContainerOpener.openContainer(QuartzKnifeContainer.TYPE, context.getPlayer(),
ContainerLocator.forItemUseContext(context));
}
return ActionResultType.SUCCESS;
@@ -59,7 +59,7 @@ public class ToolQuartzCuttingKnife extends AEBaseItem implements IGuiItem {
@Override
public ActionResult<ItemStack> onItemRightClick(final World w, final PlayerEntity p, final Hand hand) {
if (Platform.isServer()) {
ContainerOpener.openContainer(ContainerQuartzKnife.TYPE, p, ContainerLocator.forHand(p, hand));
ContainerOpener.openContainer(QuartzKnifeContainer.TYPE, p, ContainerLocator.forHand(p, hand));
}
p.swingArm(hand);
return new ActionResult<>(ActionResultType.SUCCESS, p.getHeldItem(hand));
src/main/java/appeng/items/tools/quartz/ToolQuartzHoe.java → src/main/java/appeng/items/tools/quartz/QuartzHoeItem.java
+2 -2
View File
@@ -26,10 +26,10 @@ import net.minecraft.item.ItemTier;
import appeng.api.features.AEFeature;
import appeng.util.Platform;
public class ToolQuartzHoe extends HoeItem {
public class QuartzHoeItem extends HoeItem {
private final AEFeature type;
public ToolQuartzHoe(Item.Properties props, final AEFeature type) {
public QuartzHoeItem(Item.Properties props, final AEFeature type) {
super(ItemTier.IRON, -1.0F, props);
this.type = type;
}
src/main/java/appeng/items/tools/quartz/ToolQuartzPickaxe.java → src/main/java/appeng/items/tools/quartz/QuartzPickaxeItem.java
+2 -2
View File
@@ -26,10 +26,10 @@ import net.minecraft.item.PickaxeItem;
import appeng.api.features.AEFeature;
import appeng.util.Platform;
public class ToolQuartzPickaxe extends PickaxeItem {
public class QuartzPickaxeItem extends PickaxeItem {
private final AEFeature type;
public ToolQuartzPickaxe(Item.Properties props, final AEFeature type) {
public QuartzPickaxeItem(Item.Properties props, final AEFeature type) {
super(ItemTier.IRON, 1, -2.8F, props);
this.type = type;
}
src/main/java/appeng/items/tools/quartz/ToolQuartzSpade.java → src/main/java/appeng/items/tools/quartz/QuartzSpadeItem.java
+2 -2
View File
@@ -26,10 +26,10 @@ import net.minecraft.item.ShovelItem;
import appeng.api.features.AEFeature;
import appeng.util.Platform;
public class ToolQuartzSpade extends ShovelItem {
public class QuartzSpadeItem extends ShovelItem {
private final AEFeature type;
public ToolQuartzSpade(Item.Properties props, final AEFeature type) {
public QuartzSpadeItem(Item.Properties props, final AEFeature type) {
super(ItemTier.IRON, 1.5F, -3.0F, props);
this.type = type;
}
src/main/java/appeng/items/tools/quartz/ToolQuartzSword.java → src/main/java/appeng/items/tools/quartz/QuartzSwordItem.java
+2 -2
View File
@@ -26,10 +26,10 @@ import net.minecraft.item.SwordItem;
import appeng.api.features.AEFeature;
import appeng.util.Platform;
public class ToolQuartzSword extends SwordItem {
public class QuartzSwordItem extends SwordItem {
private final AEFeature type;
public ToolQuartzSword(Item.Properties props, AEFeature type) {
public QuartzSwordItem(Item.Properties props, AEFeature type) {
super(ItemTier.IRON, 3, -2.4F, props);
this.type = type;
}
src/main/java/appeng/items/tools/quartz/ToolQuartzWrench.java → src/main/java/appeng/items/tools/quartz/QuartzWrenchItem.java
+2 -2
View File
@@ -32,9 +32,9 @@ import appeng.block.AEBaseBlock;
import appeng.items.AEBaseItem;
import appeng.util.Platform;
public class ToolQuartzWrench extends AEBaseItem implements IAEWrench {
public class QuartzWrenchItem extends AEBaseItem implements IAEWrench {
public ToolQuartzWrench(Item.Properties props) {
public QuartzWrenchItem(Item.Properties props) {
super(props);
}