fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Restructured registry packages (#2703)

Browse Source 
Moved larger registries together with their related classes instead of putting unrelated classes into the same package.
This commit is contained in:
yueh
2016-12-14 22:35:52 +01:00
committed by GitHub
parent fb79fd284d
commit db85419702
13 changed files with 51 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/core/Registration.java
+2 -2
View File
@@ -57,8 +57,8 @@ import appeng.api.parts.IPartHelper;
import appeng.capabilities.Capabilities;
import appeng.core.features.AEFeature;
import appeng.core.features.registries.P2PTunnelRegistry;
import appeng.core.features.registries.entries.BasicCellHandler;
import appeng.core.features.registries.entries.CreativeCellHandler;
import appeng.core.features.registries.cell.BasicCellHandler;
import appeng.core.features.registries.cell.CreativeCellHandler;
import appeng.core.localization.GuiText;
import appeng.core.localization.PlayerMessages;
import appeng.core.stats.PlayerStatsRegistration;
src/main/java/appeng/core/features/registries/RegistryContainer.java
+3
View File
@@ -34,6 +34,9 @@ import appeng.api.movable.IMovableRegistry;
import appeng.api.networking.IGridCacheRegistry;
import appeng.api.parts.IPartModels;
import appeng.api.storage.ICellRegistry;
import appeng.core.features.registries.cell.CellRegistry;
import appeng.core.features.registries.grinder.GrinderRecipeManager;
import appeng.core.features.registries.inscriber.InscriberRegistry;
/**
src/main/java/appeng/core/features/registries/entries/BasicCellHandler.java → src/main/java/appeng/core/features/registries/cell/BasicCellHandler.java
+1 -1
View File
@@ -16,7 +16,7 @@
* along with Applied Energistics 2. If not, see <http://www.gnu.org/licenses/lgpl>.
*/
package appeng.core.features.registries.entries;
package appeng.core.features.registries.cell;
import net.minecraft.entity.player.EntityPlayer;
src/main/java/appeng/core/features/registries/CellRegistry.java → src/main/java/appeng/core/features/registries/cell/CellRegistry.java
+1 -1
View File
@@ -16,7 +16,7 @@
* along with Applied Energistics 2. If not, see <http://www.gnu.org/licenses/lgpl>.
*/
package appeng.core.features.registries;
package appeng.core.features.registries.cell;
import java.util.ArrayList;
src/main/java/appeng/core/features/registries/entries/CreativeCellHandler.java → src/main/java/appeng/core/features/registries/cell/CreativeCellHandler.java
+1 -1
View File
@@ -16,7 +16,7 @@
* along with Applied Energistics 2. If not, see <http://www.gnu.org/licenses/lgpl>.
*/
package appeng.core.features.registries.entries;
package appeng.core.features.registries.cell;
import net.minecraft.entity.player.EntityPlayer;
src/main/java/appeng/core/features/registries/entries/AppEngGrinderRecipe.java → src/main/java/appeng/core/features/registries/grinder/AppEngGrinderRecipe.java
+4 -4
View File
@@ -16,7 +16,7 @@
* along with Applied Energistics 2. If not, see <http://www.gnu.org/licenses/lgpl>.
*/
package appeng.core.features.registries.entries;
package appeng.core.features.registries.grinder;
import java.util.Optional;
@@ -40,17 +40,17 @@ public class AppEngGrinderRecipe implements IGrinderRecipe
private final int turns;
public AppEngGrinderRecipe( final ItemStack input, final ItemStack output, final int cost )
AppEngGrinderRecipe( final ItemStack input, final ItemStack output, final int cost )
{
this( input, output, null, null, 0, 0, cost );
}
public AppEngGrinderRecipe( final ItemStack input, final ItemStack output, final ItemStack optional, final float chance, final int cost )
AppEngGrinderRecipe( final ItemStack input, final ItemStack output, final ItemStack optional, final float chance, final int cost )
{
this( input, output, optional, null, chance, 0, cost );
}
public AppEngGrinderRecipe( final ItemStack input, final ItemStack output, final ItemStack optional1, final ItemStack optional2, final float chance1, final float chance2, final int cost )
AppEngGrinderRecipe( final ItemStack input, final ItemStack output, final ItemStack optional1, final ItemStack optional2, final float chance1, final float chance2, final int cost )
{
this.in = input;
this.out = output;
src/main/java/appeng/core/features/registries/GrinderRecipeManager.java → src/main/java/appeng/core/features/registries/grinder/GrinderRecipeManager.java
+1 -2
View File
@@ -16,7 +16,7 @@
* along with Applied Energistics 2. If not, see <http://www.gnu.org/licenses/lgpl>.
*/
package appeng.core.features.registries;
package appeng.core.features.registries.grinder;
import java.util.Collection;
@@ -36,7 +36,6 @@ import appeng.api.features.IGrinderRecipe;
import appeng.api.features.IGrinderRegistry;
import appeng.core.AEConfig;
import appeng.core.AELog;
import appeng.core.features.registries.entries.AppEngGrinderRecipe;
import appeng.recipes.ores.IOreListener;
import appeng.recipes.ores.OreDictionaryHandler;
import appeng.util.Platform;
src/main/java/appeng/core/features/registries/entries/InscriberInscribeRecipe.java → src/main/java/appeng/core/features/registries/inscriber/InscriberInscribeRecipe.java
+2 -2
View File
@@ -16,7 +16,7 @@
* along with Applied Energistics 2. If not, see <http://www.gnu.org/licenses/lgpl>.
*/
package appeng.core.features.registries.entries;
package appeng.core.features.registries.inscriber;
import java.util.Collection;
@@ -38,7 +38,7 @@ import appeng.api.features.InscriberProcessType;
*/
public class InscriberInscribeRecipe extends InscriberRecipe
{
public InscriberInscribeRecipe( @Nonnull final Collection<ItemStack> inputs, @Nonnull final ItemStack output, @Nullable final ItemStack top, @Nullable final ItemStack bot )
InscriberInscribeRecipe( @Nonnull final Collection<ItemStack> inputs, @Nonnull final ItemStack output, @Nullable final ItemStack top, @Nullable final ItemStack bot )
{
super( inputs, output, top, bot, InscriberProcessType.INSCRIBE );
}
src/main/java/appeng/core/features/registries/entries/InscriberRecipe.java → src/main/java/appeng/core/features/registries/inscriber/InscriberRecipe.java
+2 -2
View File
@@ -16,7 +16,7 @@
* along with Applied Energistics 2. If not, see <http://www.gnu.org/licenses/lgpl>.
*/
package appeng.core.features.registries.entries;
package appeng.core.features.registries.inscriber;
import java.util.ArrayList;
@@ -57,7 +57,7 @@ public class InscriberRecipe implements IInscriberRecipe
@Nonnull
private final InscriberProcessType type;
public InscriberRecipe( @Nonnull final Collection<ItemStack> inputs, @Nonnull final ItemStack output, @Nullable final ItemStack top, @Nullable final ItemStack bot, @Nonnull final InscriberProcessType type )
InscriberRecipe( @Nonnull final Collection<ItemStack> inputs, @Nonnull final ItemStack output, @Nullable final ItemStack top, @Nullable final ItemStack bot, @Nonnull final InscriberProcessType type )
{
this.inputs = new ArrayList<ItemStack>( inputs.size() );
this.inputs.addAll( inputs );
src/main/java/appeng/core/features/registries/InscriberRegistry.java → src/main/java/appeng/core/features/registries/inscriber/InscriberRegistry.java
+1 -2
View File
@@ -16,7 +16,7 @@
* along with Applied Energistics 2. If not, see <http://www.gnu.org/licenses/lgpl>.
*/
package appeng.core.features.registries;
package appeng.core.features.registries.inscriber;
import java.util.ArrayList;
@@ -35,7 +35,6 @@ import appeng.api.features.IInscriberRecipe;
import appeng.api.features.IInscriberRecipeBuilder;
import appeng.api.features.IInscriberRegistry;
import appeng.api.features.InscriberProcessType;
import appeng.core.features.registries.entries.InscriberRecipe;
/**