tilera/IndustrialWires
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Finally fix the package name

Browse source
This commit is contained in:
malte0811 2018-09-03 20:35:23 +02:00
parent cbcc95a010
commit 69c8713853
159 changed files with 693 additions and 693 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/main/java/malte0811/industrialWires/CommonProxy.java → src/main/java/malte0811/industrialwires/CommonProxy.java
View file

@ -12,18 +12,18 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>. * along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>.
*/ */
package malte0811.industrialWires; package malte0811.industrialwires;
import malte0811.industrialWires.blocks.controlpanel.TileEntityPanelCreator; import malte0811.industrialwires.blocks.controlpanel.TileEntityPanelCreator;
import malte0811.industrialWires.blocks.controlpanel.TileEntityRSPanel; import malte0811.industrialwires.blocks.controlpanel.TileEntityRSPanel;
import malte0811.industrialWires.blocks.converter.TileEntityMechMB; import malte0811.industrialwires.blocks.converter.TileEntityMechMB;
import malte0811.industrialWires.blocks.hv.TileEntityJacobsLadder; import malte0811.industrialwires.blocks.hv.TileEntityJacobsLadder;
import malte0811.industrialWires.blocks.hv.TileEntityMarx; import malte0811.industrialwires.blocks.hv.TileEntityMarx;
import malte0811.industrialWires.containers.ContainerPanelComponent; import malte0811.industrialwires.containers.ContainerPanelComponent;
import malte0811.industrialWires.containers.ContainerPanelCreator; import malte0811.industrialwires.containers.ContainerPanelCreator;
import malte0811.industrialWires.containers.ContainerRSPanelConn; import malte0811.industrialwires.containers.ContainerRSPanelConn;
import malte0811.industrialWires.containers.ContainerRenameKey; import malte0811.industrialwires.containers.ContainerRenameKey;
import malte0811.industrialWires.mech_mb.MechEnergy; import malte0811.industrialwires.mech_mb.MechEnergy;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.Container; import net.minecraft.inventory.Container;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;

4
src/main/java/malte0811/industrialWires/EventHandler.java → src/main/java/malte0811/industrialwires/EventHandler.java
View file

@ -13,9 +13,9 @@
* along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>. * along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>.
*/ */
package malte0811.industrialWires; package malte0811.industrialwires;
import malte0811.industrialWires.items.ItemIC2Coil; import malte0811.industrialwires.items.ItemIC2Coil;
import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.item.EntityItem;
import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;

2
src/main/java/malte0811/industrialWires/IEObjects.java → src/main/java/malte0811/industrialwires/IEObjects.java
View file

@ -13,7 +13,7 @@
* along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>. * along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>.
*/ */
package malte0811.industrialWires; package malte0811.industrialwires;
import blusunrize.immersiveengineering.ImmersiveEngineering; import blusunrize.immersiveengineering.ImmersiveEngineering;
import blusunrize.immersiveengineering.common.blocks.BlockIEBase; import blusunrize.immersiveengineering.common.blocks.BlockIEBase;

6
src/main/java/malte0811/industrialWires/IMixedConnector.java → src/main/java/malte0811/industrialwires/IMixedConnector.java
View file

@ -12,12 +12,12 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>. * along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>.
*/ */
package malte0811.industrialWires; package malte0811.industrialwires;
import blusunrize.immersiveengineering.api.energy.wires.IImmersiveConnectable; import blusunrize.immersiveengineering.api.energy.wires.IImmersiveConnectable;
import blusunrize.immersiveengineering.api.energy.wires.ImmersiveNetHandler; import blusunrize.immersiveengineering.api.energy.wires.ImmersiveNetHandler;
import malte0811.industrialWires.util.ConversionUtil; import malte0811.industrialwires.util.ConversionUtil;
import malte0811.industrialWires.wires.EnergyType; import malte0811.industrialwires.wires.EnergyType;
import net.minecraft.entity.Entity; import net.minecraft.entity.Entity;
public interface IMixedConnector extends IImmersiveConnectable { public interface IMixedConnector extends IImmersiveConnectable {

2
src/main/java/malte0811/industrialWires/IWConfig.java → src/main/java/malte0811/industrialwires/IWConfig.java
View file

@ -12,7 +12,7 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>. * along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>.
*/ */
package malte0811.industrialWires; package malte0811.industrialwires;
import blusunrize.immersiveengineering.common.Config.IEConfig; import blusunrize.immersiveengineering.common.Config.IEConfig;
import net.minecraftforge.common.config.Config; import net.minecraftforge.common.config.Config;

2
src/main/java/malte0811/industrialWires/IWDamageSources.java → src/main/java/malte0811/industrialwires/IWDamageSources.java
View file

@ -13,7 +13,7 @@
* along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>. * along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>.
*/ */
package malte0811.industrialWires; package malte0811.industrialwires;
import net.minecraft.util.DamageSource; import net.minecraft.util.DamageSource;

2
src/main/java/malte0811/industrialWires/IWPotions.java → src/main/java/malte0811/industrialwires/IWPotions.java
View file

@ -13,7 +13,7 @@
* along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>. * along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>.
*/ */
package malte0811.industrialWires; package malte0811.industrialwires;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.EntityLivingBase;

4
src/main/java/malte0811/industrialWires/IWSaveData.java → src/main/java/malte0811/industrialwires/IWSaveData.java
View file

@ -13,9 +13,9 @@
* along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>. * along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>.
*/ */
package malte0811.industrialWires; package malte0811.industrialwires;
import malte0811.industrialWires.hv.MarxOreHandler; import malte0811.industrialwires.hv.MarxOreHandler;
import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.world.World; import net.minecraft.world.World;
import net.minecraft.world.storage.WorldSavedData; import net.minecraft.world.storage.WorldSavedData;

64
src/main/java/malte0811/industrialWires/IndustrialWires.java → src/main/java/malte0811/industrialwires/IndustrialWires.java
View file

@ -12,37 +12,37 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>. * along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>.
*/ */
package malte0811.industrialWires; package malte0811.industrialwires;
import blusunrize.immersiveengineering.ImmersiveEngineering; import blusunrize.immersiveengineering.ImmersiveEngineering;
import blusunrize.immersiveengineering.api.MultiblockHandler; import blusunrize.immersiveengineering.api.MultiblockHandler;
import blusunrize.immersiveengineering.api.energy.wires.WireApi; import blusunrize.immersiveengineering.api.energy.wires.WireApi;
import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableMap;
import malte0811.industrialWires.blocks.BlockIWBase; import malte0811.industrialwires.blocks.BlockIWBase;
import malte0811.industrialWires.blocks.TEDataFixer; import malte0811.industrialwires.blocks.TEDataFixer;
import malte0811.industrialWires.blocks.controlpanel.*; import malte0811.industrialwires.blocks.controlpanel.*;
import malte0811.industrialWires.blocks.converter.*; import malte0811.industrialwires.blocks.converter.*;
import malte0811.industrialWires.blocks.hv.*; import malte0811.industrialwires.blocks.hv.*;
import malte0811.industrialWires.blocks.wire.*; import malte0811.industrialwires.blocks.wire.*;
import malte0811.industrialWires.compat.Compat; import malte0811.industrialwires.compat.Compat;
import malte0811.industrialWires.controlpanel.PanelComponent; import malte0811.industrialwires.controlpanel.PanelComponent;
import malte0811.industrialWires.controlpanel.PanelUtils; import malte0811.industrialwires.controlpanel.PanelUtils;
import malte0811.industrialWires.crafting.Recipes; import malte0811.industrialwires.crafting.Recipes;
import malte0811.industrialWires.entities.EntityBrokenPart; import malte0811.industrialwires.entities.EntityBrokenPart;
import malte0811.industrialWires.hv.MarxOreHandler; import malte0811.industrialwires.hv.MarxOreHandler;
import malte0811.industrialWires.hv.MultiblockMarx; import malte0811.industrialwires.hv.MultiblockMarx;
import malte0811.industrialWires.items.ItemIC2Coil; import malte0811.industrialwires.items.ItemIC2Coil;
import malte0811.industrialWires.items.ItemKey; import malte0811.industrialwires.items.ItemKey;
import malte0811.industrialWires.items.ItemPanelComponent; import malte0811.industrialwires.items.ItemPanelComponent;
import malte0811.industrialWires.mech_mb.EUCapability; import malte0811.industrialwires.mech_mb.EUCapability;
import malte0811.industrialWires.mech_mb.MechMBPart; import malte0811.industrialwires.mech_mb.MechMBPart;
import malte0811.industrialWires.mech_mb.MultiblockMechMB; import malte0811.industrialwires.mech_mb.MultiblockMechMB;
import malte0811.industrialWires.network.MessageGUIInteract; import malte0811.industrialwires.network.MessageGUIInteract;
import malte0811.industrialWires.network.MessageItemSync; import malte0811.industrialwires.network.MessageItemSync;
import malte0811.industrialWires.network.MessagePanelInteract; import malte0811.industrialwires.network.MessagePanelInteract;
import malte0811.industrialWires.network.MessageTileSyncIW; import malte0811.industrialwires.network.MessageTileSyncIW;
import malte0811.industrialWires.util.CommandIW; import malte0811.industrialwires.util.CommandIW;
import malte0811.industrialWires.util.MultiblockTemplateManual; import malte0811.industrialwires.util.MultiblockTemplateManual;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.creativetab.CreativeTabs; import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.Item; import net.minecraft.item.Item;
@ -75,11 +75,11 @@ package malte0811.industrialWires;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import static malte0811.industrialWires.blocks.wire.BlockTypes_IC2_Connector.*; import static malte0811.industrialwires.blocks.wire.BlockTypes_IC2_Connector.*;
import static malte0811.industrialWires.entities.EntityBrokenPart.MARKER_TEXTURE; import static malte0811.industrialwires.entities.EntityBrokenPart.MARKER_TEXTURE;
import static malte0811.industrialWires.entities.EntityBrokenPart.RES_LOC_SERIALIZER; import static malte0811.industrialwires.entities.EntityBrokenPart.RES_LOC_SERIALIZER;
import static malte0811.industrialWires.mech_mb.MechMBPart.EXAMPLE_MECHMB_LOC; import static malte0811.industrialwires.mech_mb.MechMBPart.EXAMPLE_MECHMB_LOC;
import static malte0811.industrialWires.wires.MixedWireType.*; import static malte0811.industrialwires.wires.MixedWireType.*;
@Mod(modid = IndustrialWires.MODID, version = IndustrialWires.VERSION, dependencies = "required-after:immersiveengineering@[0.12-77,);after:ic2;required-after:forge@[14.23.3.2694,)", @Mod(modid = IndustrialWires.MODID, version = IndustrialWires.VERSION, dependencies = "required-after:immersiveengineering@[0.12-77,);after:ic2;required-after:forge@[14.23.3.2694,)",
certificateFingerprint = "7e11c175d1e24007afec7498a1616bef0000027d", certificateFingerprint = "7e11c175d1e24007afec7498a1616bef0000027d",
@ -149,7 +149,7 @@ public class IndustrialWires {
} }
} }
}; };
@SidedProxy(clientSide = "malte0811.industrialWires.client.ClientProxy", serverSide = "malte0811.industrialWires.CommonProxy") @SidedProxy(clientSide = "malte0811.industrialwires.client.ClientProxy", serverSide = "malte0811.industrialwires.CommonProxy")
public static CommonProxy proxy; public static CommonProxy proxy;
public static boolean hasIC2; public static boolean hasIC2;
public static boolean hasTechReborn; public static boolean hasTechReborn;

6
src/main/java/malte0811/industrialWires/blocks/BlockIWBase.java → src/main/java/malte0811/industrialwires/blocks/BlockIWBase.java
View file

@ -13,7 +13,7 @@
* along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>. * along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>.
*/ */
package malte0811.industrialWires.blocks; package malte0811.industrialwires.blocks;
import blusunrize.immersiveengineering.api.IEProperties; import blusunrize.immersiveengineering.api.IEProperties;
import blusunrize.immersiveengineering.api.energy.wires.IImmersiveConnectable; import blusunrize.immersiveengineering.api.energy.wires.IImmersiveConnectable;
@ -21,8 +21,8 @@ import blusunrize.immersiveengineering.api.energy.wires.ImmersiveNetHandler;
import blusunrize.immersiveengineering.common.blocks.IEBlockInterfaces; import blusunrize.immersiveengineering.common.blocks.IEBlockInterfaces;
import blusunrize.immersiveengineering.common.blocks.IEBlockInterfaces.IPlayerInteraction; import blusunrize.immersiveengineering.common.blocks.IEBlockInterfaces.IPlayerInteraction;
import blusunrize.immersiveengineering.common.util.Utils; import blusunrize.immersiveengineering.common.util.Utils;
import malte0811.industrialWires.IndustrialWires; import malte0811.industrialwires.IndustrialWires;
import malte0811.industrialWires.util.MiscUtils; import malte0811.industrialwires.util.MiscUtils;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import net.minecraft.block.properties.IProperty; import net.minecraft.block.properties.IProperty;

2
src/main/java/malte0811/industrialWires/blocks/BlockIWMultiblock.java → src/main/java/malte0811/industrialwires/blocks/BlockIWMultiblock.java
View file

@ -13,7 +13,7 @@
* along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>. * along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>.
*/ */
package malte0811.industrialWires.blocks; package malte0811.industrialwires.blocks;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import net.minecraft.block.state.IBlockState; import net.minecraft.block.state.IBlockState;

2
src/main/java/malte0811/industrialWires/blocks/EnergyAdapter.java → src/main/java/malte0811/industrialwires/blocks/EnergyAdapter.java
View file

@ -12,7 +12,7 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>. * along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>.
*/ */
package malte0811.industrialWires.blocks; package malte0811.industrialwires.blocks;
import blusunrize.immersiveengineering.api.energy.immersiveflux.IFluxConnection; import blusunrize.immersiveengineering.api.energy.immersiveflux.IFluxConnection;
import blusunrize.immersiveengineering.api.energy.immersiveflux.IFluxProvider; import blusunrize.immersiveengineering.api.energy.immersiveflux.IFluxProvider;

4
src/main/java/malte0811/industrialWires/blocks/IBlockBoundsIW.java → src/main/java/malte0811/industrialwires/blocks/IBlockBoundsIW.java
View file

@ -13,11 +13,11 @@
* along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>. * along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>.
*/ */
package malte0811.industrialWires.blocks; package malte0811.industrialwires.blocks;
import blusunrize.immersiveengineering.common.blocks.IEBlockInterfaces; import blusunrize.immersiveengineering.common.blocks.IEBlockInterfaces;
import blusunrize.immersiveengineering.common.util.chickenbones.Matrix4; import blusunrize.immersiveengineering.common.util.chickenbones.Matrix4;
import malte0811.industrialWires.util.MiscUtils; import malte0811.industrialwires.util.MiscUtils;
import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumFacing;
import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.AxisAlignedBB;

