Commit d74d27bf authored by mrAppleXZ's avatar mrAppleXZ 💾

Imports, buildscript changes (THE ATS ARE WORKING THE RIGHT WAY NOW, YAY), README stuff

parent 8b785f00
Subproject commit 2c7a044ca794b67b5d52c4f25ca7572fa630827a
Subproject commit cbb542ea76be1dbede4b8b899158e0992f8b7190
# Purificati Magicae
## Preparing the project
1: Create a directory for the workspace: `mkdir purmag`
2: Open the created directory.
3: Clone the Purificati Magicae repository.
1: Clone the Purificati Magicae repository.
HTTPS: `git clone --recursive https://git.pearx.ru/PearXTeam/PurificatiMagicae.git`
SSH: `git clone --recursive git@pearx.ru:PearXTeam/PurificatiMagicae.git`
4: Clone the PearXLibMC repository.
HTTPS: `git clone --recursive https://github.com/PearXTeam/PearXLibMC.git -b 1.12`
SSH: `git clone --recursive git@github.com:PearXTeam/PearXLibMC.git -b 1.12`
## Setting up the project for development.
1: Execute the instructions in the "Preparing the project" section.
1: Make sure that the instructions in the "Preparing the project" section have been executed.
2: Open the cloned Purificati Magicae directory.
2: Open the cloned directory.
3: Setup the workspace:
......@@ -29,16 +19,16 @@ Windows: `gradlew.bat setupDecompWorkspace`
4: Create "run" directory: `mkdir run`
5: Open IDEA, import build.gradle. Uncheck "Create separate module per source set".
5: Open IntelliJ IDEA, import build.gradle as a Gradle project. Make sure "Create separate module per source set" is checked.
6: Wait some time until all background tasks finished.
6: Wait some time until all the background tasks finished.
7: Create two run configurations of type "Application". In both configurations, select "PurificatiMagicae" in "Use classpath of module:" and type at the end of "Working directory:" "\run" on Windows and "/run" on *nix. In first configuration, use "GradleStart" as main class. It's a client configuration. In second configuration, use "GradleStartServer" as main class. It's a server configuration.
7: Create two run configurations of type "Application". In both configurations, select "PurificatiMagicae_main" in "Use classpath of module:" and type at the end of "Working directory:" "\run" on Windows and "/run" on *nix. In first configuration, use "GradleStart" as a main class. It's a client configuration. In the second configuration, use "GradleStartServer" as a main class. It's a server configuration.
## Building the project
1: Execute the instructions in the "Preparing the project" section.
1: Make sure that the instructions in the "Preparing the project" section have been executed.
2: Open the cloned Purificati Magicae directory.
2: Open the cloned directory.
3: Build the project:
......@@ -46,4 +36,4 @@ Windows: `gradlew.bat build`
*nix: `./gradlew build`
All the .jar files will be available in the "build/libs" directory.
\ No newline at end of file
All the .jar files will be available inside the "build/libs" directory.
\ No newline at end of file
buildscript {
repositories {
jcenter()
maven { url = "http://files.minecraftforge.net/maven" }
maven { url = 'http://files.minecraftforge.net/maven' }
}
dependencies {
classpath 'net.minecraftforge.gradle:ForgeGradle:2.3-SNAPSHOT'
classpath "net.minecraftforge.gradle:ForgeGradle:${fg_version}"
}
}
......@@ -20,13 +20,13 @@ repositories {
url "http://maven.tterrag.com"
}
maven {
name = "CoFH Maven"
name = "covers1624"
url = "http://maven.covers1624.net"
}
}
version = "${mod_version}.${build_number}"
group= "ru.pearx.purmag"
version = "${mod_version}+${build_number}"
group = "ru.pearx.purmag"
archivesBaseName = "PurificatiMagicae-${mc_version}"
sourceCompatibility = targetCompatibility = "1.8"
......@@ -34,6 +34,7 @@ compileJava {
sourceCompatibility = targetCompatibility = "1.8"
}
evaluationDependsOn(project("CarbideMC").path)
minecraft {
version = mc_version + "-" + forge_version
runDir = "run"
......@@ -42,27 +43,20 @@ minecraft {
replace("@MCVERSION@", mc_version)
replace("acceptedMinecraftVersions = \"\"", "acceptedMinecraftVersions = \"" + accepted_mc_versions + "\"")
replaceIn("PurMag.java")
accessTransformerSource(project.project("CarbideMC").sourceSets.main)
}
configurations {
incljar
}
dependencies {
compile project("PearXLibMC")
compile project("CarbideMC")
deobfCompile "mezz.jei:jei_" + jei_mcversion + ":" + jei_version + ":api"
runtime "mezz.jei:jei_" + jei_mcversion + ":" + jei_version
deobfCompile "mcjty.theoneprobe:TheOneProbe-" + top_mcversion + ":" + top_mcversion + "-" + top_version
compile configurations.incljar.dependencies
}
processResources {
rename '(.+_at.cfg)', 'META-INF/$1'
}
jar {
manifest {
attributes 'FMLAT': 'purmag_at.cfg'
}
from configurations.incljar
}
\ No newline at end of file
org.gradle.jvmargs=-Xmx3G
fg_version=2.3-SNAPSHOT
mc_version=1.12.2
forge_version=14.23.1.2566
forge_version=14.23.4.2703
jei_mcversion=1.12.2
jei_version=4.8.5.136
jei_version=4.9.1.191
top_mcversion=1.12
top_version=1.4.19-11
mcmp_version=2.4.1
mappings_version=snapshot_20171214
top_version=1.4.22-13
mappings_version=snapshot_20180524
accepted_mc_versions=[1.12]
mod_version=0.0
mod_version=0.0.0
build_number=0
\ No newline at end of file
#Sat May 26 19:07:13 YEKT 2018
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.7-all.zip
include ":PearXLibMC"
project(":PearXLibMC").projectDir = file("../PearXLibMC")
include ":PearXLibMC:PearXLib2"
include ":CarbideMC"
include ":CarbideMC:CarbideLib"
......@@ -37,7 +37,7 @@ import java.util.Random;
/**
* Created by mrAppleXZ on 08.04.17 10:31.
*/
@Mod(name = PurMag.NAME, modid = PurMag.MODID, version = PurMag.VERSION, acceptedMinecraftVersions = "", dependencies = "required-after:pxlmc;required-after:baubles;required-after:jei;")
@Mod(name = PurMag.NAME, modid = PurMag.MODID, version = PurMag.VERSION, acceptedMinecraftVersions = "", dependencies = "required-after:carbide;required-after:baubles;required-after:jei;")
public class PurMag
{
public static final String MODID = "purmag";
......
......@@ -8,7 +8,7 @@ import net.minecraft.world.World;
import net.minecraftforge.client.model.obj.OBJLoader;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import ru.pearx.libmc.client.gui.PXLGui;
import ru.pearx.carbide.mc.client.gui.PXLGui;
import ru.pearx.purmag.PurMag;
import ru.pearx.purmag.client.gui.GuiPapyrus;
import ru.pearx.purmag.client.gui.code_storage.GuiCodeStorageUnlock;
......
......@@ -2,9 +2,9 @@ package ru.pearx.purmag.client;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import ru.pearx.libmc.client.gui.drawables.AnimatedDrawable;
import ru.pearx.libmc.client.gui.drawables.IGuiDrawable;
import ru.pearx.libmc.client.gui.drawables.SimpleDrawable;
import ru.pearx.carbide.mc.client.gui.drawables.AnimatedDrawable;
import ru.pearx.carbide.mc.client.gui.drawables.IGuiDrawable;
import ru.pearx.carbide.mc.client.gui.drawables.SimpleDrawable;
import ru.pearx.purmag.common.Utils;
/**
......
......@@ -8,7 +8,7 @@ import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import ru.pearx.libmc.client.models.IPXModel;
import ru.pearx.carbide.mc.client.models.IPXModel;
import ru.pearx.purmag.PurMag;
import ru.pearx.purmag.client.models.StandardModels;
import ru.pearx.purmag.common.Utils;
......
......@@ -5,10 +5,10 @@ import net.minecraft.client.resources.I18n;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import ru.pearx.libmc.client.gui.DrawingTools;
import ru.pearx.libmc.client.gui.controls.Control;
import ru.pearx.libmc.client.gui.controls.GuiOnScreenContainer;
import ru.pearx.libmc.client.gui.inventory.PXLGuiContainerControls;
import ru.pearx.carbide.mc.client.gui.DrawingTools;
import ru.pearx.carbide.mc.client.gui.controls.Control;
import ru.pearx.carbide.mc.client.gui.controls.GuiOnScreenContainer;
import ru.pearx.carbide.mc.client.gui.inventory.PXLGuiContainerControls;
import ru.pearx.purmag.common.Utils;
import ru.pearx.purmag.common.inventory.ContainerMagibench;
......
......@@ -4,9 +4,9 @@ import net.minecraft.client.Minecraft;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import ru.pearx.lib.Colors;
import ru.pearx.libmc.client.gui.DrawingTools;
import ru.pearx.libmc.client.gui.controls.GuiOnScreen;
import ru.pearx.carbide.Colors;
import ru.pearx.carbide.mc.client.gui.DrawingTools;
import ru.pearx.carbide.mc.client.gui.controls.GuiOnScreen;
import ru.pearx.purmag.PurMag;
import ru.pearx.purmag.common.Utils;
......
......@@ -5,10 +5,10 @@ import net.minecraft.client.resources.I18n;
import net.minecraft.util.math.BlockPos;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import ru.pearx.lib.Colors;
import ru.pearx.libmc.client.gui.DrawingTools;
import ru.pearx.libmc.client.gui.controls.common.Button;
import ru.pearx.libmc.client.gui.controls.common.TextBox;
import ru.pearx.carbide.Colors;
import ru.pearx.carbide.mc.client.gui.DrawingTools;
import ru.pearx.carbide.mc.client.gui.controls.common.Button;
import ru.pearx.carbide.mc.client.gui.controls.common.TextBox;
import ru.pearx.purmag.client.PurMagClient;
import ru.pearx.purmag.common.Utils;
import ru.pearx.purmag.common.networking.NetworkManager;
......
......@@ -3,8 +3,8 @@ package ru.pearx.purmag.client.gui.code_storage;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import ru.pearx.libmc.client.gui.DrawingTools;
import ru.pearx.libmc.client.gui.controls.GuiOnScreen;
import ru.pearx.carbide.mc.client.gui.DrawingTools;
import ru.pearx.carbide.mc.client.gui.controls.GuiOnScreen;
import ru.pearx.purmag.common.Utils;
/*
......
......@@ -5,10 +5,10 @@ import net.minecraft.client.resources.I18n;
import net.minecraft.util.math.BlockPos;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import ru.pearx.lib.Colors;
import ru.pearx.libmc.client.gui.DrawingTools;
import ru.pearx.libmc.client.gui.controls.common.Button;
import ru.pearx.libmc.client.gui.controls.common.TextBox;
import ru.pearx.carbide.Colors;
import ru.pearx.carbide.mc.client.gui.DrawingTools;
import ru.pearx.carbide.mc.client.gui.controls.common.Button;
import ru.pearx.carbide.mc.client.gui.controls.common.TextBox;
import ru.pearx.purmag.client.PurMagClient;
import ru.pearx.purmag.common.Utils;
import ru.pearx.purmag.common.networking.NetworkManager;
......
......@@ -6,11 +6,11 @@ import net.minecraft.client.resources.I18n;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import ru.pearx.libmc.client.gui.DrawingTools;
import ru.pearx.libmc.client.gui.PXLGui;
import ru.pearx.libmc.client.gui.controls.GuiOnScreen;
import ru.pearx.libmc.client.gui.controls.common.Button;
import ru.pearx.libmc.client.gui.inventory.PXLGuiContainerControls;
import ru.pearx.carbide.mc.client.gui.DrawingTools;
import ru.pearx.carbide.mc.client.gui.PXLGui;
import ru.pearx.carbide.mc.client.gui.controls.GuiOnScreen;
import ru.pearx.carbide.mc.client.gui.controls.common.Button;
import ru.pearx.carbide.mc.client.gui.inventory.PXLGuiContainerControls;
import ru.pearx.purmag.client.PurMagClient;
import ru.pearx.purmag.common.Utils;
import ru.pearx.purmag.common.inventory.ContainerCodeStorage;
......
......@@ -17,10 +17,10 @@ import net.minecraft.util.ReportedException;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import ru.pearx.lib.Colors;
import ru.pearx.lib.Supplied;
import ru.pearx.libmc.client.gui.DrawingTools;
import ru.pearx.libmc.client.gui.controls.common.AbstractOfParts;
import ru.pearx.carbide.Colors;
import ru.pearx.carbide.Supplied;
import ru.pearx.carbide.mc.client.gui.DrawingTools;
import ru.pearx.carbide.mc.client.gui.controls.common.AbstractOfParts;
import ru.pearx.purmag.common.Utils;
import ru.pearx.purmag.common.compat.jei.PMJeiPlugin;
import ru.pearx.purmag.common.compat.jei.magibench.MagibenchRecipeCategory;
......
......@@ -5,9 +5,9 @@ import net.minecraft.client.resources.I18n;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import ru.pearx.lib.Colors;
import ru.pearx.libmc.client.gui.DrawingTools;
import ru.pearx.libmc.client.gui.controls.common.BlockArrayShowcase;
import ru.pearx.carbide.Colors;
import ru.pearx.carbide.mc.client.gui.DrawingTools;
import ru.pearx.carbide.mc.client.gui.controls.common.BlockArrayShowcase;
import ru.pearx.purmag.common.blocks.multiblock.PMMultiblock;
import ru.pearx.purmag.common.items.tinkering_kit.ItemTinkeringKit;
......
......@@ -4,10 +4,9 @@ import net.minecraft.client.renderer.GlStateManager;
import net.minecraft.util.math.MathHelper;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import ru.pearx.libmc.client.gui.controls.GuiOnScreen;
import ru.pearx.libmc.client.gui.TexturePart;
import ru.pearx.carbide.mc.client.gui.controls.GuiOnScreen;
import ru.pearx.carbide.mc.client.gui.TexturePart;
import ru.pearx.purmag.PurMag;
import ru.pearx.purmag.client.PurMagClient;
import ru.pearx.purmag.common.infofield.IfTier;
/**
......
......@@ -3,9 +3,7 @@ package ru.pearx.purmag.client.gui.if_tablet;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import org.lwjgl.input.Keyboard;
import ru.pearx.libmc.client.gui.DrawingTools;
import ru.pearx.libmc.client.gui.controls.Control;
import ru.pearx.purmag.PurMag;
import ru.pearx.carbide.mc.client.gui.controls.Control;
/**
* Created by mrAppleXZ on 28.04.17 11:27.
......
package ru.pearx.purmag.client.gui.if_tablet;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.GlStateManager;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import ru.pearx.lib.Colors;
import ru.pearx.libmc.client.gui.DrawingTools;
import ru.pearx.carbide.Colors;
import ru.pearx.carbide.mc.client.gui.DrawingTools;
/**
......
......@@ -5,7 +5,7 @@ import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import org.lwjgl.input.Mouse;
import org.lwjgl.util.Point;
import ru.pearx.libmc.client.gui.controls.Control;
import ru.pearx.carbide.mc.client.gui.controls.Control;
import ru.pearx.purmag.PurMag;
import ru.pearx.purmag.common.infofield.IfChannel;
import ru.pearx.purmag.common.infofield.IfEntry;
......
......@@ -5,9 +5,9 @@ import net.minecraft.client.renderer.GlStateManager;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import org.lwjgl.util.Point;
import ru.pearx.lib.Colors;
import ru.pearx.libmc.client.gui.DrawingTools;
import ru.pearx.libmc.client.gui.controls.Control;
import ru.pearx.carbide.Colors;
import ru.pearx.carbide.mc.client.gui.DrawingTools;
import ru.pearx.carbide.mc.client.gui.controls.Control;
import ru.pearx.purmag.common.CapabilityRegistry;
import ru.pearx.purmag.common.infofield.IfEntry;
......
......@@ -2,7 +2,7 @@ package ru.pearx.purmag.client.gui.if_tablet;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import ru.pearx.libmc.client.gui.controls.Control;
import ru.pearx.carbide.mc.client.gui.controls.Control;
/**
* Created by mrAppleXZ on 28.04.17 11:34.
......
......@@ -5,8 +5,8 @@ import net.minecraft.client.renderer.GlStateManager;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import org.lwjgl.input.Keyboard;
import ru.pearx.libmc.client.gui.TexturePart;
import ru.pearx.libmc.client.gui.drawables.IGuiDrawable;
import ru.pearx.carbide.mc.client.gui.TexturePart;
import ru.pearx.carbide.mc.client.gui.drawables.IGuiDrawable;
import ru.pearx.purmag.PurMag;
import ru.pearx.purmag.common.SoundRegistry;
import ru.pearx.purmag.common.infofield.IfChannel;
......
......@@ -4,9 +4,9 @@ import net.minecraft.client.resources.I18n;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import org.lwjgl.input.Keyboard;
import ru.pearx.lib.Colors;
import ru.pearx.libmc.client.gui.DrawingTools;
import ru.pearx.libmc.client.gui.controls.common.Button;
import ru.pearx.carbide.Colors;
import ru.pearx.carbide.mc.client.gui.DrawingTools;
import ru.pearx.carbide.mc.client.gui.controls.common.Button;
import ru.pearx.purmag.PurMag;
import ru.pearx.purmag.client.GuiDrawableRegistry;
import ru.pearx.purmag.client.PurMagClient;
......
......@@ -4,9 +4,9 @@ import net.minecraft.client.Minecraft;
import net.minecraft.client.resources.I18n;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import ru.pearx.lib.Colors;
import ru.pearx.libmc.client.gui.DrawingTools;
import ru.pearx.libmc.client.gui.controls.common.Button;
import ru.pearx.carbide.Colors;
import ru.pearx.carbide.mc.client.gui.DrawingTools;
import ru.pearx.carbide.mc.client.gui.controls.common.Button;
import ru.pearx.purmag.client.PurMagClient;
import ru.pearx.purmag.common.CapabilityRegistry;
import ru.pearx.purmag.common.infofield.IfEntry;
......
......@@ -2,9 +2,9 @@ package ru.pearx.purmag.client.gui.if_tablet.pages;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import ru.pearx.lib.Colors;
import ru.pearx.libmc.client.gui.DrawingTools;
import ru.pearx.libmc.client.gui.controls.common.BlockArrayShowcase;
import ru.pearx.carbide.Colors;
import ru.pearx.carbide.mc.client.gui.DrawingTools;
import ru.pearx.carbide.mc.client.gui.controls.common.BlockArrayShowcase;
import ru.pearx.purmag.client.infofield.pages.IfPageAbstractBlocks;
/*
......
package ru.pearx.purmag.client.gui.if_tablet.pages;
import net.minecraft.client.resources.I18n;
import ru.pearx.lib.Colors;
import ru.pearx.libmc.client.gui.DrawingTools;
import ru.pearx.libmc.client.gui.controls.Control;
import ru.pearx.carbide.Colors;
import ru.pearx.carbide.mc.client.gui.DrawingTools;
import ru.pearx.carbide.mc.client.gui.controls.Control;
import ru.pearx.purmag.client.infofield.pages.IIfPage;
import java.util.List;
......
......@@ -2,7 +2,7 @@ package ru.pearx.purmag.client.gui.if_tablet.pages;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import ru.pearx.libmc.client.gui.controls.common.BlockArrayShowcase;
import ru.pearx.carbide.mc.client.gui.controls.common.BlockArrayShowcase;
import ru.pearx.purmag.client.PurMagClient;
import ru.pearx.purmag.client.infofield.pages.IfPageBlocks;
......
package ru.pearx.purmag.client.gui.if_tablet.pages;
import net.minecraft.client.resources.I18n;
import ru.pearx.lib.Colors;
import ru.pearx.lib.Supplied;
import ru.pearx.libmc.client.gui.DrawingTools;
import ru.pearx.carbide.Colors;
import ru.pearx.carbide.Supplied;
import ru.pearx.carbide.mc.client.gui.DrawingTools;
import ru.pearx.purmag.client.gui.controls.CraftingControl;
import ru.pearx.purmag.client.infofield.pages.IfPageCrafting;
......
package ru.pearx.purmag.client.gui.if_tablet.pages;
import ru.pearx.lib.Colors;
import ru.pearx.libmc.client.gui.DrawingTools;
import ru.pearx.libmc.client.gui.controls.common.EntityShowcase;
import ru.pearx.carbide.Colors;
import ru.pearx.carbide.mc.client.gui.DrawingTools;
import ru.pearx.carbide.mc.client.gui.controls.common.EntityShowcase;
import ru.pearx.purmag.client.infofield.pages.IfPageEntity;
......
package ru.pearx.purmag.client.gui.if_tablet.pages;
import net.minecraft.util.ResourceLocation;
import ru.pearx.lib.Colors;
import ru.pearx.libmc.client.gui.DrawingTools;
import ru.pearx.carbide.Colors;
import ru.pearx.carbide.mc.client.gui.DrawingTools;
import ru.pearx.purmag.client.infofield.pages.IfPagePapyrus;
import ru.pearx.purmag.common.Utils;
......
package ru.pearx.purmag.client.gui.if_tablet.pages;
import ru.pearx.lib.Colors;
import ru.pearx.libmc.client.gui.DrawingTools;
import ru.pearx.carbide.Colors;
import ru.pearx.carbide.mc.client.gui.DrawingTools;
import ru.pearx.purmag.client.infofield.pages.IfPagePicture;
/*
......
......@@ -2,8 +2,8 @@ package ru.pearx.purmag.client.gui.if_tablet.pages;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import ru.pearx.libmc.client.gui.DrawingTools;
import ru.pearx.libmc.client.gui.controls.Control;
import ru.pearx.carbide.mc.client.gui.DrawingTools;
import ru.pearx.carbide.mc.client.gui.controls.Control;
import ru.pearx.purmag.client.GuiDrawableRegistry;
import ru.pearx.purmag.client.gui.if_tablet.GuiIfTabletSP;
import ru.pearx.purmag.client.infofield.pages.IIfPage;
......
......@@ -2,8 +2,8 @@ package ru.pearx.purmag.client.gui.if_tablet.pages;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import ru.pearx.lib.Colors;
import ru.pearx.libmc.client.gui.DrawingTools;
import ru.pearx.carbide.Colors;
import ru.pearx.carbide.mc.client.gui.DrawingTools;
import ru.pearx.purmag.client.infofield.pages.IfPageText;
......
......@@ -3,10 +3,10 @@ package ru.pearx.purmag.client.gui.if_tablet.steps;
import net.minecraft.util.math.BlockPos;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import ru.pearx.lib.Colors;
import ru.pearx.libmc.client.gui.DrawingTools;
import ru.pearx.libmc.client.gui.controls.common.BlockArrayShowcase;
import ru.pearx.libmc.common.structure.blockarray.BlockArray;
import ru.pearx.carbide.Colors;
import ru.pearx.carbide.mc.client.gui.DrawingTools;
import ru.pearx.carbide.mc.client.gui.controls.common.BlockArrayShowcase;
import ru.pearx.carbide.mc.common.structure.blockarray.BlockArray;
import ru.pearx.purmag.client.PurMagClient;
import ru.pearx.purmag.common.infofield.steps.IRSBlockInteract;
......
......@@ -3,10 +3,10 @@ package ru.pearx.purmag.client.gui.if_tablet.steps;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import org.lwjgl.util.Point;
import ru.pearx.lib.Colors;
import ru.pearx.libmc.client.gui.DrawingTools;
import ru.pearx.libmc.client.gui.drawables.item.MultiItemDrawable;
import ru.pearx.libmc.common.ItemStackUtils;
import ru.pearx.carbide.Colors;
import ru.pearx.carbide.mc.client.gui.DrawingTools;
import ru.pearx.carbide.mc.client.gui.drawables.item.MultiItemDrawable;
import ru.pearx.carbide.mc.common.ItemStackUtils;
import ru.pearx.purmag.common.infofield.steps.IRSIngredient;
/*
......
......@@ -2,9 +2,9 @@ package ru.pearx.purmag.client.gui.if_tablet.steps;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import ru.pearx.lib.Colors;
import ru.pearx.libmc.client.gui.DrawingTools;
import ru.pearx.libmc.client.gui.controls.common.EntityShowcase;
import ru.pearx.carbide.Colors;
import ru.pearx.carbide.mc.client.gui.DrawingTools;
import ru.pearx.carbide.mc.client.gui.controls.common.EntityShowcase;
import ru.pearx.purmag.common.infofield.steps.IRSKillEntity;
......
......@@ -3,9 +3,9 @@ package ru.pearx.purmag.client.gui.if_tablet.steps;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import org.lwjgl.util.Point;
import ru.pearx.lib.Colors;
import ru.pearx.libmc.client.gui.DrawingTools;
import ru.pearx.libmc.client.gui.drawables.item.ItemDrawable;
import ru.pearx.carbide.Colors;
import ru.pearx.carbide.mc.client.gui.DrawingTools;
import ru.pearx.carbide.mc.client.gui.drawables.item.ItemDrawable;
import ru.pearx.purmag.common.infofield.steps.IRSPapyrus;
import ru.pearx.purmag.common.items.ItemRegistry;
......
......@@ -2,7 +2,7 @@ package ru.pearx.purmag.client.gui.if_tablet.steps;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import ru.pearx.libmc.client.gui.controls.Control;
import ru.pearx.carbide.mc.client.gui.controls.Control;
import ru.pearx.purmag.client.gui.if_tablet.GuiIfTabletSR;
import ru.pearx.purmag.common.infofield.steps.IIfResearchStep;
......
......@@ -2,11 +2,10 @@ package ru.pearx.purmag.client.gui.microscope;
import net.minecraft.client.renderer.GlStateManager;
import net.minecraft.util.ResourceLocation;
import ru.pearx.lib.RandomUtils;
import ru.pearx.libmc.client.gui.DrawingTools;
import ru.pearx.libmc.client.gui.controls.GuiOnScreen;
import ru.pearx.libmc.client.gui.drawables.IGuiDrawable;
import ru.pearx.libmc.client.gui.drawables.SimpleDrawable;
import ru.pearx.carbide.RandomUtils;
import ru.pearx.carbide.mc.client.gui.controls.GuiOnScreen;
import ru.pearx.carbide.mc.client.gui.drawables.IGuiDrawable;
import ru.pearx.carbide.mc.client.gui.drawables.SimpleDrawable;
import ru.pearx.purmag.PurMag;
import ru.pearx.purmag.common.Utils;
......
......@@ -7,10 +7,10 @@ import net.minecraft.util.math.BlockPos;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import org.apache.commons.lang3.tuple.Pair;
import ru.pearx.lib.Colors;
import ru.pearx.libmc.client.gui.DrawingTools;
import ru.pearx.libmc.client.gui.PXLGui;
import ru.pearx.libmc.client.gui.controls.common.Button;
import ru.pearx.carbide.Colors;
import ru.pearx.carbide.mc.client.gui.DrawingTools;
import ru.pearx.carbide.mc.client.gui.PXLGui;
import ru.pearx.carbide.mc.client.gui.controls.common.Button;
import ru.pearx.purmag.PurMag;
import ru.pearx.purmag.client.PurMagClient;