Skip to content

Commit ec050ae

Browse files
committed
rename appliedenergistics -> ae2
1 parent bc3c06d commit ec050ae

File tree

11 files changed

+20
-25
lines changed

11 files changed

+20
-25
lines changed

src/main/java/de/srendi/advancedperipherals/AdvancedPeripherals.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
import dan200.computercraft.api.peripheral.PeripheralCapability;
55
import dan200.computercraft.shared.media.MountMedia;
66
import de.srendi.advancedperipherals.common.addons.APAddon;
7+
import de.srendi.advancedperipherals.common.addons.ae2.AEApi;
78
import de.srendi.advancedperipherals.common.addons.ae2.AE2Registries;
8-
import de.srendi.advancedperipherals.common.addons.appliedenergistics.AEApi;
99
import de.srendi.advancedperipherals.common.addons.computercraft.integrations.IntegrationPeripheralProvider;
1010
import de.srendi.advancedperipherals.common.addons.refinedstorage.RSApi;
1111
import de.srendi.advancedperipherals.common.blocks.base.ICapabilityProvider;

src/main/java/de/srendi/advancedperipherals/common/addons/appliedenergistics/AEApi.java renamed to src/main/java/de/srendi/advancedperipherals/common/addons/ae2/AEApi.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package de.srendi.advancedperipherals.common.addons.appliedenergistics;
1+
package de.srendi.advancedperipherals.common.addons.ae2;
22

33
import appeng.api.AECapabilities;
44
import appeng.api.crafting.IPatternDetails;

src/main/java/de/srendi/advancedperipherals/common/addons/appliedenergistics/AECraftJob.java renamed to src/main/java/de/srendi/advancedperipherals/common/addons/ae2/AECraftJob.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package de.srendi.advancedperipherals.common.addons.appliedenergistics;
1+
package de.srendi.advancedperipherals.common.addons.ae2;
22

33
import appeng.api.networking.IGrid;
44
import appeng.api.networking.IGridNode;

src/main/java/de/srendi/advancedperipherals/common/addons/appliedenergistics/AEMekanismApi.java renamed to src/main/java/de/srendi/advancedperipherals/common/addons/ae2/AEMekanismApi.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package de.srendi.advancedperipherals.common.addons.appliedenergistics;
1+
package de.srendi.advancedperipherals.common.addons.ae2;
22

33
import appeng.api.networking.crafting.ICraftingService;
44
import appeng.api.stacks.AEKey;

src/main/java/de/srendi/advancedperipherals/common/addons/appliedenergistics/MEBridgeEntityListener.java renamed to src/main/java/de/srendi/advancedperipherals/common/addons/ae2/MEBridgeEntityListener.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package de.srendi.advancedperipherals.common.addons.appliedenergistics;
1+
package de.srendi.advancedperipherals.common.addons.ae2;
22

33
import appeng.api.networking.IGridNode;
44
import appeng.api.networking.IGridNodeListener;

src/main/java/de/srendi/advancedperipherals/common/addons/appliedenergistics/MEChemicalHandler.java renamed to src/main/java/de/srendi/advancedperipherals/common/addons/ae2/MEChemicalHandler.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package de.srendi.advancedperipherals.common.addons.appliedenergistics;
1+
package de.srendi.advancedperipherals.common.addons.ae2;
22

33
import appeng.api.config.Actionable;
44
import appeng.api.networking.security.IActionSource;

src/main/java/de/srendi/advancedperipherals/common/addons/appliedenergistics/MEFluidHandler.java renamed to src/main/java/de/srendi/advancedperipherals/common/addons/ae2/MEFluidHandler.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package de.srendi.advancedperipherals.common.addons.appliedenergistics;
1+
package de.srendi.advancedperipherals.common.addons.ae2;
22

33
import appeng.api.config.Actionable;
44
import appeng.api.networking.security.IActionSource;