2
src/main/java/malte0811/industrialWires/blocks/IHasDummyBlocksIW.java → src/main/java/malte0811/industrialwires/blocks/IHasDummyBlocksIW.java
View file

@ -13,7 +13,7 @@
* along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>. * along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>.
*/ */
package malte0811.industrialWires.blocks; package malte0811.industrialwires.blocks;
import blusunrize.immersiveengineering.common.blocks.IEBlockInterfaces.IGeneralMultiblock; import blusunrize.immersiveengineering.common.blocks.IEBlockInterfaces.IGeneralMultiblock;
import net.minecraft.block.state.IBlockState; import net.minecraft.block.state.IBlockState;

2
src/main/java/malte0811/industrialWires/blocks/IMetaEnum.java → src/main/java/malte0811/industrialwires/blocks/IMetaEnum.java
View file

@ -12,7 +12,7 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>. * along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>.
*/ */
package malte0811.industrialWires.blocks; package malte0811.industrialwires.blocks;
public interface IMetaEnum { public interface IMetaEnum {
Object[] getValues(); Object[] getValues();

2
src/main/java/malte0811/industrialWires/blocks/INetGUI.java → src/main/java/malte0811/industrialwires/blocks/INetGUI.java
View file

@ -13,7 +13,7 @@
* along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>. * along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>.
*/ */
package malte0811.industrialWires.blocks; package malte0811.industrialwires.blocks;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagCompound;

2
src/main/java/malte0811/industrialWires/blocks/IPlacementCheck.java → src/main/java/malte0811/industrialwires/blocks/IPlacementCheck.java
View file

@ -13,7 +13,7 @@
* along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>. * along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>.
*/ */
package malte0811.industrialWires.blocks; package malte0811.industrialwires.blocks;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;

2
src/main/java/malte0811/industrialWires/blocks/ISyncReceiver.java → src/main/java/malte0811/industrialwires/blocks/ISyncReceiver.java
View file

@ -13,7 +13,7 @@
* along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>. * along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>.
*/ */
package malte0811.industrialWires.blocks; package malte0811.industrialwires.blocks;
import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagCompound;
import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.Side;

4
src/main/java/malte0811/industrialWires/blocks/IWProperties.java → src/main/java/malte0811/industrialwires/blocks/IWProperties.java
View file

@ -13,9 +13,9 @@
* along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>. * along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>.
*/ */
package malte0811.industrialWires.blocks; package malte0811.industrialwires.blocks;
import malte0811.industrialWires.util.MBSideConfig; import malte0811.industrialwires.util.MBSideConfig;
import net.minecraft.block.properties.PropertyEnum; import net.minecraft.block.properties.PropertyEnum;
import net.minecraft.util.IStringSerializable; import net.minecraft.util.IStringSerializable;
import net.minecraftforge.common.property.IUnlistedProperty; import net.minecraftforge.common.property.IUnlistedProperty;

4
src/main/java/malte0811/industrialWires/blocks/ItemBlockIW.java → src/main/java/malte0811/industrialwires/blocks/ItemBlockIW.java
View file

@ -12,10 +12,10 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>. * along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>.
*/ */
package malte0811.industrialWires.blocks; package malte0811.industrialwires.blocks;
import blusunrize.immersiveengineering.common.blocks.IEBlockInterfaces; import blusunrize.immersiveengineering.common.blocks.IEBlockInterfaces;
import malte0811.industrialWires.IndustrialWires; import malte0811.industrialwires.IndustrialWires;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.block.state.IBlockState; import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;

4
src/main/java/malte0811/industrialWires/blocks/TEDataFixer.java → src/main/java/malte0811/industrialwires/blocks/TEDataFixer.java
View file

@ -13,9 +13,9 @@
* along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>. * along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>.
*/ */
package malte0811.industrialWires.blocks; package malte0811.industrialwires.blocks;
import malte0811.industrialWires.IndustrialWires; import malte0811.industrialwires.IndustrialWires;
import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.datafix.IFixableData; import net.minecraft.util.datafix.IFixableData;

4
src/main/java/malte0811/industrialWires/blocks/TileEntityIWBase.java → src/main/java/malte0811/industrialwires/blocks/TileEntityIWBase.java
View file

@ -12,10 +12,10 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>. * along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>.
*/ */
package malte0811.industrialWires.blocks; package malte0811.industrialwires.blocks;
import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSet;
import malte0811.industrialWires.IndustrialWires; import malte0811.industrialwires.IndustrialWires;
import net.minecraft.block.state.IBlockState; import net.minecraft.block.state.IBlockState;
import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.network.NetworkManager; import net.minecraft.network.NetworkManager;

4
src/main/java/malte0811/industrialWires/blocks/TileEntityIWMultiblock.java → src/main/java/malte0811/industrialwires/blocks/TileEntityIWMultiblock.java
View file

@ -13,11 +13,11 @@
* along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>. * along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>.
*/ */
package malte0811.industrialWires.blocks; package malte0811.industrialwires.blocks;
import blusunrize.immersiveengineering.common.blocks.IEBlockInterfaces.IDirectionalTile; import blusunrize.immersiveengineering.common.blocks.IEBlockInterfaces.IDirectionalTile;
import blusunrize.immersiveengineering.common.blocks.IEBlockInterfaces.IGeneralMultiblock; import blusunrize.immersiveengineering.common.blocks.IEBlockInterfaces.IGeneralMultiblock;
import malte0811.industrialWires.util.MiscUtils; import malte0811.industrialwires.util.MiscUtils;
import net.minecraft.block.state.IBlockState; import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.item.EntityItem;

14
src/main/java/malte0811/industrialWires/blocks/controlpanel/BlockPanel.java → src/main/java/malte0811/industrialwires/blocks/controlpanel/BlockPanel.java
View file

@ -13,15 +13,15 @@
* along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>. * along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>.
*/ */
package malte0811.industrialWires.blocks.controlpanel; package malte0811.industrialwires.blocks.controlpanel;
import blusunrize.immersiveengineering.api.IEProperties; import blusunrize.immersiveengineering.api.IEProperties;
import malte0811.industrialWires.IndustrialWires; import malte0811.industrialwires.IndustrialWires;
import malte0811.industrialWires.blocks.BlockIWBase; import malte0811.industrialwires.blocks.BlockIWBase;
import malte0811.industrialWires.blocks.IMetaEnum; import malte0811.industrialwires.blocks.IMetaEnum;
import malte0811.industrialWires.controlpanel.PanelComponent; import malte0811.industrialwires.controlpanel.PanelComponent;
import malte0811.industrialWires.controlpanel.PropertyComponents; import malte0811.industrialwires.controlpanel.PropertyComponents;
import malte0811.industrialWires.util.MiscUtils; import malte0811.industrialwires.util.MiscUtils;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import net.minecraft.block.properties.IProperty; import net.minecraft.block.properties.IProperty;

4
src/main/java/malte0811/industrialWires/blocks/controlpanel/BlockTypes_Panel.java → src/main/java/malte0811/industrialwires/blocks/controlpanel/BlockTypes_Panel.java
View file

@ -13,9 +13,9 @@
* along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>. * along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>.
*/ */
package malte0811.industrialWires.blocks.controlpanel; package malte0811.industrialwires.blocks.controlpanel;
import malte0811.industrialWires.compat.Compat; import malte0811.industrialwires.compat.Compat;
import net.minecraft.util.IStringSerializable; import net.minecraft.util.IStringSerializable;
import java.util.Locale; import java.util.Locale;

8
src/main/java/malte0811/industrialWires/blocks/controlpanel/ItemBlockPanel.java → src/main/java/malte0811/industrialwires/blocks/controlpanel/ItemBlockPanel.java
View file

@ -13,18 +13,18 @@
* along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>. * along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>.
*/ */
package malte0811.industrialWires.blocks.controlpanel; package malte0811.industrialwires.blocks.controlpanel;
import blusunrize.immersiveengineering.api.tool.IConfigurableTool; import blusunrize.immersiveengineering.api.tool.IConfigurableTool;
import malte0811.industrialWires.blocks.ItemBlockIW; import malte0811.industrialwires.blocks.ItemBlockIW;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.client.resources.I18n; import net.minecraft.client.resources.I18n;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.math.MathHelper; import net.minecraft.util.math.MathHelper;
import static malte0811.industrialWires.util.NBTKeys.ANGLE; import static malte0811.industrialwires.util.NBTKeys.ANGLE;
import static malte0811.industrialWires.util.NBTKeys.HEIGHT; import static malte0811.industrialwires.util.NBTKeys.HEIGHT;
public class ItemBlockPanel extends ItemBlockIW implements IConfigurableTool { public class ItemBlockPanel extends ItemBlockIW implements IConfigurableTool {

12
src/main/java/malte0811/industrialWires/blocks/controlpanel/TileEntityComponentPanel.java → src/main/java/malte0811/industrialwires/blocks/controlpanel/TileEntityComponentPanel.java
View file

@ -13,12 +13,12 @@
* along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>. * along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>.
*/ */
package malte0811.industrialWires.blocks.controlpanel; package malte0811.industrialwires.blocks.controlpanel;
import malte0811.industrialWires.controlpanel.ControlPanelNetwork; import malte0811.industrialwires.controlpanel.ControlPanelNetwork;
import malte0811.industrialWires.controlpanel.PanelComponent; import malte0811.industrialwires.controlpanel.PanelComponent;
import malte0811.industrialWires.controlpanel.PropertyComponents; import malte0811.industrialwires.controlpanel.PropertyComponents;
import malte0811.industrialWires.items.ItemPanelComponent; import malte0811.industrialwires.items.ItemPanelComponent;
import net.minecraft.block.BlockRedstoneWire; import net.minecraft.block.BlockRedstoneWire;
import net.minecraft.block.state.IBlockState; import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
@ -30,7 +30,7 @@ import net.minecraft.util.math.BlockPos;
import javax.annotation.Nonnull; import javax.annotation.Nonnull;
import static malte0811.industrialWires.util.MiscUtils.apply; import static malte0811.industrialwires.util.MiscUtils.apply;
public class TileEntityComponentPanel extends TileEntityPanel { public class TileEntityComponentPanel extends TileEntityPanel {
private byte rsOut = 0; private byte rsOut = 0;

10
src/main/java/malte0811/industrialWires/blocks/controlpanel/TileEntityGeneralCP.java → src/main/java/malte0811/industrialwires/blocks/controlpanel/TileEntityGeneralCP.java
View file

@ -13,12 +13,12 @@
* along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>. * along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>.
*/ */
package malte0811.industrialWires.blocks.controlpanel; package malte0811.industrialwires.blocks.controlpanel;
import malte0811.industrialWires.blocks.TileEntityIWBase; import malte0811.industrialwires.blocks.TileEntityIWBase;
import malte0811.industrialWires.controlpanel.ControlPanelNetwork; import malte0811.industrialwires.controlpanel.ControlPanelNetwork;
import malte0811.industrialWires.controlpanel.ControlPanelNetwork.IOwner; import malte0811.industrialwires.controlpanel.ControlPanelNetwork.IOwner;
import malte0811.industrialWires.util.MiscUtils; import malte0811.industrialwires.util.MiscUtils;
import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumFacing;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;

14
src/main/java/malte0811/industrialWires/blocks/controlpanel/TileEntityPanel.java → src/main/java/malte0811/industrialwires/blocks/controlpanel/TileEntityPanel.java
View file

@ -13,17 +13,17 @@
* along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>. * along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>.
*/ */
package malte0811.industrialWires.blocks.controlpanel; package malte0811.industrialwires.blocks.controlpanel;
import blusunrize.immersiveengineering.common.blocks.IEBlockInterfaces; import blusunrize.immersiveengineering.common.blocks.IEBlockInterfaces;
import blusunrize.immersiveengineering.common.blocks.IEBlockInterfaces.IDirectionalTile; import blusunrize.immersiveengineering.common.blocks.IEBlockInterfaces.IDirectionalTile;
import blusunrize.immersiveengineering.common.blocks.IEBlockInterfaces.IPlayerInteraction; import blusunrize.immersiveengineering.common.blocks.IEBlockInterfaces.IPlayerInteraction;
import blusunrize.immersiveengineering.common.util.chickenbones.Matrix4; import blusunrize.immersiveengineering.common.util.chickenbones.Matrix4;
import malte0811.industrialWires.IndustrialWires; import malte0811.industrialwires.IndustrialWires;
import malte0811.industrialWires.blocks.IBlockBoundsIW; import malte0811.industrialwires.blocks.IBlockBoundsIW;
import malte0811.industrialWires.controlpanel.*; import malte0811.industrialwires.controlpanel.*;
import malte0811.industrialWires.controlpanel.ControlPanelNetwork.RSChannel; import malte0811.industrialwires.controlpanel.ControlPanelNetwork.RSChannel;
import malte0811.industrialWires.network.MessagePanelInteract; import malte0811.industrialwires.network.MessagePanelInteract;
import net.minecraft.block.state.IBlockState; import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
@ -44,7 +44,7 @@ import org.apache.commons.lang3.tuple.Pair;
import javax.annotation.Nonnull; import javax.annotation.Nonnull;
import javax.annotation.Nullable; import javax.annotation.Nullable;
import static malte0811.industrialWires.util.MiscUtils.apply; import static malte0811.industrialwires.util.MiscUtils.apply;
public class TileEntityPanel extends TileEntityGeneralCP implements IDirectionalTile, IBlockBoundsIW, IPlayerInteraction, public class TileEntityPanel extends TileEntityGeneralCP implements IDirectionalTile, IBlockBoundsIW, IPlayerInteraction,
ITickable, IEBlockInterfaces.ITileDrop { ITickable, IEBlockInterfaces.ITileDrop {

18
src/main/java/malte0811/industrialWires/blocks/controlpanel/TileEntityPanelCreator.java → src/main/java/malte0811/industrialwires/blocks/controlpanel/TileEntityPanelCreator.java
View file

@ -13,16 +13,16 @@
* along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>. * along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>.
*/ */
package malte0811.industrialWires.blocks.controlpanel; package malte0811.industrialwires.blocks.controlpanel;
import malte0811.industrialWires.IndustrialWires; import malte0811.industrialwires.IndustrialWires;
import malte0811.industrialWires.blocks.IBlockBoundsIW; import malte0811.industrialwires.blocks.IBlockBoundsIW;
import malte0811.industrialWires.blocks.INetGUI; import malte0811.industrialwires.blocks.INetGUI;
import malte0811.industrialWires.blocks.TileEntityIWBase; import malte0811.industrialwires.blocks.TileEntityIWBase;
import malte0811.industrialWires.controlpanel.MessageType; import malte0811.industrialwires.controlpanel.MessageType;
import malte0811.industrialWires.controlpanel.PanelComponent; import malte0811.industrialwires.controlpanel.PanelComponent;
import malte0811.industrialWires.controlpanel.PanelUtils; import malte0811.industrialwires.controlpanel.PanelUtils;
import malte0811.industrialWires.items.ItemPanelComponent; import malte0811.industrialwires.items.ItemPanelComponent;
import net.minecraft.block.state.IBlockState; import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;

6
src/main/java/malte0811/industrialWires/blocks/controlpanel/TileEntityRSPanel.java → src/main/java/malte0811/industrialwires/blocks/controlpanel/TileEntityRSPanel.java
View file

@ -13,10 +13,10 @@
* along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>. * along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>.
*/ */
package malte0811.industrialWires.blocks.controlpanel; package malte0811.industrialwires.blocks.controlpanel;
import malte0811.industrialWires.blocks.INetGUI; import malte0811.industrialwires.blocks.INetGUI;
import malte0811.industrialWires.controlpanel.ControlPanelNetwork; import malte0811.industrialwires.controlpanel.ControlPanelNetwork;
import net.minecraft.block.state.IBlockState; import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagCompound;

4
src/main/java/malte0811/industrialWires/blocks/controlpanel/TileEntityRSPanelIE.java → src/main/java/malte0811/industrialwires/blocks/controlpanel/TileEntityRSPanelIE.java
View file

@ -13,7 +13,7 @@
* along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>. * along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>.
*/ */
package malte0811.industrialWires.blocks.controlpanel; package malte0811.industrialwires.blocks.controlpanel;
import blusunrize.immersiveengineering.api.TargetingInfo; import blusunrize.immersiveengineering.api.TargetingInfo;
import blusunrize.immersiveengineering.api.energy.wires.IImmersiveConnectable; import blusunrize.immersiveengineering.api.energy.wires.IImmersiveConnectable;
@ -22,7 +22,7 @@ import blusunrize.immersiveengineering.api.energy.wires.WireType;
import blusunrize.immersiveengineering.api.energy.wires.redstone.IRedstoneConnector; import blusunrize.immersiveengineering.api.energy.wires.redstone.IRedstoneConnector;
import blusunrize.immersiveengineering.api.energy.wires.redstone.RedstoneWireNetwork; import blusunrize.immersiveengineering.api.energy.wires.redstone.RedstoneWireNetwork;
import blusunrize.immersiveengineering.common.blocks.IEBlockInterfaces; import blusunrize.immersiveengineering.common.blocks.IEBlockInterfaces;
import malte0811.industrialWires.blocks.IBlockBoundsIW; import malte0811.industrialwires.blocks.IBlockBoundsIW;
import net.minecraft.block.state.IBlockState; import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.EntityLivingBase;
import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagCompound;

6
src/main/java/malte0811/industrialWires/blocks/controlpanel/TileEntityRSPanelOthers.java → src/main/java/malte0811/industrialwires/blocks/controlpanel/TileEntityRSPanelOthers.java
View file

@ -13,10 +13,10 @@
* along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>. * along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>.
*/ */
package malte0811.industrialWires.blocks.controlpanel; package malte0811.industrialwires.blocks.controlpanel;
import malte0811.industrialWires.compat.Compat; import malte0811.industrialwires.compat.Compat;
import malte0811.industrialWires.compat.CompatCapabilities.Charset; import malte0811.industrialwires.compat.CompatCapabilities.Charset;
import mrtjp.projectred.api.IBundledTile; import mrtjp.projectred.api.IBundledTile;
import mrtjp.projectred.api.ProjectRedAPI; import mrtjp.projectred.api.ProjectRedAPI;
import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumFacing;

2
src/main/java/malte0811/industrialWires/blocks/controlpanel/TileEntityUnfinishedPanel.java → src/main/java/malte0811/industrialwires/blocks/controlpanel/TileEntityUnfinishedPanel.java
View file

@ -13,7 +13,7 @@
* along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>. * along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>.
*/ */
package malte0811.industrialWires.blocks.controlpanel; package malte0811.industrialwires.blocks.controlpanel;
import net.minecraft.block.state.IBlockState; import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;

6
src/main/java/malte0811/industrialWires/blocks/converter/BlockMechanicalConverter.java → src/main/java/malte0811/industrialwires/blocks/converter/BlockMechanicalConverter.java
View file

@ -12,11 +12,11 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>. * along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>.
*/ */
package malte0811.industrialWires.blocks.converter; package malte0811.industrialwires.blocks.converter;
import blusunrize.immersiveengineering.api.IEProperties; import blusunrize.immersiveengineering.api.IEProperties;
import malte0811.industrialWires.blocks.BlockIWBase; import malte0811.industrialwires.blocks.BlockIWBase;
import malte0811.industrialWires.blocks.IMetaEnum; import malte0811.industrialwires.blocks.IMetaEnum;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import net.minecraft.block.properties.IProperty; import net.minecraft.block.properties.IProperty;
import net.minecraft.block.properties.PropertyEnum; import net.minecraft.block.properties.PropertyEnum;

8
src/main/java/malte0811/industrialWires/blocks/converter/BlockMechanicalMB.java → src/main/java/malte0811/industrialwires/blocks/converter/BlockMechanicalMB.java
View file

@ -13,12 +13,12 @@
* along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>. * along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>.
*/ */
package malte0811.industrialWires.blocks.converter; package malte0811.industrialwires.blocks.converter;
import blusunrize.immersiveengineering.api.IEProperties; import blusunrize.immersiveengineering.api.IEProperties;
import malte0811.industrialWires.blocks.BlockIWMultiblock; import malte0811.industrialwires.blocks.BlockIWMultiblock;
import malte0811.industrialWires.blocks.IMetaEnum; import malte0811.industrialwires.blocks.IMetaEnum;
import malte0811.industrialWires.blocks.IWProperties; import malte0811.industrialwires.blocks.IWProperties;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import net.minecraft.block.properties.IProperty; import net.minecraft.block.properties.IProperty;
import net.minecraft.block.properties.PropertyEnum; import net.minecraft.block.properties.PropertyEnum;

2
src/main/java/malte0811/industrialWires/blocks/converter/MechanicalBlockType.java → src/main/java/malte0811/industrialwires/blocks/converter/MechanicalBlockType.java
View file

@ -12,7 +12,7 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>. * along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>.
*/ */
package malte0811.industrialWires.blocks.converter; package malte0811.industrialwires.blocks.converter;
import net.minecraft.util.IStringSerializable; import net.minecraft.util.IStringSerializable;

2
src/main/java/malte0811/industrialWires/blocks/converter/MechanicalMBBlockType.java → src/main/java/malte0811/industrialwires/blocks/converter/MechanicalMBBlockType.java
View file

@ -13,7 +13,7 @@
* along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>. * along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>.
*/ */
package malte0811.industrialWires.blocks.converter; package malte0811.industrialwires.blocks.converter;
import net.minecraft.util.IStringSerializable; import net.minecraft.util.IStringSerializable;

12
src/main/java/malte0811/industrialWires/blocks/converter/TileEntityIEMotor.java → src/main/java/malte0811/industrialwires/blocks/converter/TileEntityIEMotor.java
View file

@ -12,16 +12,16 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>. * along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>.
*/ */
package malte0811.industrialWires.blocks.converter; package malte0811.industrialwires.blocks.converter;
import blusunrize.immersiveengineering.api.energy.IRotationAcceptor; import blusunrize.immersiveengineering.api.energy.IRotationAcceptor;
import blusunrize.immersiveengineering.api.energy.immersiveflux.FluxStorage; import blusunrize.immersiveengineering.api.energy.immersiveflux.FluxStorage;
import blusunrize.immersiveengineering.api.energy.immersiveflux.IFluxReceiver; import blusunrize.immersiveengineering.api.energy.immersiveflux.IFluxReceiver;
import blusunrize.immersiveengineering.common.blocks.IEBlockInterfaces.IDirectionalTile; import blusunrize.immersiveengineering.common.blocks.IEBlockInterfaces.IDirectionalTile;
import malte0811.industrialWires.IWConfig.MechConversion; import malte0811.industrialwires.IWConfig.MechConversion;
import malte0811.industrialWires.blocks.EnergyAdapter; import malte0811.industrialwires.blocks.EnergyAdapter;
import malte0811.industrialWires.blocks.TileEntityIWBase; import malte0811.industrialwires.blocks.TileEntityIWBase;
import malte0811.industrialWires.util.ConversionUtil; import malte0811.industrialwires.util.ConversionUtil;
import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.EntityLivingBase;
import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
@ -36,7 +36,7 @@ import javax.annotation.Nonnull;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import static malte0811.industrialWires.util.NBTKeys.*; import static malte0811.industrialwires.util.NBTKeys.*;
public class TileEntityIEMotor extends TileEntityIWBase implements ITickable, IFluxReceiver, IDirectionalTile { public class TileEntityIEMotor extends TileEntityIWBase implements ITickable, IFluxReceiver, IDirectionalTile {
private double rotBuffer = 0; private double rotBuffer = 0;

12
src/main/java/malte0811/industrialWires/blocks/converter/TileEntityMechICtoIE.java → src/main/java/malte0811/industrialwires/blocks/converter/TileEntityMechICtoIE.java
View file

@ -12,14 +12,14 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>. * along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>.
*/ */
package malte0811.industrialWires.blocks.converter; package malte0811.industrialwires.blocks.converter;
import blusunrize.immersiveengineering.api.energy.IRotationAcceptor; import blusunrize.immersiveengineering.api.energy.IRotationAcceptor;
import blusunrize.immersiveengineering.common.blocks.IEBlockInterfaces.IDirectionalTile; import blusunrize.immersiveengineering.common.blocks.IEBlockInterfaces.IDirectionalTile;
import ic2.api.energy.tile.IKineticSource; import ic2.api.energy.tile.IKineticSource;
import malte0811.industrialWires.IWConfig.MechConversion; import malte0811.industrialwires.IWConfig.MechConversion;
import malte0811.industrialWires.blocks.TileEntityIWBase; import malte0811.industrialwires.blocks.TileEntityIWBase;
import malte0811.industrialWires.util.ConversionUtil; import malte0811.industrialwires.util.ConversionUtil;
import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.EntityLivingBase;
import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
@ -29,8 +29,8 @@ import net.minecraft.util.math.BlockPos;
import javax.annotation.Nonnull; import javax.annotation.Nonnull;
import static malte0811.industrialWires.util.NBTKeys.BUFFER; import static malte0811.industrialwires.util.NBTKeys.BUFFER;
import static malte0811.industrialWires.util.NBTKeys.DIRECTION; import static malte0811.industrialwires.util.NBTKeys.DIRECTION;
public class TileEntityMechICtoIE extends TileEntityIWBase implements IDirectionalTile, ITickable { public class TileEntityMechICtoIE extends TileEntityIWBase implements IDirectionalTile, ITickable {
private EnumFacing dir = EnumFacing.DOWN; private EnumFacing dir = EnumFacing.DOWN;

14
src/main/java/malte0811/industrialWires/blocks/converter/TileEntityMechIEtoIC.java → src/main/java/malte0811/industrialwires/blocks/converter/TileEntityMechIEtoIC.java
View file

@ -12,23 +12,23 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>. * along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>.
*/ */
package malte0811.industrialWires.blocks.converter; package malte0811.industrialwires.blocks.converter;
import blusunrize.immersiveengineering.api.energy.IRotationAcceptor; import blusunrize.immersiveengineering.api.energy.IRotationAcceptor;
import blusunrize.immersiveengineering.common.blocks.IEBlockInterfaces.IDirectionalTile; import blusunrize.immersiveengineering.common.blocks.IEBlockInterfaces.IDirectionalTile;
import ic2.api.energy.tile.IKineticSource; import ic2.api.energy.tile.IKineticSource;
import malte0811.industrialWires.IWConfig.MechConversion; import malte0811.industrialwires.IWConfig.MechConversion;
import malte0811.industrialWires.blocks.TileEntityIWBase; import malte0811.industrialwires.blocks.TileEntityIWBase;
import malte0811.industrialWires.util.ConversionUtil; import malte0811.industrialwires.util.ConversionUtil;
import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.EntityLivingBase;
import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumFacing;
import javax.annotation.Nonnull; import javax.annotation.Nonnull;
import static malte0811.industrialWires.IWConfig.MechConversion.maxRotToKin; import static malte0811.industrialwires.IWConfig.MechConversion.maxRotToKin;
import static malte0811.industrialWires.util.NBTKeys.BUFFER; import static malte0811.industrialwires.util.NBTKeys.BUFFER;
import static malte0811.industrialWires.util.NBTKeys.DIRECTION; import static malte0811.industrialwires.util.NBTKeys.DIRECTION;
public class TileEntityMechIEtoIC extends TileEntityIWBase implements IDirectionalTile, IRotationAcceptor, IKineticSource { public class TileEntityMechIEtoIC extends TileEntityIWBase implements IDirectionalTile, IRotationAcceptor, IKineticSource {
private EnumFacing dir = EnumFacing.DOWN; private EnumFacing dir = EnumFacing.DOWN;

30
src/main/java/malte0811/industrialWires/blocks/converter/TileEntityMechMB.java → src/main/java/malte0811/industrialwires/blocks/converter/TileEntityMechMB.java
View file

@ -13,7 +13,7 @@
* along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>. * along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>.
*/ */
package malte0811.industrialWires.blocks.converter; package malte0811.industrialwires.blocks.converter;
import blusunrize.immersiveengineering.api.ApiUtils; import blusunrize.immersiveengineering.api.ApiUtils;
import blusunrize.immersiveengineering.common.blocks.IEBlockInterfaces.IPlayerInteraction; import blusunrize.immersiveengineering.common.blocks.IEBlockInterfaces.IPlayerInteraction;
@ -25,14 +25,14 @@ import ic2.api.energy.tile.IEnergyAcceptor;
import ic2.api.energy.tile.IEnergyEmitter; import ic2.api.energy.tile.IEnergyEmitter;
import ic2.api.energy.tile.IEnergySink; import ic2.api.energy.tile.IEnergySink;
import ic2.api.energy.tile.IEnergySource; import ic2.api.energy.tile.IEnergySource;
import malte0811.industrialWires.IndustrialWires; import malte0811.industrialwires.IndustrialWires;
import malte0811.industrialWires.blocks.IBlockBoundsIW.IBlockBoundsDirectional; import malte0811.industrialwires.blocks.IBlockBoundsIW.IBlockBoundsDirectional;
import malte0811.industrialWires.blocks.ISyncReceiver; import malte0811.industrialwires.blocks.ISyncReceiver;
import malte0811.industrialWires.blocks.TileEntityIWMultiblock; import malte0811.industrialwires.blocks.TileEntityIWMultiblock;
import malte0811.industrialWires.compat.Compat; import malte0811.industrialwires.compat.Compat;
import malte0811.industrialWires.mech_mb.*; import malte0811.industrialwires.mech_mb.*;
import malte0811.industrialWires.network.MessageTileSyncIW; import malte0811.industrialwires.network.MessageTileSyncIW;
import malte0811.industrialWires.util.LocalSidedWorld; import malte0811.industrialwires.util.LocalSidedWorld;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.block.state.IBlockState; import net.minecraft.block.state.IBlockState;
import net.minecraft.client.renderer.block.model.BakedQuad; import net.minecraft.client.renderer.block.model.BakedQuad;
@ -58,12 +58,12 @@ import javax.annotation.Nullable;
import java.util.*; import java.util.*;
import static blusunrize.immersiveengineering.common.blocks.metal.BlockTypes_MetalDecoration0.HEAVY_ENGINEERING; import static blusunrize.immersiveengineering.common.blocks.metal.BlockTypes_MetalDecoration0.HEAVY_ENGINEERING;
import static malte0811.industrialWires.IEObjects.blockMetalDecoration0; import static malte0811.industrialwires.IEObjects.blockMetalDecoration0;
import static malte0811.industrialWires.IndustrialWires.MMB_BREAKING; import static malte0811.industrialwires.IndustrialWires.MMB_BREAKING;
import static malte0811.industrialWires.mech_mb.EUCapability.ENERGY_IC2; import static malte0811.industrialwires.mech_mb.EUCapability.ENERGY_IC2;
import static malte0811.industrialWires.util.MiscUtils.getOffset; import static malte0811.industrialwires.util.MiscUtils.getOffset;
import static malte0811.industrialWires.util.MiscUtils.offset; import static malte0811.industrialwires.util.MiscUtils.offset;
import static malte0811.industrialWires.util.NBTKeys.*; import static malte0811.industrialwires.util.NBTKeys.*;
@net.minecraftforge.fml.common.Optional.InterfaceList({ @net.minecraftforge.fml.common.Optional.InterfaceList({
@net.minecraftforge.fml.common.Optional.Interface(iface = "ic2.api.energy.tile.IEnergySource", modid = "ic2"), @net.minecraftforge.fml.common.Optional.Interface(iface = "ic2.api.energy.tile.IEnergySource", modid = "ic2"),

6
src/main/java/malte0811/industrialWires/blocks/hv/BlockGeneralHV.java → src/main/java/malte0811/industrialwires/blocks/hv/BlockGeneralHV.java
View file

@ -13,11 +13,11 @@
* along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>. * along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>.
*/ */
package malte0811.industrialWires.blocks.hv; package malte0811.industrialwires.blocks.hv;
import blusunrize.immersiveengineering.api.IEProperties; import blusunrize.immersiveengineering.api.IEProperties;
import malte0811.industrialWires.blocks.BlockIWBase; import malte0811.industrialwires.blocks.BlockIWBase;
import malte0811.industrialWires.blocks.IMetaEnum; import malte0811.industrialwires.blocks.IMetaEnum;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import net.minecraft.block.properties.IProperty; import net.minecraft.block.properties.IProperty;
import net.minecraft.block.properties.PropertyEnum; import net.minecraft.block.properties.PropertyEnum;

8
src/main/java/malte0811/industrialWires/blocks/hv/BlockHVMultiblocks.java → src/main/java/malte0811/industrialwires/blocks/hv/BlockHVMultiblocks.java
View file

@ -13,12 +13,12 @@
* along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>. * along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>.
*/ */
package malte0811.industrialWires.blocks.hv; package malte0811.industrialwires.blocks.hv;
import blusunrize.immersiveengineering.api.IEProperties; import blusunrize.immersiveengineering.api.IEProperties;
import malte0811.industrialWires.blocks.BlockIWMultiblock; import malte0811.industrialwires.blocks.BlockIWMultiblock;
import malte0811.industrialWires.blocks.IMetaEnum; import malte0811.industrialwires.blocks.IMetaEnum;
import malte0811.industrialWires.blocks.IWProperties; import malte0811.industrialwires.blocks.IWProperties;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import net.minecraft.block.properties.IProperty; import net.minecraft.block.properties.IProperty;
import net.minecraft.block.properties.PropertyEnum; import net.minecraft.block.properties.PropertyEnum;

10
src/main/java/malte0811/industrialWires/blocks/hv/BlockJacobsLadder.java → src/main/java/malte0811/industrialwires/blocks/hv/BlockJacobsLadder.java
View file

@ -13,13 +13,13 @@
* along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>. * along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>.
*/ */
package malte0811.industrialWires.blocks.hv; package malte0811.industrialwires.blocks.hv;
import blusunrize.immersiveengineering.api.IEProperties; import blusunrize.immersiveengineering.api.IEProperties;
import malte0811.industrialWires.blocks.BlockIWBase; import malte0811.industrialwires.blocks.BlockIWBase;
import malte0811.industrialWires.blocks.IMetaEnum; import malte0811.industrialwires.blocks.IMetaEnum;
import malte0811.industrialWires.blocks.IPlacementCheck; import malte0811.industrialwires.blocks.IPlacementCheck;
import malte0811.industrialWires.blocks.hv.TileEntityJacobsLadder.LadderSize; import malte0811.industrialwires.blocks.hv.TileEntityJacobsLadder.LadderSize;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import net.minecraft.block.properties.IProperty; import net.minecraft.block.properties.IProperty;
import net.minecraft.block.properties.PropertyEnum; import net.minecraft.block.properties.PropertyEnum;

2
src/main/java/malte0811/industrialWires/blocks/hv/BlockTypes_GeneralHV.java → src/main/java/malte0811/industrialwires/blocks/hv/BlockTypes_GeneralHV.java
View file

@ -13,7 +13,7 @@
* along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>. * along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>.
*/ */
package malte0811.industrialWires.blocks.hv; package malte0811.industrialwires.blocks.hv;
import net.minecraft.util.IStringSerializable; import net.minecraft.util.IStringSerializable;

2
src/main/java/malte0811/industrialWires/blocks/hv/BlockTypes_HVMultiblocks.java → src/main/java/malte0811/industrialwires/blocks/hv/BlockTypes_HVMultiblocks.java
View file

@ -13,7 +13,7 @@
* along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>. * along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>.
*/ */
package malte0811.industrialWires.blocks.hv; package malte0811.industrialwires.blocks.hv;
import blusunrize.immersiveengineering.common.blocks.BlockIEBase; import blusunrize.immersiveengineering.common.blocks.BlockIEBase;

10
src/main/java/malte0811/industrialWires/blocks/hv/TileEntityDischargeMeter.java → src/main/java/malte0811/industrialwires/blocks/hv/TileEntityDischargeMeter.java
View file

@ -13,15 +13,15 @@
* along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>. * along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>.
*/ */
package malte0811.industrialWires.blocks.hv; package malte0811.industrialwires.blocks.hv;
import blusunrize.immersiveengineering.api.ApiUtils; import blusunrize.immersiveengineering.api.ApiUtils;
import blusunrize.immersiveengineering.common.blocks.IEBlockInterfaces.IDirectionalTile; import blusunrize.immersiveengineering.common.blocks.IEBlockInterfaces.IDirectionalTile;
import blusunrize.immersiveengineering.common.blocks.IEBlockInterfaces.IPlayerInteraction; import blusunrize.immersiveengineering.common.blocks.IEBlockInterfaces.IPlayerInteraction;
import malte0811.industrialWires.IndustrialWires; import malte0811.industrialwires.IndustrialWires;
import malte0811.industrialWires.blocks.IBlockBoundsIW.IBlockBoundsDirectional; import malte0811.industrialwires.blocks.IBlockBoundsIW.IBlockBoundsDirectional;
import malte0811.industrialWires.blocks.TileEntityIWBase; import malte0811.industrialwires.blocks.TileEntityIWBase;
import malte0811.industrialWires.hv.IMarxTarget; import malte0811.industrialwires.hv.IMarxTarget;
import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;

28
src/main/java/malte0811/industrialWires/blocks/hv/TileEntityJacobsLadder.java → src/main/java/malte0811/industrialwires/blocks/hv/TileEntityJacobsLadder.java
View file

@ -13,7 +13,7 @@
* along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>. * along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>.
*/ */
package malte0811.industrialWires.blocks.hv; package malte0811.industrialwires.blocks.hv;
import blusunrize.immersiveengineering.api.ApiUtils; import blusunrize.immersiveengineering.api.ApiUtils;
import blusunrize.immersiveengineering.common.blocks.IEBlockInterfaces; import blusunrize.immersiveengineering.common.blocks.IEBlockInterfaces;
@ -23,17 +23,17 @@ import com.elytradev.mirage.lighting.IColoredLight;
import com.elytradev.mirage.lighting.Light; import com.elytradev.mirage.lighting.Light;
import ic2.api.energy.tile.IEnergyEmitter; import ic2.api.energy.tile.IEnergyEmitter;
import ic2.api.energy.tile.IEnergySink; import ic2.api.energy.tile.IEnergySink;
import malte0811.industrialWires.IWConfig; import malte0811.industrialwires.IWConfig;
import malte0811.industrialWires.IWDamageSources; import malte0811.industrialwires.IWDamageSources;
import malte0811.industrialWires.IndustrialWires; import malte0811.industrialwires.IndustrialWires;
import malte0811.industrialWires.blocks.IBlockBoundsIW; import malte0811.industrialwires.blocks.IBlockBoundsIW;
import malte0811.industrialWires.blocks.IHasDummyBlocksIW; import malte0811.industrialwires.blocks.IHasDummyBlocksIW;
import malte0811.industrialWires.blocks.ISyncReceiver; import malte0811.industrialwires.blocks.ISyncReceiver;
import malte0811.industrialWires.compat.Compat; import malte0811.industrialwires.compat.Compat;
import malte0811.industrialWires.network.MessageTileSyncIW; import malte0811.industrialwires.network.MessageTileSyncIW;
import malte0811.industrialWires.util.Beziers; import malte0811.industrialwires.util.Beziers;
import malte0811.industrialWires.util.ConversionUtil; import malte0811.industrialwires.util.ConversionUtil;
import malte0811.industrialWires.util.JouleEnergyStorage; import malte0811.industrialwires.util.JouleEnergyStorage;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.block.state.IBlockState; import net.minecraft.block.state.IBlockState;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
@ -61,8 +61,8 @@ import net.minecraftforge.fml.relauncher.SideOnly;
import javax.annotation.Nonnull; import javax.annotation.Nonnull;
import javax.annotation.Nullable; import javax.annotation.Nullable;
import static malte0811.industrialWires.IndustrialWires.hasIC2; import static malte0811.industrialwires.IndustrialWires.hasIC2;
import static malte0811.industrialWires.util.MiscUtils.interpolate; import static malte0811.industrialwires.util.MiscUtils.interpolate;
@Optional.InterfaceList({ @Optional.InterfaceList({
@Optional.Interface(modid = "ic2", iface = "ic2.api.energy.tile.IEnergySink"), @Optional.Interface(modid = "ic2", iface = "ic2.api.energy.tile.IEnergySink"),

38
src/main/java/malte0811/industrialWires/blocks/hv/TileEntityMarx.java → src/main/java/malte0811/industrialwires/blocks/hv/TileEntityMarx.java
View file

@ -13,7 +13,7 @@
* along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>. * along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>.
*/ */
package malte0811.industrialWires.blocks.hv; package malte0811.industrialwires.blocks.hv;
import blusunrize.immersiveengineering.api.ApiUtils; import blusunrize.immersiveengineering.api.ApiUtils;
import blusunrize.immersiveengineering.api.IEProperties; import blusunrize.immersiveengineering.api.IEProperties;
@ -29,19 +29,19 @@ import blusunrize.immersiveengineering.common.util.Utils;
import blusunrize.immersiveengineering.common.util.chickenbones.Matrix4; import blusunrize.immersiveengineering.common.util.chickenbones.Matrix4;
import com.elytradev.mirage.event.GatherLightsEvent; import com.elytradev.mirage.event.GatherLightsEvent;
import com.elytradev.mirage.lighting.Light; import com.elytradev.mirage.lighting.Light;
import malte0811.industrialWires.*; import malte0811.industrialwires.*;
import malte0811.industrialWires.blocks.IBlockBoundsIW; import malte0811.industrialwires.blocks.IBlockBoundsIW;
import malte0811.industrialWires.blocks.ISyncReceiver; import malte0811.industrialwires.blocks.ISyncReceiver;
import malte0811.industrialWires.blocks.IWProperties; import malte0811.industrialwires.blocks.IWProperties;
import malte0811.industrialWires.blocks.TileEntityIWMultiblock; import malte0811.industrialwires.blocks.TileEntityIWMultiblock;
import malte0811.industrialWires.hv.IMarxTarget; import malte0811.industrialwires.hv.IMarxTarget;
import malte0811.industrialWires.hv.MarxOreHandler; import malte0811.industrialwires.hv.MarxOreHandler;
import malte0811.industrialWires.network.MessageTileSyncIW; import malte0811.industrialwires.network.MessageTileSyncIW;
import malte0811.industrialWires.util.ConversionUtil; import malte0811.industrialwires.util.ConversionUtil;
import malte0811.industrialWires.util.JouleEnergyStorage; import malte0811.industrialwires.util.JouleEnergyStorage;
import malte0811.industrialWires.util.MiscUtils; import malte0811.industrialwires.util.MiscUtils;
import malte0811.industrialWires.wires.EnergyType; import malte0811.industrialwires.wires.EnergyType;
import malte0811.industrialWires.wires.MixedWireType; import malte0811.industrialwires.wires.MixedWireType;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.block.state.IBlockState; import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.Entity; import net.minecraft.entity.Entity;
@ -71,11 +71,11 @@ import javax.annotation.Nullable;
import java.util.*; import java.util.*;
import static blusunrize.immersiveengineering.api.energy.wires.WireType.REDSTONE_CATEGORY; import static blusunrize.immersiveengineering.api.energy.wires.WireType.REDSTONE_CATEGORY;
import static malte0811.industrialWires.blocks.hv.TileEntityMarx.FiringState.FIRE; import static malte0811.industrialwires.blocks.hv.TileEntityMarx.FiringState.FIRE;
import static malte0811.industrialWires.util.MiscUtils.getOffset; import static malte0811.industrialwires.util.MiscUtils.getOffset;
import static malte0811.industrialWires.util.MiscUtils.offset; import static malte0811.industrialwires.util.MiscUtils.offset;
import static malte0811.industrialWires.util.NBTKeys.*; import static malte0811.industrialwires.util.NBTKeys.*;
import static malte0811.industrialWires.wires.MixedWireType.IC2_HV_CAT; import static malte0811.industrialwires.wires.MixedWireType.IC2_HV_CAT;
import static net.minecraft.item.EnumDyeColor.*; import static net.minecraft.item.EnumDyeColor.*;
/** /**

14
src/main/java/malte0811/industrialWires/blocks/wire/BlockIC2Connector.java → src/main/java/malte0811/industrialwires/blocks/wire/BlockIC2Connector.java
View file

@ -12,15 +12,15 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>. * along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>.
*/ */
package malte0811.industrialWires.blocks.wire; package malte0811.industrialwires.blocks.wire;
import blusunrize.immersiveengineering.api.IEProperties; import blusunrize.immersiveengineering.api.IEProperties;
import malte0811.industrialWires.IWConfig; import malte0811.industrialwires.IWConfig;
import malte0811.industrialWires.IndustrialWires; import malte0811.industrialwires.IndustrialWires;
import malte0811.industrialWires.blocks.BlockIWBase; import malte0811.industrialwires.blocks.BlockIWBase;
import malte0811.industrialWires.blocks.IMetaEnum; import malte0811.industrialwires.blocks.IMetaEnum;
import malte0811.industrialWires.util.ConversionUtil; import malte0811.industrialwires.util.ConversionUtil;
import malte0811.industrialWires.wires.MixedWireType; import malte0811.industrialwires.wires.MixedWireType;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import net.minecraft.block.properties.IProperty; import net.minecraft.block.properties.IProperty;

2
src/main/java/malte0811/industrialWires/blocks/wire/BlockTypes_IC2_Connector.java → src/main/java/malte0811/industrialwires/blocks/wire/BlockTypes_IC2_Connector.java
View file

@ -12,7 +12,7 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>. * along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>.
*/ */
package malte0811.industrialWires.blocks.wire; package malte0811.industrialwires.blocks.wire;
import blusunrize.immersiveengineering.common.blocks.BlockIEBase.IBlockEnum; import blusunrize.immersiveengineering.common.blocks.BlockIEBase.IBlockEnum;

4
src/main/java/malte0811/industrialWires/blocks/wire/TileEntityIC2ConnectorCopper.java → src/main/java/malte0811/industrialwires/blocks/wire/TileEntityIC2ConnectorCopper.java
View file

@ -12,9 +12,9 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>. * along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>.
*/ */
package malte0811.industrialWires.blocks.wire; package malte0811.industrialwires.blocks.wire;
import static malte0811.industrialWires.wires.MixedWireType.COPPER_IC2; import static malte0811.industrialwires.wires.MixedWireType.COPPER_IC2;
public class TileEntityIC2ConnectorCopper extends TileEntityIC2ConnectorTin { public class TileEntityIC2ConnectorCopper extends TileEntityIC2ConnectorTin {

4
src/main/java/malte0811/industrialWires/blocks/wire/TileEntityIC2ConnectorGlass.java → src/main/java/malte0811/industrialwires/blocks/wire/TileEntityIC2ConnectorGlass.java
View file

@ -12,9 +12,9 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>. * along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>.
*/ */
package malte0811.industrialWires.blocks.wire; package malte0811.industrialwires.blocks.wire;
import static malte0811.industrialWires.wires.MixedWireType.GLASS; import static malte0811.industrialwires.wires.MixedWireType.GLASS;
public class TileEntityIC2ConnectorGlass extends TileEntityIC2ConnectorTin { public class TileEntityIC2ConnectorGlass extends TileEntityIC2ConnectorTin {
public TileEntityIC2ConnectorGlass(boolean rel) { public TileEntityIC2ConnectorGlass(boolean rel) {

4
src/main/java/malte0811/industrialWires/blocks/wire/TileEntityIC2ConnectorGold.java → src/main/java/malte0811/industrialwires/blocks/wire/TileEntityIC2ConnectorGold.java
View file

@ -12,9 +12,9 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>. * along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>.
*/ */
package malte0811.industrialWires.blocks.wire; package malte0811.industrialwires.blocks.wire;
import static malte0811.industrialWires.wires.MixedWireType.GOLD; import static malte0811.industrialwires.wires.MixedWireType.GOLD;
public class TileEntityIC2ConnectorGold extends TileEntityIC2ConnectorTin { public class TileEntityIC2ConnectorGold extends TileEntityIC2ConnectorTin {

4
src/main/java/malte0811/industrialWires/blocks/wire/TileEntityIC2ConnectorHV.java → src/main/java/malte0811/industrialwires/blocks/wire/TileEntityIC2ConnectorHV.java
View file

@ -12,9 +12,9 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>. * along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>.
*/ */
package malte0811.industrialWires.blocks.wire; package malte0811.industrialwires.blocks.wire;
import static malte0811.industrialWires.wires.MixedWireType.HV; import static malte0811.industrialwires.wires.MixedWireType.HV;
public class TileEntityIC2ConnectorHV extends TileEntityIC2ConnectorTin { public class TileEntityIC2ConnectorHV extends TileEntityIC2ConnectorTin {

24
src/main/java/malte0811/industrialWires/blocks/wire/TileEntityIC2ConnectorTin.java → src/main/java/malte0811/industrialwires/blocks/wire/TileEntityIC2ConnectorTin.java
View file

@ -12,7 +12,7 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>. * along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>.
*/ */
package malte0811.industrialWires.blocks.wire; package malte0811.industrialwires.blocks.wire;
import blusunrize.immersiveengineering.api.ApiUtils; import blusunrize.immersiveengineering.api.ApiUtils;
import blusunrize.immersiveengineering.api.TargetingInfo; import blusunrize.immersiveengineering.api.TargetingInfo;
@ -24,15 +24,15 @@ import ic2.api.energy.tile.IEnergyAcceptor;
import ic2.api.energy.tile.IEnergyEmitter; import ic2.api.energy.tile.IEnergyEmitter;
import ic2.api.energy.tile.IEnergySink; import ic2.api.energy.tile.IEnergySink;
import ic2.api.energy.tile.IEnergySource; import ic2.api.energy.tile.IEnergySource;
import malte0811.industrialWires.IMixedConnector; import malte0811.industrialwires.IMixedConnector;
import malte0811.industrialWires.IWConfig; import malte0811.industrialwires.IWConfig;
import malte0811.industrialWires.IndustrialWires; import malte0811.industrialwires.IndustrialWires;
import malte0811.industrialWires.blocks.IBlockBoundsIW; import malte0811.industrialwires.blocks.IBlockBoundsIW;
import malte0811.industrialWires.compat.Compat; import malte0811.industrialwires.compat.Compat;
import malte0811.industrialWires.util.ConversionUtil; import malte0811.industrialwires.util.ConversionUtil;
import malte0811.industrialWires.util.MiscUtils; import malte0811.industrialwires.util.MiscUtils;
import malte0811.industrialWires.wires.EnergyType; import malte0811.industrialwires.wires.EnergyType;
import malte0811.industrialWires.wires.MixedWireType; import malte0811.industrialwires.wires.MixedWireType;
import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.EntityLivingBase;
import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
@ -51,8 +51,8 @@ import javax.annotation.Nullable;
import java.util.*; import java.util.*;
import java.util.function.Consumer; import java.util.function.Consumer;
import static malte0811.industrialWires.wires.EnergyType.*; import static malte0811.industrialwires.wires.EnergyType.*;
import static malte0811.industrialWires.wires.MixedWireType.TIN; import static malte0811.industrialwires.wires.MixedWireType.TIN;
@Optional.InterfaceList({ @Optional.InterfaceList({
@Optional.Interface(iface = "ic2.api.energy.tile.IEnergySource", modid = "ic2"), @Optional.Interface(iface = "ic2.api.energy.tile.IEnergySource", modid = "ic2"),

28
src/main/java/malte0811/industrialWires/client/ClientEventHandler.java → src/main/java/malte0811/industrialwires/client/ClientEventHandler.java
View file

@ -12,25 +12,25 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>. * along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>.
*/ */
package malte0811.industrialWires.client; package malte0811.industrialwires.client;
import blusunrize.immersiveengineering.api.IEProperties; import blusunrize.immersiveengineering.api.IEProperties;
import blusunrize.immersiveengineering.api.Lib; import blusunrize.immersiveengineering.api.Lib;
import blusunrize.immersiveengineering.client.ClientUtils; import blusunrize.immersiveengineering.client.ClientUtils;
import blusunrize.immersiveengineering.common.util.ItemNBTHelper; import blusunrize.immersiveengineering.common.util.ItemNBTHelper;
import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableMap;
import malte0811.industrialWires.IndustrialWires; import malte0811.industrialwires.IndustrialWires;
import malte0811.industrialWires.blocks.BlockIWBase; import malte0811.industrialwires.blocks.BlockIWBase;
import malte0811.industrialWires.blocks.IMetaEnum; import malte0811.industrialwires.blocks.IMetaEnum;
import malte0811.industrialWires.blocks.controlpanel.TileEntityPanel; import malte0811.industrialwires.blocks.controlpanel.TileEntityPanel;
import malte0811.industrialWires.blocks.hv.BlockHVMultiblocks; import malte0811.industrialwires.blocks.hv.BlockHVMultiblocks;
import malte0811.industrialWires.client.panelmodel.PanelModel; import malte0811.industrialwires.client.panelmodel.PanelModel;
import malte0811.industrialWires.controlpanel.PanelComponent; import malte0811.industrialwires.controlpanel.PanelComponent;
import malte0811.industrialWires.items.ItemIC2Coil; import malte0811.industrialwires.items.ItemIC2Coil;
import malte0811.industrialWires.items.ItemKey; import malte0811.industrialwires.items.ItemKey;
import malte0811.industrialWires.items.ItemPanelComponent; import malte0811.industrialwires.items.ItemPanelComponent;
import malte0811.industrialWires.mech_mb.MechMBPart; import malte0811.industrialwires.mech_mb.MechMBPart;
import malte0811.industrialWires.wires.MixedWireType; import malte0811.industrialwires.wires.MixedWireType;
import net.minecraft.block.properties.IProperty; import net.minecraft.block.properties.IProperty;
import net.minecraft.block.state.IBlockState; import net.minecraft.block.state.IBlockState;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
@ -67,7 +67,7 @@ import javax.annotation.Nonnull;
import java.util.Locale; import java.util.Locale;
import java.util.Map; import java.util.Map;
import static malte0811.industrialWires.client.render.TileRenderMechMB.BASE_MODELS; import static malte0811.industrialwires.client.render.TileRenderMechMB.BASE_MODELS;
@Mod.EventBusSubscriber(modid = IndustrialWires.MODID, value = Side.CLIENT) @Mod.EventBusSubscriber(modid = IndustrialWires.MODID, value = Side.CLIENT)
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)

56
src/main/java/malte0811/industrialWires/client/ClientProxy.java → src/main/java/malte0811/industrialwires/client/ClientProxy.java
View file

@ -12,7 +12,7 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>. * along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>.
*/ */
package malte0811.industrialWires.client; package malte0811.industrialwires.client;
import blusunrize.immersiveengineering.api.ManualHelper; import blusunrize.immersiveengineering.api.ManualHelper;
import blusunrize.immersiveengineering.api.ManualPageMultiblock; import blusunrize.immersiveengineering.api.ManualPageMultiblock;
@ -29,32 +29,32 @@ import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSet;
import it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap; import it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap;
import it.unimi.dsi.fastutil.objects.Object2IntMap; import it.unimi.dsi.fastutil.objects.Object2IntMap;
import malte0811.industrialWires.*; import malte0811.industrialwires.*;
import malte0811.industrialWires.blocks.controlpanel.BlockTypes_Panel; import malte0811.industrialwires.blocks.controlpanel.BlockTypes_Panel;
import malte0811.industrialWires.blocks.controlpanel.TileEntityPanelCreator; import malte0811.industrialwires.blocks.controlpanel.TileEntityPanelCreator;
import malte0811.industrialWires.blocks.controlpanel.TileEntityRSPanel; import malte0811.industrialwires.blocks.controlpanel.TileEntityRSPanel;
import malte0811.industrialWires.blocks.converter.TileEntityMechMB; import malte0811.industrialwires.blocks.converter.TileEntityMechMB;
import malte0811.industrialWires.blocks.hv.TileEntityJacobsLadder; import malte0811.industrialwires.blocks.hv.TileEntityJacobsLadder;
import malte0811.industrialWires.blocks.hv.TileEntityMarx; import malte0811.industrialwires.blocks.hv.TileEntityMarx;
import malte0811.industrialWires.client.gui.GuiPanelComponent; import malte0811.industrialwires.client.gui.GuiPanelComponent;
import malte0811.industrialWires.client.gui.GuiPanelCreator; import malte0811.industrialwires.client.gui.GuiPanelCreator;
import malte0811.industrialWires.client.gui.GuiRSPanelConn; import malte0811.industrialwires.client.gui.GuiRSPanelConn;
import malte0811.industrialWires.client.gui.GuiRenameKey; import malte0811.industrialwires.client.gui.GuiRenameKey;
import malte0811.industrialWires.client.manual.TextSplitter; import malte0811.industrialwires.client.manual.TextSplitter;
import malte0811.industrialWires.client.multiblock_io_model.MBIOModelLoader; import malte0811.industrialwires.client.multiblock_io_model.MBIOModelLoader;
import malte0811.industrialWires.client.panelmodel.PanelModelLoader; import malte0811.industrialwires.client.panelmodel.PanelModelLoader;
import malte0811.industrialWires.client.render.*; import malte0811.industrialwires.client.render.*;
import malte0811.industrialWires.controlpanel.PanelComponent; import malte0811.industrialwires.controlpanel.PanelComponent;
import malte0811.industrialWires.crafting.IC2TRHelper; import malte0811.industrialwires.crafting.IC2TRHelper;
import malte0811.industrialWires.entities.EntityBrokenPart; import malte0811.industrialwires.entities.EntityBrokenPart;
import malte0811.industrialWires.hv.MarxOreHandler; import malte0811.industrialwires.hv.MarxOreHandler;
import malte0811.industrialWires.hv.MultiblockMarx; import malte0811.industrialwires.hv.MultiblockMarx;
import malte0811.industrialWires.items.ItemIC2Coil; import malte0811.industrialwires.items.ItemIC2Coil;
import malte0811.industrialWires.items.ItemPanelComponent; import malte0811.industrialwires.items.ItemPanelComponent;
import malte0811.industrialWires.mech_mb.*; import malte0811.industrialwires.mech_mb.*;
import malte0811.industrialWires.util.CommandIWClient; import malte0811.industrialwires.util.CommandIWClient;
import malte0811.industrialWires.util.ConversionUtil; import malte0811.industrialwires.util.ConversionUtil;
import malte0811.industrialWires.util.MiscUtils; import malte0811.industrialwires.util.MiscUtils;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
import net.minecraft.client.audio.ISound; import net.minecraft.client.audio.ISound;
import net.minecraft.client.audio.MovingSound; import net.minecraft.client.audio.MovingSound;
@ -84,7 +84,7 @@ import net.minecraftforge.fml.relauncher.SideOnly;
import java.util.*; import java.util.*;
import static malte0811.industrialWires.IndustrialWires.*; import static malte0811.industrialwires.IndustrialWires.*;
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public class ClientProxy extends CommonProxy { public class ClientProxy extends CommonProxy {

6
src/main/java/malte0811/industrialWires/client/ClientUtilsIW.java → src/main/java/malte0811/industrialwires/client/ClientUtilsIW.java
View file

@ -13,11 +13,11 @@
* along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>. * along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>.
*/ */
package malte0811.industrialWires.client; package malte0811.industrialwires.client;
import blusunrize.immersiveengineering.common.util.chickenbones.Matrix4; import blusunrize.immersiveengineering.common.util.chickenbones.Matrix4;
import malte0811.industrialWires.client.panelmodel.SmartLightingQuadIW; import malte0811.industrialwires.client.panelmodel.SmartLightingQuadIW;
import malte0811.industrialWires.controlpanel.PanelUtils; import malte0811.industrialwires.controlpanel.PanelUtils;
import net.minecraft.client.renderer.BufferBuilder; import net.minecraft.client.renderer.BufferBuilder;
import net.minecraft.client.renderer.block.model.BakedQuad; import net.minecraft.client.renderer.block.model.BakedQuad;
import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.client.renderer.vertex.DefaultVertexFormats;

4
src/main/java/malte0811/industrialWires/client/IWTickableSound.java → src/main/java/malte0811/industrialwires/client/IWTickableSound.java
View file

@ -13,12 +13,12 @@
* along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>. * along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>.
*/ */
package malte0811.industrialWires.client; package malte0811.industrialwires.client;
import blusunrize.immersiveengineering.api.Lib; import blusunrize.immersiveengineering.api.Lib;
import blusunrize.immersiveengineering.common.items.ItemEarmuffs; import blusunrize.immersiveengineering.common.items.ItemEarmuffs;
import blusunrize.immersiveengineering.common.util.ItemNBTHelper; import blusunrize.immersiveengineering.common.util.ItemNBTHelper;
import malte0811.industrialWires.IEObjects; import malte0811.industrialwires.IEObjects;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
import net.minecraft.client.audio.ITickableSound; import net.minecraft.client.audio.ITickableSound;
import net.minecraft.client.audio.PositionedSound; import net.minecraft.client.audio.PositionedSound;

2
src/main/java/malte0811/industrialWires/client/RawQuad.java → src/main/java/malte0811/industrialwires/client/RawQuad.java
View file

@ -13,7 +13,7 @@
* along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>. * along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>.
*/ */
package malte0811.industrialWires.client; package malte0811.industrialwires.client;
import blusunrize.immersiveengineering.common.util.chickenbones.Matrix4; import blusunrize.immersiveengineering.common.util.chickenbones.Matrix4;
import net.minecraft.client.renderer.block.model.BakedQuad; import net.minecraft.client.renderer.block.model.BakedQuad;

20
src/main/java/malte0811/industrialWires/client/gui/GuiPanelComponent.java → src/main/java/malte0811/industrialwires/client/gui/GuiPanelComponent.java
View file

@ -13,20 +13,20 @@
* along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>. * along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>.
*/ */
package malte0811.industrialWires.client.gui; package malte0811.industrialwires.client.gui;
import blusunrize.immersiveengineering.client.ClientUtils; import blusunrize.immersiveengineering.client.ClientUtils;
import blusunrize.immersiveengineering.client.gui.elements.GuiButtonCheckbox; import blusunrize.immersiveengineering.client.gui.elements.GuiButtonCheckbox;
import blusunrize.immersiveengineering.client.gui.elements.GuiSliderIE; import blusunrize.immersiveengineering.client.gui.elements.GuiSliderIE;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import malte0811.industrialWires.IndustrialWires; import malte0811.industrialwires.IndustrialWires;
import malte0811.industrialWires.client.gui.elements.GuiChannelPicker; import malte0811.industrialwires.client.gui.elements.GuiChannelPicker;
import malte0811.industrialWires.client.gui.elements.GuiChannelPickerSmall; import malte0811.industrialwires.client.gui.elements.GuiChannelPickerSmall;
import malte0811.industrialWires.client.gui.elements.GuiIntChooser; import malte0811.industrialwires.client.gui.elements.GuiIntChooser;
import malte0811.industrialWires.containers.ContainerPanelComponent; import malte0811.industrialwires.containers.ContainerPanelComponent;
import malte0811.industrialWires.controlpanel.IConfigurableComponent; import malte0811.industrialwires.controlpanel.IConfigurableComponent;
import malte0811.industrialWires.controlpanel.PanelComponent; import malte0811.industrialwires.controlpanel.PanelComponent;
import malte0811.industrialWires.network.MessageItemSync; import malte0811.industrialwires.network.MessageItemSync;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.Gui; import net.minecraft.client.gui.Gui;
import net.minecraft.client.gui.GuiTextField; import net.minecraft.client.gui.GuiTextField;
@ -43,7 +43,7 @@ import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import static malte0811.industrialWires.util.NBTKeys.*; import static malte0811.industrialwires.util.NBTKeys.*;
public class GuiPanelComponent extends GuiContainer { public class GuiPanelComponent extends GuiContainer {
private PanelComponent component; private PanelComponent component;

18
src/main/java/malte0811/industrialWires/client/gui/GuiPanelCreator.java → src/main/java/malte0811/industrialwires/client/gui/GuiPanelCreator.java
View file

@ -13,18 +13,18 @@
* along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>. * along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>.
*/ */
package malte0811.industrialWires.client.gui; package malte0811.industrialwires.client.gui;
import blusunrize.immersiveengineering.client.ClientUtils; import blusunrize.immersiveengineering.client.ClientUtils;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import malte0811.industrialWires.IndustrialWires; import malte0811.industrialwires.IndustrialWires;
import malte0811.industrialWires.blocks.controlpanel.TileEntityPanelCreator; import malte0811.industrialwires.blocks.controlpanel.TileEntityPanelCreator;
import malte0811.industrialWires.containers.ContainerPanelCreator; import malte0811.industrialwires.containers.ContainerPanelCreator;
import malte0811.industrialWires.controlpanel.MessageType; import malte0811.industrialwires.controlpanel.MessageType;
import malte0811.industrialWires.controlpanel.PanelComponent; import malte0811.industrialwires.controlpanel.PanelComponent;
import malte0811.industrialWires.controlpanel.PanelUtils; import malte0811.industrialwires.controlpanel.PanelUtils;
import malte0811.industrialWires.items.ItemPanelComponent; import malte0811.industrialwires.items.ItemPanelComponent;
import malte0811.industrialWires.network.MessageGUIInteract; import malte0811.industrialwires.network.MessageGUIInteract;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.Gui; import net.minecraft.client.gui.Gui;
import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiButton;

12
src/main/java/malte0811/industrialWires/client/gui/GuiRSPanelConn.java → src/main/java/malte0811/industrialwires/client/gui/GuiRSPanelConn.java
View file

@ -13,13 +13,13 @@
* along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>. * along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>.
*/ */
package malte0811.industrialWires.client.gui; package malte0811.industrialwires.client.gui;
import malte0811.industrialWires.IndustrialWires; import malte0811.industrialwires.IndustrialWires;
import malte0811.industrialWires.blocks.controlpanel.TileEntityRSPanel; import malte0811.industrialwires.blocks.controlpanel.TileEntityRSPanel;
import malte0811.industrialWires.client.gui.elements.GuiIntChooser; import malte0811.industrialwires.client.gui.elements.GuiIntChooser;
import malte0811.industrialWires.containers.ContainerRSPanelConn; import malte0811.industrialwires.containers.ContainerRSPanelConn;
import malte0811.industrialWires.network.MessageGUIInteract; import malte0811.industrialwires.network.MessageGUIInteract;
import net.minecraft.client.gui.Gui; import net.minecraft.client.gui.Gui;
import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.gui.inventory.GuiContainer;
import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.GlStateManager;

8
src/main/java/malte0811/industrialWires/client/gui/GuiRenameKey.java → src/main/java/malte0811/industrialwires/client/gui/GuiRenameKey.java
View file

@ -13,11 +13,11 @@
* along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>. * along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>.
*/ */
package malte0811.industrialWires.client.gui; package malte0811.industrialwires.client.gui;
import malte0811.industrialWires.IndustrialWires; import malte0811.industrialwires.IndustrialWires;
import malte0811.industrialWires.containers.ContainerRenameKey; import malte0811.industrialwires.containers.ContainerRenameKey;
import malte0811.industrialWires.network.MessageItemSync; import malte0811.industrialwires.network.MessageItemSync;
import net.minecraft.client.gui.Gui; import net.minecraft.client.gui.Gui;
import net.minecraft.client.gui.GuiTextField; import net.minecraft.client.gui.GuiTextField;
import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.gui.inventory.GuiContainer;

2
src/main/java/malte0811/industrialWires/client/gui/elements/GuiChannelPicker.java → src/main/java/malte0811/industrialwires/client/gui/elements/GuiChannelPicker.java
View file

@ -13,7 +13,7 @@
* along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>. * along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>.
*/ */
package malte0811.industrialWires.client.gui.elements; package malte0811.industrialwires.client.gui.elements;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiButton;

2
src/main/java/malte0811/industrialWires/client/gui/elements/GuiChannelPickerSmall.java → src/main/java/malte0811/industrialwires/client/gui/elements/GuiChannelPickerSmall.java
View file

@ -13,7 +13,7 @@
* along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>. * along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>.
*/ */
package malte0811.industrialWires.client.gui.elements; package malte0811.industrialwires.client.gui.elements;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.GlStateManager;

2
src/main/java/malte0811/industrialWires/client/gui/elements/GuiIntChooser.java → src/main/java/malte0811/industrialwires/client/gui/elements/GuiIntChooser.java
View file

@ -13,7 +13,7 @@
* along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>. * along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>.
*/ */
package malte0811.industrialWires.client.gui.elements; package malte0811.industrialwires.client.gui.elements;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.Gui; import net.minecraft.client.gui.Gui;

2
src/main/java/malte0811/industrialWires/client/manual/TextSplitter.java → src/main/java/malte0811/industrialwires/client/manual/TextSplitter.java
View file

@ -13,7 +13,7 @@
* along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>. * along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>.
*/ */
package malte0811.industrialWires.client.manual; package malte0811.industrialwires.client.manual;
import blusunrize.lib.manual.IManualPage; import blusunrize.lib.manual.IManualPage;
import blusunrize.lib.manual.ManualInstance; import blusunrize.lib.manual.ManualInstance;

14
src/main/java/malte0811/industrialWires/client/multiblock_io_model/BakedMBIOModel.java → src/main/java/malte0811/industrialwires/client/multiblock_io_model/BakedMBIOModel.java
View file

@ -13,19 +13,19 @@
* along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>. * along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>.
*/ */
package malte0811.industrialWires.client.multiblock_io_model; package malte0811.industrialwires.client.multiblock_io_model;
import blusunrize.immersiveengineering.api.IEEnums.SideConfig; import blusunrize.immersiveengineering.api.IEEnums.SideConfig;
import blusunrize.immersiveengineering.common.util.chickenbones.Matrix4; import blusunrize.immersiveengineering.common.util.chickenbones.Matrix4;
import com.google.common.cache.Cache; import com.google.common.cache.Cache;
import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheBuilder;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import malte0811.industrialWires.IndustrialWires; import malte0811.industrialwires.IndustrialWires;
import malte0811.industrialWires.blocks.IWProperties; import malte0811.industrialwires.blocks.IWProperties;
import malte0811.industrialWires.client.ClientUtilsIW; import malte0811.industrialwires.client.ClientUtilsIW;
import malte0811.industrialWires.client.RawQuad; import malte0811.industrialwires.client.RawQuad;
import malte0811.industrialWires.util.MBSideConfig; import malte0811.industrialwires.util.MBSideConfig;
import malte0811.industrialWires.util.MBSideConfig.BlockFace; import malte0811.industrialwires.util.MBSideConfig.BlockFace;
import net.minecraft.block.state.IBlockState; import net.minecraft.block.state.IBlockState;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.block.model.BakedQuad; import net.minecraft.client.renderer.block.model.BakedQuad;

4
src/main/java/malte0811/industrialWires/client/multiblock_io_model/MBIOModelLoader.java → src/main/java/malte0811/industrialwires/client/multiblock_io_model/MBIOModelLoader.java
View file

@ -13,12 +13,12 @@
* along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>. * along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>.
*/ */
package malte0811.industrialWires.client.multiblock_io_model; package malte0811.industrialwires.client.multiblock_io_model;
import blusunrize.immersiveengineering.api.IEApi; import blusunrize.immersiveengineering.api.IEApi;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableMap;
import malte0811.industrialWires.IndustrialWires; import malte0811.industrialwires.IndustrialWires;
import net.minecraft.client.renderer.block.model.IBakedModel; import net.minecraft.client.renderer.block.model.IBakedModel;
import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.client.renderer.vertex.VertexFormat; import net.minecraft.client.renderer.vertex.VertexFormat;

14
src/main/java/malte0811/industrialWires/client/panelmodel/PanelModel.java → src/main/java/malte0811/industrialwires/client/panelmodel/PanelModel.java
View file

@ -13,18 +13,18 @@
* along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>. * along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>.
*/ */
package malte0811.industrialWires.client.panelmodel; package malte0811.industrialwires.client.panelmodel;
import blusunrize.immersiveengineering.api.IEApi; import blusunrize.immersiveengineering.api.IEApi;
import com.google.common.cache.Cache; import com.google.common.cache.Cache;
import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheBuilder;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import malte0811.industrialWires.blocks.controlpanel.BlockTypes_Panel; import malte0811.industrialwires.blocks.controlpanel.BlockTypes_Panel;
import malte0811.industrialWires.blocks.controlpanel.TileEntityPanel; import malte0811.industrialwires.blocks.controlpanel.TileEntityPanel;
import malte0811.industrialWires.blocks.controlpanel.TileEntityUnfinishedPanel; import malte0811.industrialwires.blocks.controlpanel.TileEntityUnfinishedPanel;
import malte0811.industrialWires.controlpanel.PanelUtils; import malte0811.industrialwires.controlpanel.PanelUtils;
import malte0811.industrialWires.controlpanel.PropertyComponents; import malte0811.industrialwires.controlpanel.PropertyComponents;
import malte0811.industrialWires.controlpanel.PropertyComponents.PanelRenderProperties; import malte0811.industrialwires.controlpanel.PropertyComponents.PanelRenderProperties;
import net.minecraft.block.state.IBlockState; import net.minecraft.block.state.IBlockState;
import net.minecraft.client.renderer.block.model.*; import net.minecraft.client.renderer.block.model.*;
import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureAtlasSprite;

6
src/main/java/malte0811/industrialWires/client/panelmodel/PanelModelLoader.java → src/main/java/malte0811/industrialwires/client/panelmodel/PanelModelLoader.java
View file

@ -13,11 +13,11 @@
* along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>. * along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>.
*/ */
package malte0811.industrialWires.client.panelmodel; package malte0811.industrialwires.client.panelmodel;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import malte0811.industrialWires.IndustrialWires; import malte0811.industrialwires.IndustrialWires;
import malte0811.industrialWires.controlpanel.PanelUtils; import malte0811.industrialwires.controlpanel.PanelUtils;
import net.minecraft.client.renderer.block.model.IBakedModel; import net.minecraft.client.renderer.block.model.IBakedModel;
import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.client.renderer.vertex.VertexFormat; import net.minecraft.client.renderer.vertex.VertexFormat;

4
src/main/java/malte0811/industrialWires/client/panelmodel/RawModelFontRenderer.java → src/main/java/malte0811/industrialwires/client/panelmodel/RawModelFontRenderer.java
View file

@ -13,11 +13,11 @@
* along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>. * along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>.
*/ */
package malte0811.industrialWires.client.panelmodel; package malte0811.industrialwires.client.panelmodel;
import blusunrize.immersiveengineering.common.util.chickenbones.Matrix4; import blusunrize.immersiveengineering.common.util.chickenbones.Matrix4;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import malte0811.industrialWires.client.RawQuad; import malte0811.industrialwires.client.RawQuad;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.FontRenderer;
import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureAtlasSprite;

2
src/main/java/malte0811/industrialWires/client/panelmodel/SmartLightingQuadIW.java → src/main/java/malte0811/industrialwires/client/panelmodel/SmartLightingQuadIW.java
View file

@ -13,7 +13,7 @@
* along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>. * along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>.
*/ */
package malte0811.industrialWires.client.panelmodel; package malte0811.industrialwires.client.panelmodel;
import net.minecraft.client.renderer.block.model.BakedQuad; import net.minecraft.client.renderer.block.model.BakedQuad;
import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureAtlasSprite;

4
src/main/java/malte0811/industrialWires/client/render/EntityRenderBrokenPart.java → src/main/java/malte0811/industrialwires/client/render/EntityRenderBrokenPart.java
View file

@ -13,10 +13,10 @@
* along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>. * along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>.
*/ */
package malte0811.industrialWires.client.render; package malte0811.industrialwires.client.render;
import blusunrize.immersiveengineering.client.ClientUtils; import blusunrize.immersiveengineering.client.ClientUtils;
import malte0811.industrialWires.entities.EntityBrokenPart; import malte0811.industrialwires.entities.EntityBrokenPart;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.BufferBuilder; import net.minecraft.client.renderer.BufferBuilder;
import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.GlStateManager;

6
src/main/java/malte0811/industrialWires/client/render/Shaders.java → src/main/java/malte0811/industrialwires/client/render/Shaders.java
View file

@ -13,11 +13,11 @@
* along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>. * along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>.
*/ */
package malte0811.industrialWires.client.render; package malte0811.industrialwires.client.render;
import blusunrize.immersiveengineering.api.IEApi; import blusunrize.immersiveengineering.api.IEApi;
import malte0811.industrialWires.IWConfig; import malte0811.industrialwires.IWConfig;
import malte0811.industrialWires.IndustrialWires; import malte0811.industrialwires.IndustrialWires;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.OpenGlHelper;
import org.lwjgl.opengl.ARBFragmentShader; import org.lwjgl.opengl.ARBFragmentShader;

10
src/main/java/malte0811/industrialWires/client/render/TileRenderJacobsLadder.java → src/main/java/malte0811/industrialwires/client/render/TileRenderJacobsLadder.java
View file

@ -13,11 +13,11 @@
* along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>. * along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>.
*/ */
package malte0811.industrialWires.client.render; package malte0811.industrialwires.client.render;
import malte0811.industrialWires.blocks.hv.TileEntityJacobsLadder; import malte0811.industrialwires.blocks.hv.TileEntityJacobsLadder;
import malte0811.industrialWires.blocks.hv.TileEntityJacobsLadder.LadderSize; import malte0811.industrialwires.blocks.hv.TileEntityJacobsLadder.LadderSize;
import malte0811.industrialWires.util.Beziers; import malte0811.industrialwires.util.Beziers;
import net.minecraft.client.renderer.BufferBuilder; import net.minecraft.client.renderer.BufferBuilder;
import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.GlStateManager;
import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.Tessellator;
@ -26,7 +26,7 @@ import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
import net.minecraft.util.math.Vec3d; import net.minecraft.util.math.Vec3d;
import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL11;
import static malte0811.industrialWires.blocks.hv.TileEntityJacobsLadder.getColor; import static malte0811.industrialwires.blocks.hv.TileEntityJacobsLadder.getColor;
public class TileRenderJacobsLadder extends TileEntitySpecialRenderer<TileEntityJacobsLadder> { public class TileRenderJacobsLadder extends TileEntitySpecialRenderer<TileEntityJacobsLadder> {
@Override @Override

14
src/main/java/malte0811/industrialWires/client/render/TileRenderMarx.java → src/main/java/malte0811/industrialwires/client/render/TileRenderMarx.java
View file

@ -13,14 +13,14 @@
* along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>. * along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>.
*/ */
package malte0811.industrialWires.client.render; package malte0811.industrialwires.client.render;
import blusunrize.immersiveengineering.common.util.chickenbones.Matrix4; import blusunrize.immersiveengineering.common.util.chickenbones.Matrix4;
import malte0811.industrialWires.blocks.IWProperties; import malte0811.industrialwires.blocks.IWProperties;
import malte0811.industrialWires.blocks.hv.TileEntityMarx; import malte0811.industrialwires.blocks.hv.TileEntityMarx;
import malte0811.industrialWires.blocks.hv.TileEntityMarx.Discharge; import malte0811.industrialwires.blocks.hv.TileEntityMarx.Discharge;
import malte0811.industrialWires.client.ClientEventHandler; import malte0811.industrialwires.client.ClientEventHandler;
import malte0811.industrialWires.util.MiscUtils; import malte0811.industrialwires.util.MiscUtils;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.BufferBuilder; import net.minecraft.client.renderer.BufferBuilder;
import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.GlStateManager;
@ -32,7 +32,7 @@ import net.minecraft.util.math.Vec3d;
import net.minecraft.util.math.Vec3i; import net.minecraft.util.math.Vec3i;
import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL11;
import static malte0811.industrialWires.blocks.hv.TileEntityMarx.FiringState.FIRE; import static malte0811.industrialwires.blocks.hv.TileEntityMarx.FiringState.FIRE;
public class TileRenderMarx extends TileEntitySpecialRenderer<TileEntityMarx> { public class TileRenderMarx extends TileEntitySpecialRenderer<TileEntityMarx> {
public static boolean screenShot = false; public static boolean screenShot = false;

14
src/main/java/malte0811/industrialWires/client/render/TileRenderMechMB.java → src/main/java/malte0811/industrialwires/client/render/TileRenderMechMB.java
View file

@ -13,15 +13,15 @@
* along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>. * along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>.
*/ */
package malte0811.industrialWires.client.render; package malte0811.industrialwires.client.render;
import blusunrize.immersiveengineering.api.IEApi; import blusunrize.immersiveengineering.api.IEApi;
import blusunrize.immersiveengineering.client.ClientUtils; import blusunrize.immersiveengineering.client.ClientUtils;
import blusunrize.immersiveengineering.common.util.chickenbones.Matrix4; import blusunrize.immersiveengineering.common.util.chickenbones.Matrix4;
import malte0811.industrialWires.blocks.converter.TileEntityMechMB; import malte0811.industrialwires.blocks.converter.TileEntityMechMB;
import malte0811.industrialWires.client.ClientUtilsIW; import malte0811.industrialwires.client.ClientUtilsIW;
import malte0811.industrialWires.client.RawQuad; import malte0811.industrialwires.client.RawQuad;
import malte0811.industrialWires.mech_mb.MechMBPart; import malte0811.industrialwires.mech_mb.MechMBPart;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.BufferBuilder; import net.minecraft.client.renderer.BufferBuilder;
import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.GlStateManager;
@ -42,8 +42,8 @@ import org.lwjgl.util.vector.Vector3f;
import javax.annotation.Nonnull; import javax.annotation.Nonnull;
import java.util.*; import java.util.*;
import static malte0811.industrialWires.blocks.converter.TileEntityMechMB.TICK_ANGLE_PER_SPEED; import static malte0811.industrialwires.blocks.converter.TileEntityMechMB.TICK_ANGLE_PER_SPEED;
import static malte0811.industrialWires.mech_mb.MechMBPart.SHAFT_KEY; import static malte0811.industrialwires.mech_mb.MechMBPart.SHAFT_KEY;
public class TileRenderMechMB extends TileEntitySpecialRenderer<TileEntityMechMB> implements IResourceManagerReloadListener { public class TileRenderMechMB extends TileEntitySpecialRenderer<TileEntityMechMB> implements IResourceManagerReloadListener {
public static final Map<ResourceLocation, IBakedModel> BASE_MODELS = new HashMap<>(); public static final Map<ResourceLocation, IBakedModel> BASE_MODELS = new HashMap<>();

6
src/main/java/malte0811/industrialWires/compat/CTMarxGenerator.java → src/main/java/malte0811/industrialwires/compat/CTMarxGenerator.java
View file

@ -13,7 +13,7 @@
* along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>. * along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>.
*/ */
package malte0811.industrialWires.compat; package malte0811.industrialwires.compat;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import crafttweaker.CraftTweakerAPI; import crafttweaker.CraftTweakerAPI;
@ -23,8 +23,8 @@ import crafttweaker.api.item.IIngredient;
import crafttweaker.api.item.IItemStack; import crafttweaker.api.item.IItemStack;
import crafttweaker.api.minecraft.CraftTweakerMC; import crafttweaker.api.minecraft.CraftTweakerMC;
import crafttweaker.api.oredict.IOreDictEntry; import crafttweaker.api.oredict.IOreDictEntry;
import malte0811.industrialWires.hv.MarxOreHandler; import malte0811.industrialwires.hv.MarxOreHandler;
import malte0811.industrialWires.hv.MarxOreHandler.OreChecker; import malte0811.industrialwires.hv.MarxOreHandler.OreChecker;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraftforge.oredict.OreDictionary; import net.minecraftforge.oredict.OreDictionary;
import stanhebben.zenscript.annotations.Optional; import stanhebben.zenscript.annotations.Optional;

8
src/main/java/malte0811/industrialWires/compat/Compat.java → src/main/java/malte0811/industrialwires/compat/Compat.java
View file

@ -13,7 +13,7 @@
* along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>. * along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>.
*/ */
package malte0811.industrialWires.compat; package malte0811.industrialwires.compat;
import blusunrize.immersiveengineering.api.ApiUtils; import blusunrize.immersiveengineering.api.ApiUtils;
import blusunrize.immersiveengineering.api.tool.ToolboxHandler; import blusunrize.immersiveengineering.api.tool.ToolboxHandler;
@ -26,9 +26,9 @@ import ic2.api.energy.tile.IEnergyTile;
import ic2.api.item.IBoxable; import ic2.api.item.IBoxable;
import ic2.api.item.IC2Items; import ic2.api.item.IC2Items;
import ic2.core.block.TileEntityBlock; import ic2.core.block.TileEntityBlock;
import malte0811.industrialWires.compat.CompatCapabilities.Charset; import malte0811.industrialwires.compat.CompatCapabilities.Charset;
import malte0811.industrialWires.hv.MarxOreHandler; import malte0811.industrialwires.hv.MarxOreHandler;
import malte0811.industrialWires.mech_mb.MechPartCommutator; import malte0811.industrialwires.mech_mb.MechPartCommutator;
import mrtjp.projectred.api.ProjectRedAPI; import mrtjp.projectred.api.ProjectRedAPI;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item; import net.minecraft.item.Item;

2
src/main/java/malte0811/industrialWires/compat/CompatCapabilities.java → src/main/java/malte0811/industrialwires/compat/CompatCapabilities.java
View file

@ -13,7 +13,7 @@
* along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>. * along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>.
*/ */
package malte0811.industrialWires.compat; package malte0811.industrialwires.compat;
import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.common.capabilities.Capability;
import net.minecraftforge.common.capabilities.CapabilityInject; import net.minecraftforge.common.capabilities.CapabilityInject;

2
src/main/java/malte0811/industrialWires/compat/IBlockAction.java → src/main/java/malte0811/industrialwires/compat/IBlockAction.java
View file

@ -13,7 +13,7 @@
* along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>. * along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>.
*/ */
package malte0811.industrialWires.compat; package malte0811.industrialwires.compat;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World; import net.minecraft.world.World;

10
src/main/java/malte0811/industrialWires/compat/JEIMarx.java → src/main/java/malte0811/industrialwires/compat/JEIMarx.java
View file

@ -13,14 +13,14 @@
* along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>. * along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>.
*/ */
package malte0811.industrialWires.compat; package malte0811.industrialwires.compat;
import blusunrize.immersiveengineering.common.util.Utils; import blusunrize.immersiveengineering.common.util.Utils;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import malte0811.industrialWires.IndustrialWires; import malte0811.industrialwires.IndustrialWires;
import malte0811.industrialWires.blocks.hv.BlockTypes_HVMultiblocks; import malte0811.industrialwires.blocks.hv.BlockTypes_HVMultiblocks;
import malte0811.industrialWires.hv.MarxOreHandler; import malte0811.industrialwires.hv.MarxOreHandler;
import malte0811.industrialWires.hv.MarxOreHandler.OreInfo; import malte0811.industrialwires.hv.MarxOreHandler.OreInfo;
import mezz.jei.api.*; import mezz.jei.api.*;
import mezz.jei.api.gui.IDrawable; import mezz.jei.api.gui.IDrawable;
import mezz.jei.api.gui.IGuiItemStackGroup; import mezz.jei.api.gui.IGuiItemStackGroup;

4
src/main/java/malte0811/industrialWires/containers/ContainerPanelComponent.java → src/main/java/malte0811/industrialwires/containers/ContainerPanelComponent.java
View file

@ -13,9 +13,9 @@
* along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>. * along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>.
*/ */
package malte0811.industrialWires.containers; package malte0811.industrialwires.containers;
import malte0811.industrialWires.IndustrialWires; import malte0811.industrialwires.IndustrialWires;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.Container; import net.minecraft.inventory.Container;
import net.minecraft.util.EnumHand; import net.minecraft.util.EnumHand;

8
src/main/java/malte0811/industrialWires/containers/ContainerPanelCreator.java → src/main/java/malte0811/industrialwires/containers/ContainerPanelCreator.java
View file

@ -13,12 +13,12 @@
* along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>. * along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>.
*/ */
package malte0811.industrialWires.containers; package malte0811.industrialwires.containers;
import blusunrize.immersiveengineering.api.ApiUtils; import blusunrize.immersiveengineering.api.ApiUtils;
import malte0811.industrialWires.blocks.controlpanel.BlockTypes_Panel; import malte0811.industrialwires.blocks.controlpanel.BlockTypes_Panel;
import malte0811.industrialWires.blocks.controlpanel.TileEntityPanelCreator; import malte0811.industrialwires.blocks.controlpanel.TileEntityPanelCreator;
import malte0811.industrialWires.controlpanel.PanelUtils; import malte0811.industrialwires.controlpanel.PanelUtils;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.inventory.Container; import net.minecraft.inventory.Container;

4
src/main/java/malte0811/industrialWires/containers/ContainerRSPanelConn.java → src/main/java/malte0811/industrialwires/containers/ContainerRSPanelConn.java
View file

@ -13,9 +13,9 @@
* along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>. * along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>.
*/ */
package malte0811.industrialWires.containers; package malte0811.industrialwires.containers;
import malte0811.industrialWires.blocks.controlpanel.TileEntityRSPanel; import malte0811.industrialwires.blocks.controlpanel.TileEntityRSPanel;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.Container; import net.minecraft.inventory.Container;

4
src/main/java/malte0811/industrialWires/containers/ContainerRenameKey.java → src/main/java/malte0811/industrialwires/containers/ContainerRenameKey.java
View file

@ -13,9 +13,9 @@
* along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>. * along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>.
*/ */
package malte0811.industrialWires.containers; package malte0811.industrialwires.containers;
import malte0811.industrialWires.IndustrialWires; import malte0811.industrialwires.IndustrialWires;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.Container; import net.minecraft.inventory.Container;
import net.minecraft.util.EnumHand; import net.minecraft.util.EnumHand;

6
src/main/java/malte0811/industrialWires/controlpanel/ControlPanelNetwork.java → src/main/java/malte0811/industrialwires/controlpanel/ControlPanelNetwork.java
View file

@ -13,12 +13,12 @@
* along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>. * along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>.
*/ */
package malte0811.industrialWires.controlpanel; package malte0811.industrialwires.controlpanel;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSet;
import malte0811.industrialWires.blocks.controlpanel.TileEntityGeneralCP; import malte0811.industrialwires.blocks.controlpanel.TileEntityGeneralCP;
import malte0811.industrialWires.util.MiscUtils; import malte0811.industrialwires.util.MiscUtils;
import net.minecraft.nbt.NBTBase; import net.minecraft.nbt.NBTBase;
import net.minecraft.nbt.NBTTagByte; import net.minecraft.nbt.NBTTagByte;
import net.minecraft.nbt.NBTTagInt; import net.minecraft.nbt.NBTTagInt;

10
src/main/java/malte0811/industrialWires/controlpanel/CoveredToggleSwitch.java → src/main/java/malte0811/industrialwires/controlpanel/CoveredToggleSwitch.java
View file

@ -13,12 +13,12 @@
* along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>. * along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>.
*/ */
package malte0811.industrialWires.controlpanel; package malte0811.industrialwires.controlpanel;
import blusunrize.immersiveengineering.common.util.chickenbones.Matrix4; import blusunrize.immersiveengineering.common.util.chickenbones.Matrix4;
import malte0811.industrialWires.IndustrialWires; import malte0811.industrialwires.IndustrialWires;
import malte0811.industrialWires.client.RawQuad; import malte0811.industrialwires.client.RawQuad;
import malte0811.industrialWires.client.gui.GuiPanelCreator; import malte0811.industrialwires.client.gui.GuiPanelCreator;
import net.minecraft.client.resources.I18n; import net.minecraft.client.resources.I18n;
import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.nbt.NBTBase; import net.minecraft.nbt.NBTBase;
@ -31,7 +31,7 @@ import org.lwjgl.util.vector.Vector3f;
import javax.annotation.Nonnull; import javax.annotation.Nonnull;
import java.util.List; import java.util.List;
import static malte0811.industrialWires.util.NBTKeys.COLOR; import static malte0811.industrialwires.util.NBTKeys.COLOR;
public class CoveredToggleSwitch extends ToggleSwitch { public class CoveredToggleSwitch extends ToggleSwitch {
private int color = 0xff0000; private int color = 0xff0000;

2
src/main/java/malte0811/industrialWires/controlpanel/IConfigurableComponent.java → src/main/java/malte0811/industrialwires/controlpanel/IConfigurableComponent.java
View file

@ -13,7 +13,7 @@
* along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>. * along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>.
*/ */
package malte0811.industrialWires.controlpanel; package malte0811.industrialwires.controlpanel;
import blusunrize.immersiveengineering.api.tool.IConfigurableTool.ToolConfig; import blusunrize.immersiveengineering.api.tool.IConfigurableTool.ToolConfig;
import net.minecraft.nbt.NBTBase; import net.minecraft.nbt.NBTBase;

12
src/main/java/malte0811/industrialWires/controlpanel/IndicatorLight.java → src/main/java/malte0811/industrialwires/controlpanel/IndicatorLight.java
View file

@ -13,12 +13,12 @@
* along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>. * along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>.
*/ */
package malte0811.industrialWires.controlpanel; package malte0811.industrialwires.controlpanel;
import malte0811.industrialWires.IndustrialWires; import malte0811.industrialwires.IndustrialWires;
import malte0811.industrialWires.client.RawQuad; import malte0811.industrialwires.client.RawQuad;
import malte0811.industrialWires.client.gui.GuiPanelCreator; import malte0811.industrialwires.client.gui.GuiPanelCreator;
import malte0811.industrialWires.controlpanel.ControlPanelNetwork.RSChannel; import malte0811.industrialwires.controlpanel.ControlPanelNetwork.RSChannel;
import net.minecraft.client.resources.I18n; import net.minecraft.client.resources.I18n;
import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.nbt.NBTBase; import net.minecraft.nbt.NBTBase;
@ -36,7 +36,7 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.function.Consumer; import java.util.function.Consumer;
import static malte0811.industrialWires.util.NBTKeys.*; import static malte0811.industrialwires.util.NBTKeys.*;
public class IndicatorLight extends PanelComponent implements IConfigurableComponent { public class IndicatorLight extends PanelComponent implements IConfigurableComponent {
@Nonnull @Nonnull

14
src/main/java/malte0811/industrialWires/controlpanel/Label.java → src/main/java/malte0811/industrialwires/controlpanel/Label.java
View file

@ -13,12 +13,12 @@
* along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>. * along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>.
*/ */
package malte0811.industrialWires.controlpanel; package malte0811.industrialwires.controlpanel;
import malte0811.industrialWires.IndustrialWires; import malte0811.industrialwires.IndustrialWires;
import malte0811.industrialWires.client.RawQuad; import malte0811.industrialwires.client.RawQuad;
import malte0811.industrialWires.client.gui.GuiPanelCreator; import malte0811.industrialwires.client.gui.GuiPanelCreator;
import malte0811.industrialWires.client.panelmodel.RawModelFontRenderer; import malte0811.industrialwires.client.panelmodel.RawModelFontRenderer;
import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.GlStateManager;
import net.minecraft.client.resources.I18n; import net.minecraft.client.resources.I18n;
import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.entity.player.EntityPlayerMP;
@ -35,8 +35,8 @@ import javax.annotation.Nonnull;
import javax.annotation.Nullable; import javax.annotation.Nullable;
import java.util.List; import java.util.List;
import static malte0811.industrialWires.util.NBTKeys.COLOR; import static malte0811.industrialwires.util.NBTKeys.COLOR;
import static malte0811.industrialWires.util.NBTKeys.TEXT; import static malte0811.industrialwires.util.NBTKeys.TEXT;
public class Label extends PanelComponent implements IConfigurableComponent { public class Label extends PanelComponent implements IConfigurableComponent {
private String text = "Test"; private String text = "Test";

14
src/main/java/malte0811/industrialWires/controlpanel/LightedButton.java → src/main/java/malte0811/industrialwires/controlpanel/LightedButton.java
View file

@ -13,13 +13,13 @@
* along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>. * along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>.
*/ */
package malte0811.industrialWires.controlpanel; package malte0811.industrialwires.controlpanel;
import malte0811.industrialWires.IndustrialWires; import malte0811.industrialwires.IndustrialWires;
import malte0811.industrialWires.client.RawQuad; import malte0811.industrialwires.client.RawQuad;
import malte0811.industrialWires.client.gui.GuiPanelCreator; import malte0811.industrialwires.client.gui.GuiPanelCreator;
import malte0811.industrialWires.controlpanel.ControlPanelNetwork.RSChannel; import malte0811.industrialwires.controlpanel.ControlPanelNetwork.RSChannel;
import malte0811.industrialWires.controlpanel.ControlPanelNetwork.RSChannelState; import malte0811.industrialwires.controlpanel.ControlPanelNetwork.RSChannelState;
import net.minecraft.client.resources.I18n; import net.minecraft.client.resources.I18n;
import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.nbt.NBTBase; import net.minecraft.nbt.NBTBase;
@ -34,7 +34,7 @@ import javax.annotation.Nonnull;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import static malte0811.industrialWires.util.NBTKeys.*; import static malte0811.industrialwires.util.NBTKeys.*;
import static net.minecraftforge.fml.relauncher.Side.CLIENT; import static net.minecraftforge.fml.relauncher.Side.CLIENT;
public class LightedButton extends PanelComponent implements IConfigurableComponent { public class LightedButton extends PanelComponent implements IConfigurableComponent {

16
src/main/java/malte0811/industrialWires/controlpanel/Lock.java → src/main/java/malte0811/industrialwires/controlpanel/Lock.java
View file

@ -13,15 +13,15 @@
* along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>. * along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>.
*/ */
package malte0811.industrialWires.controlpanel; package malte0811.industrialwires.controlpanel;
import blusunrize.immersiveengineering.common.util.chickenbones.Matrix4; import blusunrize.immersiveengineering.common.util.chickenbones.Matrix4;
import malte0811.industrialWires.IndustrialWires; import malte0811.industrialwires.IndustrialWires;
import malte0811.industrialWires.client.RawQuad; import malte0811.industrialwires.client.RawQuad;
import malte0811.industrialWires.client.gui.GuiPanelCreator; import malte0811.industrialwires.client.gui.GuiPanelCreator;
import malte0811.industrialWires.controlpanel.ControlPanelNetwork.RSChannel; import malte0811.industrialwires.controlpanel.ControlPanelNetwork.RSChannel;
import malte0811.industrialWires.controlpanel.ControlPanelNetwork.RSChannelState; import malte0811.industrialwires.controlpanel.ControlPanelNetwork.RSChannelState;
import malte0811.industrialWires.items.ItemKey; import malte0811.industrialwires.items.ItemKey;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.client.gui.Gui; import net.minecraft.client.gui.Gui;
import net.minecraft.client.resources.I18n; import net.minecraft.client.resources.I18n;
@ -45,7 +45,7 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Random; import java.util.Random;
import static malte0811.industrialWires.util.NBTKeys.*; import static malte0811.industrialwires.util.NBTKeys.*;
public class Lock extends PanelComponent implements IConfigurableComponent { public class Lock extends PanelComponent implements IConfigurableComponent {
private final static Random rand = new Random(); private final static Random rand = new Random();

2
src/main/java/malte0811/industrialWires/controlpanel/MessageType.java → src/main/java/malte0811/industrialwires/controlpanel/MessageType.java
View file

@ -13,7 +13,7 @@
* along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>. * along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>.
*/ */
package malte0811.industrialWires.controlpanel; package malte0811.industrialwires.controlpanel;
public enum MessageType { public enum MessageType {
ADD, ADD,

12
src/main/java/malte0811/industrialWires/controlpanel/PanelComponent.java → src/main/java/malte0811/industrialwires/controlpanel/PanelComponent.java
View file

@ -13,13 +13,13 @@
* along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>. * along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>.
*/ */
package malte0811.industrialWires.controlpanel; package malte0811.industrialwires.controlpanel;
import malte0811.industrialWires.IndustrialWires; import malte0811.industrialwires.IndustrialWires;
import malte0811.industrialWires.blocks.controlpanel.TileEntityPanel; import malte0811.industrialwires.blocks.controlpanel.TileEntityPanel;
import malte0811.industrialWires.client.RawQuad; import malte0811.industrialwires.client.RawQuad;
import malte0811.industrialWires.client.gui.GuiPanelCreator; import malte0811.industrialwires.client.gui.GuiPanelCreator;
import malte0811.industrialWires.controlpanel.ControlPanelNetwork.IOwner; import malte0811.industrialwires.controlpanel.ControlPanelNetwork.IOwner;
import net.minecraft.client.gui.Gui; import net.minecraft.client.gui.Gui;
import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.GlStateManager;
import net.minecraft.client.renderer.RenderGlobal; import net.minecraft.client.renderer.RenderGlobal;

16
src/main/java/malte0811/industrialWires/controlpanel/PanelMeter.java → src/main/java/malte0811/industrialwires/controlpanel/PanelMeter.java
View file

@ -13,15 +13,15 @@
* along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>. * along with Industrial Wires. If not, see <http://www.gnu.org/licenses/>.
*/ */
package malte0811.industrialWires.controlpanel; package malte0811.industrialwires.controlpanel;
import blusunrize.immersiveengineering.common.util.chickenbones.Matrix4; import blusunrize.immersiveengineering.common.util.chickenbones.Matrix4;
import malte0811.industrialWires.IndustrialWires; import malte0811.industrialwires.IndustrialWires;
import malte0811.industrialWires.client.RawQuad; import malte0811.industrialwires.client.RawQuad;
import malte0811.industrialWires.client.gui.GuiPanelCreator; import malte0811.industrialwires.client.gui.GuiPanelCreator;
import malte0811.industrialWires.client.panelmodel.RawModelFontRenderer; import malte0811.industrialwires.client.panelmodel.RawModelFontRenderer;
import malte0811.industrialWires.controlpanel.ControlPanelNetwork.RSChannel; import malte0811.industrialwires.controlpanel.ControlPanelNetwork.RSChannel;
import malte0811.industrialWires.controlpanel.ControlPanelNetwork.RSChannelState; import malte0811.industrialwires.controlpanel.ControlPanelNetwork.RSChannelState;
import net.minecraft.client.gui.Gui; import net.minecraft.client.gui.Gui;
import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.GlStateManager;
import net.minecraft.client.resources.I18n; import net.minecraft.client.resources.I18n;
@ -42,7 +42,7 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.function.Consumer; import java.util.function.Consumer;
import static malte0811.industrialWires.util.NBTKeys.*; import static malte0811.industrialwires.util.NBTKeys.*;
public class PanelMeter extends PanelComponent implements IConfigurableComponent { public class PanelMeter extends PanelComponent implements IConfigurableComponent {
@Nonnull @Nonnull

Some files were not shown because too many files have changed in this diff Show more