diff options
-rw-r--r-- | gradle.properties | 2 | ||||
-rw-r--r-- | src/main/java/net/corechg/transit/InitTransit.java (renamed from src/main/java/net/transit/InitTransit.java) | 4 | ||||
-rw-r--r-- | src/main/java/net/corechg/transit/network/packet/IStaticPacket.java (renamed from src/main/java/net/transit/network/packet/IStaticPacket.java) | 4 | ||||
-rw-r--r-- | src/main/java/net/corechg/transit/network/packet/MetaPacket.java (renamed from src/main/java/net/transit/network/packet/MetaPacket.java) | 4 | ||||
-rw-r--r-- | src/main/java/net/corechg/transit/network/packet/Packet.java (renamed from src/main/java/net/transit/network/packet/Packet.java) | 4 | ||||
-rw-r--r-- | src/main/java/net/corechg/transit/network/packet/StaticPacket.java (renamed from src/main/java/net/transit/network/packet/StaticPacket.java) | 4 | ||||
-rw-r--r-- | src/main/java/net/corechg/transit/network/packet/dynamic/DynamicPacket.java (renamed from src/main/java/net/transit/network/packet/dynamic/DynamicPacket.java) | 4 | ||||
-rw-r--r-- | src/main/java/net/corechg/transit/network/packet/dynamic/IDynamicPacket.java (renamed from src/main/java/net/transit/network/packet/dynamic/IDynamicPacket.java) | 4 | ||||
-rw-r--r-- | src/main/java/net/corechg/transit/network/packet/dynamic/MetaDynamicPacket.java (renamed from src/main/java/net/transit/network/packet/dynamic/MetaDynamicPacket.java) | 4 | ||||
-rw-r--r-- | src/main/java/net/corechg/transit/network/system/INode.java (renamed from src/main/java/net/transit/network/system/INode.java) | 2 | ||||
-rw-r--r-- | src/main/java/net/corechg/transit/network/system/ISystem.java (renamed from src/main/java/net/transit/network/system/ISystem.java) | 2 | ||||
-rw-r--r-- | src/main/java/net/corechg/transit/network/system/Node.java (renamed from src/main/java/net/transit/network/system/Node.java) | 2 | ||||
-rw-r--r-- | src/main/java/net/corechg/transit/network/system/System.java (renamed from src/main/java/net/transit/network/system/System.java) | 2 | ||||
-rw-r--r-- | src/main/java/net/corechg/transit/network/system/swap/AcceptorNode.java (renamed from src/main/java/net/transit/network/system/swap/AcceptorNode.java) | 6 | ||||
-rw-r--r-- | src/main/java/net/corechg/transit/network/system/swap/ProviderNode.java (renamed from src/main/java/net/transit/network/system/swap/ProviderNode.java) | 4 | ||||
-rw-r--r-- | src/main/java/net/corechg/transit/type/TFluid.java (renamed from src/main/java/net/transit/type/TFluid.java) | 2 | ||||
-rw-r--r-- | src/main/java/net/corechg/transit/type/TMana.java (renamed from src/main/java/net/transit/type/TMana.java) | 2 | ||||
-rw-r--r-- | src/main/java/net/corechg/transit/type/Type.java (renamed from src/main/java/net/transit/type/Type.java) | 6 | ||||
-rw-r--r-- | src/main/java/net/corechg/transit/type/group/GroupRegistry.java (renamed from src/main/java/net/transit/type/group/GroupRegistry.java) | 4 | ||||
-rw-r--r-- | src/main/java/net/corechg/transit/type/group/TypeGroup.java (renamed from src/main/java/net/transit/type/group/TypeGroup.java) | 6 | ||||
-rw-r--r-- | src/main/java/net/corechg/transit/type/group/simple/SimpleGroups.java (renamed from src/main/java/net/transit/type/group/simple/SimpleGroups.java) | 10 | ||||
-rw-r--r-- | src/main/java/net/corechg/transit/type/simple/SimpleTypes.java (renamed from src/main/java/net/transit/type/simple/SimpleTypes.java) | 4 | ||||
-rw-r--r-- | src/main/java/net/transit/network/packet/ArrayPacket.java | 52 | ||||
-rw-r--r-- | src/main/java/net/transit/network/packet/dynamic/ArrayPacket.java | 74 | ||||
-rw-r--r-- | src/main/resources/assets/transit-api/icon.png (renamed from src/main/resources/assets/transit-api/transit.png) | bin | 21254 -> 21254 bytes | |||
-rw-r--r-- | src/main/resources/fabric.mod.json | 6 |
26 files changed, 46 insertions, 172 deletions
diff --git a/gradle.properties b/gradle.properties index 532978c..a178946 100644 --- a/gradle.properties +++ b/gradle.properties @@ -8,7 +8,7 @@ org.gradle.jvmargs=-Xmx1G loader_version=0.8.2+build.194 # Mod Properties - mod_version = 0.7.1 + mod_version = 0.8.1 maven_group = net.transit archives_base_name = transit-api diff --git a/src/main/java/net/transit/InitTransit.java b/src/main/java/net/corechg/transit/InitTransit.java index a137040..622d4ea 100644 --- a/src/main/java/net/transit/InitTransit.java +++ b/src/main/java/net/corechg/transit/InitTransit.java @@ -1,7 +1,7 @@ -package net.transit; +package net.corechg.transit; import net.fabricmc.api.ModInitializer; -import net.transit.type.group.simple.SimpleGroups; +import net.corechg.transit.type.group.simple.SimpleGroups; public class InitTransit implements ModInitializer { diff --git a/src/main/java/net/transit/network/packet/IStaticPacket.java b/src/main/java/net/corechg/transit/network/packet/IStaticPacket.java index 01073d3..74d5110 100644 --- a/src/main/java/net/transit/network/packet/IStaticPacket.java +++ b/src/main/java/net/corechg/transit/network/packet/IStaticPacket.java @@ -1,6 +1,6 @@ -package net.transit.network.packet; +package net.corechg.transit.network.packet; -import net.transit.type.Type; +import net.corechg.transit.type.Type; /** Interface describing an unchanging packet. * @author Kyle Gunger diff --git a/src/main/java/net/transit/network/packet/MetaPacket.java b/src/main/java/net/corechg/transit/network/packet/MetaPacket.java index 7e49318..e043aa1 100644 --- a/src/main/java/net/transit/network/packet/MetaPacket.java +++ b/src/main/java/net/corechg/transit/network/packet/MetaPacket.java @@ -1,6 +1,6 @@ -package net.transit.network.packet; +package net.corechg.transit.network.packet; -import net.transit.type.Type; +import net.corechg.transit.type.Type; /** Static packet with extra data attached. * @author Kyle Gunger diff --git a/src/main/java/net/transit/network/packet/Packet.java b/src/main/java/net/corechg/transit/network/packet/Packet.java index 0b7c832..8aaffdd 100644 --- a/src/main/java/net/transit/network/packet/Packet.java +++ b/src/main/java/net/corechg/transit/network/packet/Packet.java @@ -1,6 +1,6 @@ -package net.transit.network.packet; +package net.corechg.transit.network.packet; -import net.transit.type.Type; +import net.corechg.transit.type.Type; /** * @author Kyle Gunger diff --git a/src/main/java/net/transit/network/packet/StaticPacket.java b/src/main/java/net/corechg/transit/network/packet/StaticPacket.java index eeeae3f..2596a8f 100644 --- a/src/main/java/net/transit/network/packet/StaticPacket.java +++ b/src/main/java/net/corechg/transit/network/packet/StaticPacket.java @@ -1,6 +1,6 @@ -package net.transit.network.packet; +package net.corechg.transit.network.packet; -import net.transit.type.Type; +import net.corechg.transit.type.Type; /** Simple packet which stores an unchanging value. * @author Kyle Gunger diff --git a/src/main/java/net/transit/network/packet/dynamic/DynamicPacket.java b/src/main/java/net/corechg/transit/network/packet/dynamic/DynamicPacket.java index 0860487..73f3669 100644 --- a/src/main/java/net/transit/network/packet/dynamic/DynamicPacket.java +++ b/src/main/java/net/corechg/transit/network/packet/dynamic/DynamicPacket.java @@ -1,6 +1,6 @@ -package net.transit.network.packet.dynamic; +package net.corechg.transit.network.packet.dynamic; -import net.transit.type.Type; +import net.corechg.transit.type.Type; /** * Simple packet which stores a fluid value. diff --git a/src/main/java/net/transit/network/packet/dynamic/IDynamicPacket.java b/src/main/java/net/corechg/transit/network/packet/dynamic/IDynamicPacket.java index 51b3c13..6cf3018 100644 --- a/src/main/java/net/transit/network/packet/dynamic/IDynamicPacket.java +++ b/src/main/java/net/corechg/transit/network/packet/dynamic/IDynamicPacket.java @@ -1,6 +1,6 @@ -package net.transit.network.packet.dynamic; +package net.corechg.transit.network.packet.dynamic; -import net.transit.network.packet.IStaticPacket; +import net.corechg.transit.network.packet.IStaticPacket; /** Interface describing a fluid packet. * @author Kyle Gunger diff --git a/src/main/java/net/transit/network/packet/dynamic/MetaDynamicPacket.java b/src/main/java/net/corechg/transit/network/packet/dynamic/MetaDynamicPacket.java index b6a3ec6..50418b9 100644 --- a/src/main/java/net/transit/network/packet/dynamic/MetaDynamicPacket.java +++ b/src/main/java/net/corechg/transit/network/packet/dynamic/MetaDynamicPacket.java @@ -1,6 +1,6 @@ -package net.transit.network.packet.dynamic; +package net.corechg.transit.network.packet.dynamic; -import net.transit.type.Type; +import net.corechg.transit.type.Type; /** Static packet with extra data attached. * @author Kyle Gunger diff --git a/src/main/java/net/transit/network/system/INode.java b/src/main/java/net/corechg/transit/network/system/INode.java index 9c42bf1..9feaa3c 100644 --- a/src/main/java/net/transit/network/system/INode.java +++ b/src/main/java/net/corechg/transit/network/system/INode.java @@ -1,4 +1,4 @@ -package net.transit.network.system; +package net.corechg.transit.network.system; /** * @author Kyle Gunger diff --git a/src/main/java/net/transit/network/system/ISystem.java b/src/main/java/net/corechg/transit/network/system/ISystem.java index fd2fa51..1c0b122 100644 --- a/src/main/java/net/transit/network/system/ISystem.java +++ b/src/main/java/net/corechg/transit/network/system/ISystem.java @@ -1,4 +1,4 @@ -package net.transit.network.system; +package net.corechg.transit.network.system; /**ISystem - a group of nodes optimized for performance diff --git a/src/main/java/net/transit/network/system/Node.java b/src/main/java/net/corechg/transit/network/system/Node.java index 6a661f3..87682ce 100644 --- a/src/main/java/net/transit/network/system/Node.java +++ b/src/main/java/net/corechg/transit/network/system/Node.java @@ -1,4 +1,4 @@ -package net.transit.network.system; +package net.corechg.transit.network.system; /** * @author Kyle Gunger diff --git a/src/main/java/net/transit/network/system/System.java b/src/main/java/net/corechg/transit/network/system/System.java index c70292a..dfe3e19 100644 --- a/src/main/java/net/transit/network/system/System.java +++ b/src/main/java/net/corechg/transit/network/system/System.java @@ -1,4 +1,4 @@ -package net.transit.network.system; +package net.corechg.transit.network.system; /**ISystem - a group of nodes optimized for performance diff --git a/src/main/java/net/transit/network/system/swap/AcceptorNode.java b/src/main/java/net/corechg/transit/network/system/swap/AcceptorNode.java index 14c672d..720b210 100644 --- a/src/main/java/net/transit/network/system/swap/AcceptorNode.java +++ b/src/main/java/net/corechg/transit/network/system/swap/AcceptorNode.java @@ -1,7 +1,7 @@ -package net.transit.network.system.swap; +package net.corechg.transit.network.system.swap; -import net.transit.network.packet.IStaticPacket; -import net.transit.network.system.INode; +import net.corechg.transit.network.packet.IStaticPacket; +import net.corechg.transit.network.system.INode; public interface AcceptorNode extends INode { diff --git a/src/main/java/net/transit/network/system/swap/ProviderNode.java b/src/main/java/net/corechg/transit/network/system/swap/ProviderNode.java index 831c87f..06b13f4 100644 --- a/src/main/java/net/transit/network/system/swap/ProviderNode.java +++ b/src/main/java/net/corechg/transit/network/system/swap/ProviderNode.java @@ -1,6 +1,6 @@ -package net.transit.network.system.swap; +package net.corechg.transit.network.system.swap; -import net.transit.network.system.INode; +import net.corechg.transit.network.system.INode; public interface ProviderNode extends INode{ diff --git a/src/main/java/net/transit/type/TFluid.java b/src/main/java/net/corechg/transit/type/TFluid.java index fbceb0e..a2f9815 100644 --- a/src/main/java/net/transit/type/TFluid.java +++ b/src/main/java/net/corechg/transit/type/TFluid.java @@ -1,4 +1,4 @@ -package net.transit.type; +package net.corechg.transit.type; import net.minecraft.fluid.Fluid; diff --git a/src/main/java/net/transit/type/TMana.java b/src/main/java/net/corechg/transit/type/TMana.java index 3a60d52..1a176fc 100644 --- a/src/main/java/net/transit/type/TMana.java +++ b/src/main/java/net/corechg/transit/type/TMana.java @@ -1,4 +1,4 @@ -package net.transit.type; +package net.corechg.transit.type; /** Units of mana. * @author Kyle Gunger diff --git a/src/main/java/net/transit/type/Type.java b/src/main/java/net/corechg/transit/type/Type.java index 2dcf81b..c5be2bb 100644 --- a/src/main/java/net/transit/type/Type.java +++ b/src/main/java/net/corechg/transit/type/Type.java @@ -1,7 +1,7 @@ -package net.transit.type; +package net.corechg.transit.type; -import net.transit.network.packet.IStaticPacket; -import net.transit.network.packet.StaticPacket; +import net.corechg.transit.network.packet.IStaticPacket; +import net.corechg.transit.network.packet.StaticPacket; /**@author Kyle Gunger * diff --git a/src/main/java/net/transit/type/group/GroupRegistry.java b/src/main/java/net/corechg/transit/type/group/GroupRegistry.java index 12ffffc..c6c0186 100644 --- a/src/main/java/net/transit/type/group/GroupRegistry.java +++ b/src/main/java/net/corechg/transit/type/group/GroupRegistry.java @@ -1,11 +1,11 @@ -package net.transit.type.group; +package net.corechg.transit.type.group; import java.util.ArrayList; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import net.transit.type.Type; +import net.corechg.transit.type.Type; public class GroupRegistry { private static final ArrayList<TypeGroup<?>> GROUPS = new ArrayList<TypeGroup<?>>(0); diff --git a/src/main/java/net/transit/type/group/TypeGroup.java b/src/main/java/net/corechg/transit/type/group/TypeGroup.java index a3ab622..adbd75f 100644 --- a/src/main/java/net/transit/type/group/TypeGroup.java +++ b/src/main/java/net/corechg/transit/type/group/TypeGroup.java @@ -1,12 +1,12 @@ -package net.transit.type.group; +package net.corechg.transit.type.group; import java.util.ArrayList; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import net.transit.network.packet.*; -import net.transit.type.Type; +import net.corechg.transit.network.packet.*; +import net.corechg.transit.type.Type; /** * @author Kyle Gunger diff --git a/src/main/java/net/transit/type/group/simple/SimpleGroups.java b/src/main/java/net/corechg/transit/type/group/simple/SimpleGroups.java index f3e2ad2..ce39fc1 100644 --- a/src/main/java/net/transit/type/group/simple/SimpleGroups.java +++ b/src/main/java/net/corechg/transit/type/group/simple/SimpleGroups.java @@ -1,10 +1,10 @@ -package net.transit.type.group.simple; +package net.corechg.transit.type.group.simple; import net.minecraft.item.ItemStack; -import net.transit.type.group.GroupRegistry; -import net.transit.type.group.TypeGroup; -import net.transit.type.simple.SimpleTypes; -import net.transit.type.*; +import net.corechg.transit.type.group.GroupRegistry; +import net.corechg.transit.type.group.TypeGroup; +import net.corechg.transit.type.simple.SimpleTypes; +import net.corechg.transit.type.*; public final class SimpleGroups { /** Transfers energy. Basic unit is TJoule (Transit Joule). diff --git a/src/main/java/net/transit/type/simple/SimpleTypes.java b/src/main/java/net/corechg/transit/type/simple/SimpleTypes.java index cae234f..f608bdd 100644 --- a/src/main/java/net/transit/type/simple/SimpleTypes.java +++ b/src/main/java/net/corechg/transit/type/simple/SimpleTypes.java @@ -1,7 +1,7 @@ -package net.transit.type.simple; +package net.corechg.transit.type.simple; import net.minecraft.item.ItemStack; -import net.transit.type.*; +import net.corechg.transit.type.*; public final class SimpleTypes { /** Transfers energy. Energy is stored as a numeric, base value is TJoule (TransitJoule) diff --git a/src/main/java/net/transit/network/packet/ArrayPacket.java b/src/main/java/net/transit/network/packet/ArrayPacket.java deleted file mode 100644 index fbea811..0000000 --- a/src/main/java/net/transit/network/packet/ArrayPacket.java +++ /dev/null @@ -1,52 +0,0 @@ -package net.transit.network.packet; - -import java.util.ArrayList; - -import net.transit.type.Type; - -public class ArrayPacket<D> implements Packet<D> -{ - private ArrayList<D> arrayData; - private Type<D> type; - - public ArrayPacket(D startValue, Type<D> t) - { - arrayData = new ArrayList<D>(0); - arrayData.add(startValue); - type = t; - } - - @Override - public D getData() - { - if(arrayData.size() > 0) return arrayData.get(0); - return null; - } - - public void addData(D data) - { - arrayData.add(data); - } - - public int dataStored() - { - return arrayData.size(); - } - - public D popAndShift() - { - D temp = null; - - if(arrayData.size() > 0) - { - temp = arrayData.remove(0); - } - - return temp; - } - - @Override - public Type<D> getType() { - return type; - } -}
\ No newline at end of file diff --git a/src/main/java/net/transit/network/packet/dynamic/ArrayPacket.java b/src/main/java/net/transit/network/packet/dynamic/ArrayPacket.java deleted file mode 100644 index 0c27c80..0000000 --- a/src/main/java/net/transit/network/packet/dynamic/ArrayPacket.java +++ /dev/null @@ -1,74 +0,0 @@ -package net.transit.network.packet.dynamic; - -import java.util.ArrayList; - -import net.transit.type.Type; - -/** A packet type which stores multiple values which can be accessed. When getting data, pop and shift from the array. - * @author Kyle Gunger - * - * @param <D> The data type (Object) that the packet transfers - */ -public class ArrayPacket<D> implements IDynamicPacket<D> -{ - private ArrayList<D> arrayData; - private Type<D> type; - - /** Constructor - * Create an array packet. Adds the starting value. - * @param startValue The starting value - * @param t The type of the packet - */ - public ArrayPacket(D startValue, Type<D> t) - { - arrayData = new ArrayList<D>(0); - arrayData.add(startValue); - type = t; - } - - /** - * Create an empty array packet of the desired type. - * @param t The type of the packet - */ - public ArrayPacket(Type<D> t) - { - arrayData = new ArrayList<D>(0); - type = t; - } - - /** Pop and shift data from the array. - */ - @Override - public D getData() - { - D temp = null; - - if(arrayData.size() > 0) - { - temp = arrayData.remove(0); - } - - return temp; - } - - /** Add data to the array. - * @param data The data to push - */ - public void setData(D data) - { - arrayData.add(data); - } - - /** - * @return The ammount of data the packet holds - */ - public int dataStored() - { - return arrayData.size(); - } - - @Override - public Type<D> getType() { - return type; - } -}
\ No newline at end of file diff --git a/src/main/resources/assets/transit-api/transit.png b/src/main/resources/assets/transit-api/icon.png Binary files differindex ab04337..ab04337 100644 --- a/src/main/resources/assets/transit-api/transit.png +++ b/src/main/resources/assets/transit-api/icon.png diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 584bab1..b7c73f7 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -1,7 +1,7 @@ { "schemaVersion": 1, "id": "transit-api", - "version": "0.7.1", + "version": "0.8.1", "name": "Transit API", "description": "Move about!", @@ -14,12 +14,12 @@ }, "license": "MIT", - "icon": "assets/transit-api/transit.png", + "icon": "assets/transit-api/icon.png", "environment": "*", "entrypoints": { "main": [ - "net.transit.InitTransit" + "net.corechg.transit.InitTransit" ] }, |