Skip to content

Commit 7e19e36

Browse files
MartinSVK12MartinSVK12
committed
Removed the old energy API.
1 parent 68ff00f commit 7e19e36

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+73
-941
lines changed

‎all/gradle.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
mod_group=sunsetsatellite
22
mod_name=catalyst-all
3-
mod_version=1.12.2
3+
mod_version=1.13.0

‎energy/gradle.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
org.gradle.jvmargs=-Xmx2G
22

33
# Mod
4-
mod_version=1.1.0
4+
mod_version=2.0.0
55
mod_group=sunsetsatellite
66
mod_name=catalyst-energy

‎energy/src/main/java/sunsetsatellite/catalyst/CatalystEnergy.java

+15-6
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,15 @@
77
import org.slf4j.LoggerFactory;
88
import sunsetsatellite.catalyst.core.util.tile.TEFeature;
99
import sunsetsatellite.catalyst.core.util.tile.feature.ItemContainerFeature;
10-
import sunsetsatellite.catalyst.energy.improved.simple.test.tile.TileEntityBatteryBox;
11-
import sunsetsatellite.catalyst.energy.improved.simple.test.tile.TileEntitySimpleGenerator;
12-
import sunsetsatellite.catalyst.energy.improved.simple.test.tile.TileEntitySimpleMachine;
13-
import sunsetsatellite.catalyst.energy.improved.simple.test.tile.TileEntityWire;
10+
import sunsetsatellite.catalyst.energy.simple.test.block.BlockBatteryBox;
11+
import sunsetsatellite.catalyst.energy.simple.test.block.BlockSimpleGenerator;
12+
import sunsetsatellite.catalyst.energy.simple.test.block.BlockSimpleMachine;
13+
import sunsetsatellite.catalyst.energy.simple.test.block.BlockWire;
14+
import sunsetsatellite.catalyst.energy.simple.test.tile.TileEntityBatteryBox;
15+
import sunsetsatellite.catalyst.energy.simple.test.tile.TileEntitySimpleGenerator;
16+
import sunsetsatellite.catalyst.energy.simple.test.tile.TileEntitySimpleMachine;
17+
import sunsetsatellite.catalyst.energy.simple.test.tile.TileEntityWire;
18+
import turniplabs.halplibe.helper.BlockBuilder;
1419
import turniplabs.halplibe.helper.EntityHelper;
1520
import turniplabs.halplibe.util.GameStartEntrypoint;
1621
import turniplabs.halplibe.util.TomlConfigHandler;
@@ -27,20 +32,24 @@ public class CatalystEnergy implements ModInitializer, GameStartEntrypoint {
2732

2833
public static final String ITEM_CONTAINER_FEATURE = "catalyst-energy:feature/item_container";
2934

30-
/*public static final BlockWire wire = new BlockBuilder(MOD_ID)
35+
public static final BlockWire wire = new BlockBuilder(MOD_ID)
3136
.setTextures("catalyst-energy:block/wire")
37+
.addTags(ENERGY_CONDUITS_CONNECT)
3238
.build(new BlockWire("wire",1550));
3339
public static final BlockBatteryBox box = new BlockBuilder(MOD_ID)
3440
.setTextures("catalyst-energy:block/battery_box")
41+
.addTags(ENERGY_CONDUITS_CONNECT)
3542
.build(new BlockBatteryBox("box",1551));
3643
public static final BlockSimpleGenerator generator = new BlockBuilder(MOD_ID)
3744
.setTextures("catalyst-energy:block/machine_side")
3845
.setSouthTexture("catalyst-energy:block/generator")
46+
.addTags(ENERGY_CONDUITS_CONNECT)
3947
.build(new BlockSimpleGenerator("generator",1552));
4048
public static final BlockSimpleMachine machine = new BlockBuilder(MOD_ID)
4149
.setTextures("catalyst-energy:block/machine_side")
4250
.setSouthTexture("catalyst-energy:block/machine")
43-
.build(new BlockSimpleMachine("machine",1553));*/
51+
.addTags(ENERGY_CONDUITS_CONNECT)
52+
.build(new BlockSimpleMachine("machine",1553));
4453

4554
static {
4655
Toml configToml = new Toml("Catalyst: Energy configuration file.");

‎energy/src/main/java/sunsetsatellite/catalyst/energy/api/IEnergy.java

-22
This file was deleted.

‎energy/src/main/java/sunsetsatellite/catalyst/energy/api/IEnergyConnection.java

-8
This file was deleted.

‎energy/src/main/java/sunsetsatellite/catalyst/energy/api/IEnergyItem.java

-17
This file was deleted.

‎energy/src/main/java/sunsetsatellite/catalyst/energy/api/IEnergySink.java

-13
This file was deleted.

‎energy/src/main/java/sunsetsatellite/catalyst/energy/api/IEnergySource.java

-13
This file was deleted.

‎energy/src/main/java/sunsetsatellite/catalyst/energy/api/LookupFuelEnergy.java

-74
This file was deleted.

‎energy/src/main/java/sunsetsatellite/catalyst/energy/api/package-info.java

-5
This file was deleted.

‎energy/src/main/java/sunsetsatellite/catalyst/energy/improved/electric/api/IElectric.java ‎energy/src/main/java/sunsetsatellite/catalyst/energy/electric/api/IElectric.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package sunsetsatellite.catalyst.energy.improved.electric.api;
1+
package sunsetsatellite.catalyst.energy.electric.api;
22

33
import org.jetbrains.annotations.NotNull;
44
import sunsetsatellite.catalyst.core.util.Direction;

‎energy/src/main/java/sunsetsatellite/catalyst/energy/improved/electric/api/IElectricItem.java ‎energy/src/main/java/sunsetsatellite/catalyst/energy/electric/api/IElectricItem.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package sunsetsatellite.catalyst.energy.improved.electric.api;
1+
package sunsetsatellite.catalyst.energy.electric.api;
22

33
import net.minecraft.core.item.ItemStack;
44

‎energy/src/main/java/sunsetsatellite/catalyst/energy/improved/electric/api/IElectricWire.java ‎energy/src/main/java/sunsetsatellite/catalyst/energy/electric/api/IElectricWire.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package sunsetsatellite.catalyst.energy.improved.electric.api;
1+
package sunsetsatellite.catalyst.energy.electric.api;
22

33
public interface IElectricWire {
44
/**

‎energy/src/main/java/sunsetsatellite/catalyst/energy/improved/electric/api/IVoltageTiered.java ‎energy/src/main/java/sunsetsatellite/catalyst/energy/electric/api/IVoltageTiered.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package sunsetsatellite.catalyst.energy.improved.electric.api;
1+
package sunsetsatellite.catalyst.energy.electric.api;
22

33
public interface IVoltageTiered {
44

‎energy/src/main/java/sunsetsatellite/catalyst/energy/improved/electric/api/VoltageTier.java ‎energy/src/main/java/sunsetsatellite/catalyst/energy/electric/api/VoltageTier.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package sunsetsatellite.catalyst.energy.improved.electric.api;
1+
package sunsetsatellite.catalyst.energy.electric.api;
22

33
import net.minecraft.core.net.command.TextFormatting;
44

‎energy/src/main/java/sunsetsatellite/catalyst/energy/improved/electric/api/WireMaterial.java ‎energy/src/main/java/sunsetsatellite/catalyst/energy/electric/api/WireMaterial.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package sunsetsatellite.catalyst.energy.improved.electric.api;
1+
package sunsetsatellite.catalyst.energy.electric.api;
22

33
public class WireMaterial {
44
private final String name;

‎energy/src/main/java/sunsetsatellite/catalyst/energy/improved/electric/api/WireProperties.java ‎energy/src/main/java/sunsetsatellite/catalyst/energy/electric/api/WireProperties.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package sunsetsatellite.catalyst.energy.improved.electric.api;
1+
package sunsetsatellite.catalyst.energy.electric.api;
22

33
public class WireProperties {
44

‎energy/src/main/java/sunsetsatellite/catalyst/energy/improved/electric/base/TileEntityElectricBase.java ‎energy/src/main/java/sunsetsatellite/catalyst/energy/electric/base/TileEntityElectricBase.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package sunsetsatellite.catalyst.energy.improved.electric.base;
1+
package sunsetsatellite.catalyst.energy.electric.base;
22

33
import com.mojang.nbt.CompoundTag;
44
import sunsetsatellite.catalyst.core.util.AveragingCounter;
@@ -9,9 +9,9 @@
99
import sunsetsatellite.catalyst.core.util.network.NetworkComponentTile;
1010
import sunsetsatellite.catalyst.core.util.network.NetworkType;
1111
import sunsetsatellite.catalyst.core.util.tile.ExtendableTileEntity;
12-
import sunsetsatellite.catalyst.energy.improved.electric.api.IElectric;
13-
import sunsetsatellite.catalyst.energy.improved.electric.api.IVoltageTiered;
14-
import sunsetsatellite.catalyst.energy.improved.electric.api.VoltageTier;
12+
import sunsetsatellite.catalyst.energy.electric.api.IElectric;
13+
import sunsetsatellite.catalyst.energy.electric.api.IVoltageTiered;
14+
import sunsetsatellite.catalyst.energy.electric.api.VoltageTier;
1515

1616

1717
@SuppressWarnings({"FieldMayBeFinal", "FieldCanBeLocal"})

‎energy/src/main/java/sunsetsatellite/catalyst/energy/improved/electric/base/TileEntityElectricConductor.java ‎energy/src/main/java/sunsetsatellite/catalyst/energy/electric/base/TileEntityElectricConductor.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
package sunsetsatellite.catalyst.energy.improved.electric.base;
1+
package sunsetsatellite.catalyst.energy.electric.base;
22

33
import net.minecraft.core.block.entity.TileEntity;
44
import sunsetsatellite.catalyst.core.util.*;
55
import sunsetsatellite.catalyst.core.util.mixin.interfaces.ITileEntityInit;
66
import sunsetsatellite.catalyst.core.util.network.Network;
77
import sunsetsatellite.catalyst.core.util.network.NetworkType;
8-
import sunsetsatellite.catalyst.energy.improved.electric.api.IElectric;
9-
import sunsetsatellite.catalyst.energy.improved.electric.api.IElectricWire;
10-
import sunsetsatellite.catalyst.energy.improved.electric.api.WireProperties;
8+
import sunsetsatellite.catalyst.energy.electric.api.IElectric;
9+
import sunsetsatellite.catalyst.energy.electric.api.IElectricWire;
10+
import sunsetsatellite.catalyst.energy.electric.api.WireProperties;
1111

1212
public abstract class TileEntityElectricConductor extends TileEntity implements IConduitTile, IElectricWire, ITileEntityInit {
1313
public Network energyNet;

‎energy/src/main/java/sunsetsatellite/catalyst/energy/improved/electric/base/TileEntityElectricDevice.java ‎energy/src/main/java/sunsetsatellite/catalyst/energy/electric/base/TileEntityElectricDevice.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
package sunsetsatellite.catalyst.energy.improved.electric.base;
1+
package sunsetsatellite.catalyst.energy.electric.base;
22

33
import net.minecraft.core.block.entity.TileEntity;
44
import org.jetbrains.annotations.NotNull;
55
import sunsetsatellite.catalyst.core.util.Direction;
66
import sunsetsatellite.catalyst.core.util.network.NetworkComponentTile;
77
import sunsetsatellite.catalyst.core.util.network.NetworkPath;
8-
import sunsetsatellite.catalyst.energy.improved.electric.api.IElectric;
8+
import sunsetsatellite.catalyst.energy.electric.api.IElectric;
99

1010

1111

‎energy/src/main/java/sunsetsatellite/catalyst/energy/improved/electric/base/TileEntityElectricGenerator.java ‎energy/src/main/java/sunsetsatellite/catalyst/energy/electric/base/TileEntityElectricGenerator.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package sunsetsatellite.catalyst.energy.improved.electric.base;
1+
package sunsetsatellite.catalyst.energy.electric.base;
22

33
import org.jetbrains.annotations.NotNull;
44
import sunsetsatellite.catalyst.core.util.Direction;

‎energy/src/main/java/sunsetsatellite/catalyst/energy/improved/electric/base/TileEntityElectricStorage.java ‎energy/src/main/java/sunsetsatellite/catalyst/energy/electric/base/TileEntityElectricStorage.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package sunsetsatellite.catalyst.energy.improved.electric.base;
1+
package sunsetsatellite.catalyst.energy.electric.base;
22

33
import net.minecraft.core.block.Block;
44
import org.jetbrains.annotations.NotNull;

‎energy/src/main/java/sunsetsatellite/catalyst/energy/impl/ContainerEnergy.java

-65
This file was deleted.

0 commit comments

Comments
 (0)