src/main/java/de/srendi/advancedperipherals/common/addons/appliedenergistics/MEItemHandler.java renamed to src/main/java/de/srendi/advancedperipherals/common/addons/ae2/MEItemHandler.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package de.srendi.advancedperipherals.common.addons.appliedenergistics;
1+
package de.srendi.advancedperipherals.common.addons.ae2;
22

33
import appeng.api.config.Actionable;
44
import appeng.api.networking.security.IActionSource;

src/main/java/de/srendi/advancedperipherals/common/addons/computercraft/peripheral/EnvironmentDetectorPeripheral.java

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -85,13 +85,13 @@ public final String getBiome() {
8585
}
8686

8787
@LuaFunction(mainThread = true)
88-
public final int getSkyLightLevel() {
89-
return getLevel().getBrightness(LightLayer.SKY, this.getPhysicsBlockPos().offset(0, 1, 0));
88+
public final int getBlockLightLevel() {
89+
return getLevel().getBrightness(LightLayer.BLOCK, this.getPhysicsBlockPos().offset(0, 1, 0));
9090
}
9191

9292
@LuaFunction(mainThread = true)
93-
public final int getBlockLightLevel() {
94-
return getLevel().getBrightness(LightLayer.BLOCK, this.getPhysicsBlockPos().offset(0, 1, 0));
93+
public final int getSkyLightLevel() {
94+
return getLevel().getBrightness(LightLayer.SKY, this.getPhysicsBlockPos().offset(0, 1, 0));
9595
}
9696

9797
@LuaFunction(mainThread = true)
@@ -124,11 +124,6 @@ public final String getDimension() {
124124
return getLevel().dimension().location().toString();
125125
}
126126

127-
@LuaFunction(mainThread = true)
128-
public final boolean isDimension(String dimension) {
129-
return getLevel().dimension().location().toString().equals(dimension);
130-
}
131-
132127
@LuaFunction(mainThread = true)
133128
public final List<String> listDimensions() {
134129
return getLevel().getServer().levelKeys().stream().map(ResourceKey::location).map(ResourceLocation::toString).toList();

src/main/java/de/srendi/advancedperipherals/common/addons/computercraft/peripheral/MEBridgePeripheral.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@
1414
import dan200.computercraft.api.lua.MethodResult;
1515
import dan200.computercraft.api.peripheral.IComputerAccess;
1616
import de.srendi.advancedperipherals.common.addons.APAddon;
17-
import de.srendi.advancedperipherals.common.addons.appliedenergistics.AEApi;
18-
import de.srendi.advancedperipherals.common.addons.appliedenergistics.AECraftJob;
19-
import de.srendi.advancedperipherals.common.addons.appliedenergistics.AEMekanismApi;
20-
import de.srendi.advancedperipherals.common.addons.appliedenergistics.MEChemicalHandler;
21-
import de.srendi.advancedperipherals.common.addons.appliedenergistics.MEFluidHandler;
22-
import de.srendi.advancedperipherals.common.addons.appliedenergistics.MEItemHandler;
17+
import de.srendi.advancedperipherals.common.addons.ae2.AEApi;
18+
import de.srendi.advancedperipherals.common.addons.ae2.AECraftJob;
19+
import de.srendi.advancedperipherals.common.addons.ae2.AEMekanismApi;
20+
import de.srendi.advancedperipherals.common.addons.ae2.MEChemicalHandler;
21+
import de.srendi.advancedperipherals.common.addons.ae2.MEFluidHandler;
22+
import de.srendi.advancedperipherals.common.addons.ae2.MEItemHandler;
2323
import de.srendi.advancedperipherals.common.addons.computercraft.owner.BlockEntityPeripheralOwner;
2424
import de.srendi.advancedperipherals.common.blocks.blockentities.MEBridgeEntity;
2525
import de.srendi.advancedperipherals.common.configuration.APConfig;

0 commit comments

Comments
 (0)