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

pick 97420a31d The big reformat of 2020

Browse Source
This commit is contained in:
yueh
2020-06-16 21:41:28 +02:00
parent 5304b3febe
commit 5225ea426b
2252 changed files with 95466 additions and 118582 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/core/stats/AdvancementTriggers.java
+23 -31
View File
@@ -18,42 +18,34 @@
package appeng.core.stats;
import appeng.bootstrap.ICriterionTriggerRegistry;
public class AdvancementTriggers {
private AppEngAdvancementTrigger networkApprentice = new AppEngAdvancementTrigger("network_apprentice");
private AppEngAdvancementTrigger networkEngineer = new AppEngAdvancementTrigger("network_engineer");
private AppEngAdvancementTrigger networkAdmin = new AppEngAdvancementTrigger("network_admin");
private AppEngAdvancementTrigger spatialExplorer = new AppEngAdvancementTrigger("spatial_explorer");
public class AdvancementTriggers
{
private AppEngAdvancementTrigger networkApprentice = new AppEngAdvancementTrigger( "network_apprentice" );
private AppEngAdvancementTrigger networkEngineer = new AppEngAdvancementTrigger( "network_engineer" );
private AppEngAdvancementTrigger networkAdmin = new AppEngAdvancementTrigger( "network_admin" );
private AppEngAdvancementTrigger spatialExplorer = new AppEngAdvancementTrigger( "spatial_explorer" );
public AdvancementTriggers(ICriterionTriggerRegistry registry) {
registry.register(this.networkApprentice);
registry.register(this.networkEngineer);
registry.register(this.networkAdmin);
registry.register(this.spatialExplorer);
}
public AdvancementTriggers( ICriterionTriggerRegistry registry )
{
registry.register( this.networkApprentice );
registry.register( this.networkEngineer );
registry.register( this.networkAdmin );
registry.register( this.spatialExplorer );
}
public IAdvancementTrigger getNetworkApprentice() {
return this.networkApprentice;
}
public IAdvancementTrigger getNetworkApprentice()
{
return this.networkApprentice;
}
public IAdvancementTrigger getNetworkEngineer() {
return this.networkEngineer;
}
public IAdvancementTrigger getNetworkEngineer()
{
return this.networkEngineer;
}
public IAdvancementTrigger getNetworkAdmin() {
return this.networkAdmin;
}
public IAdvancementTrigger getNetworkAdmin()
{
return this.networkAdmin;
}
public IAdvancementTrigger getSpatialExplorer()
{
return this.spatialExplorer;
}
public IAdvancementTrigger getSpatialExplorer() {
return this.spatialExplorer;
}
}
src/main/java/appeng/core/stats/AeStats.java
+26 -29
View File
@@ -18,49 +18,46 @@
package appeng.core.stats;
import appeng.core.AppEng;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.stats.IStatFormatter;
import net.minecraft.stats.Stats;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.registry.Registry;
import appeng.core.AppEng;
public enum AeStats
{
public enum AeStats {
// done
ItemsInserted("items_inserted"),
// done
ItemsInserted("items_inserted"),
// done
ItemsExtracted("items_extracted"),
// done
ItemsExtracted("items_extracted"),
// done
TurnedCranks("turned_cranks");
// done
TurnedCranks("turned_cranks");
private final ResourceLocation registryName;
private final ResourceLocation registryName;
AeStats(String id) {
this.registryName = new ResourceLocation(AppEng.MOD_ID, id);
}
AeStats(String id) {
this.registryName = new ResourceLocation(AppEng.MOD_ID, id);
}
public void addToPlayer(final PlayerEntity player, final int howMany )
{
player.addStat( this.registryName, howMany );
}
public void addToPlayer(final PlayerEntity player, final int howMany) {
player.addStat(this.registryName, howMany);
}
public ResourceLocation getRegistryName() {
return registryName;
}
public ResourceLocation getRegistryName() {
return registryName;
}
public static void register() {
for (AeStats stat : AeStats.values()) {
// Compare with net.minecraft.stats.Stats#registerCustom
ResourceLocation registryName = stat.getRegistryName();
Registry.register(Registry.CUSTOM_STAT, registryName.getPath(), registryName);
Stats.CUSTOM.get(registryName, IStatFormatter.DEFAULT);
}
}
public static void register() {
for (AeStats stat : AeStats.values()) {
// Compare with net.minecraft.stats.Stats#registerCustom
ResourceLocation registryName = stat.getRegistryName();
Registry.register(Registry.CUSTOM_STAT, registryName.getPath(), registryName);
Stats.CUSTOM.get(registryName, IStatFormatter.DEFAULT);
}
}
}
src/main/java/appeng/core/stats/AppEngAdvancementTrigger.java
+88 -113
View File
@@ -18,7 +18,6 @@
package appeng.core.stats;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
@@ -38,139 +37,115 @@ import net.minecraft.util.ResourceLocation;
import appeng.core.AppEng;
public class AppEngAdvancementTrigger
implements ICriterionTrigger<AppEngAdvancementTrigger.Instance>, IAdvancementTrigger {
private final ResourceLocation ID;
private final Map<PlayerAdvancements, AppEngAdvancementTrigger.Listeners> listeners = new HashMap<>();
public class AppEngAdvancementTrigger implements ICriterionTrigger<AppEngAdvancementTrigger.Instance>, IAdvancementTrigger
{
private final ResourceLocation ID;
private final Map<PlayerAdvancements, AppEngAdvancementTrigger.Listeners> listeners = new HashMap<>();
public AppEngAdvancementTrigger(String parString) {
super();
this.ID = new ResourceLocation(AppEng.MOD_ID, parString);
}
public AppEngAdvancementTrigger( String parString )
{
super();
this.ID = new ResourceLocation( AppEng.MOD_ID, parString );
}
@Override
public ResourceLocation getId() {
return this.ID;
}
@Override
public ResourceLocation getId()
{
return this.ID;
}
@Override
public void addListener(PlayerAdvancements playerAdvancementsIn,
ICriterionTrigger.Listener<AppEngAdvancementTrigger.Instance> listener) {
AppEngAdvancementTrigger.Listeners l = this.listeners.get(playerAdvancementsIn);
@Override
public void addListener( PlayerAdvancements playerAdvancementsIn, ICriterionTrigger.Listener<AppEngAdvancementTrigger.Instance> listener )
{
AppEngAdvancementTrigger.Listeners l = this.listeners.get( playerAdvancementsIn );
if (l == null) {
l = new AppEngAdvancementTrigger.Listeners(playerAdvancementsIn);
this.listeners.put(playerAdvancementsIn, l);
}
if( l == null )
{
l = new AppEngAdvancementTrigger.Listeners( playerAdvancementsIn );
this.listeners.put( playerAdvancementsIn, l );
}
l.add(listener);
}
l.add( listener );
}
@Override
public void removeListener(PlayerAdvancements playerAdvancementsIn,
ICriterionTrigger.Listener<AppEngAdvancementTrigger.Instance> listener) {
AppEngAdvancementTrigger.Listeners l = this.listeners.get(playerAdvancementsIn);
@Override
public void removeListener( PlayerAdvancements playerAdvancementsIn, ICriterionTrigger.Listener<AppEngAdvancementTrigger.Instance> listener )
{
AppEngAdvancementTrigger.Listeners l = this.listeners.get( playerAdvancementsIn );
if (l != null) {
l.remove(listener);
if( l != null )
{
l.remove( listener );
if (l.isEmpty()) {
this.listeners.remove(playerAdvancementsIn);
}
}
}
if( l.isEmpty() )
{
this.listeners.remove( playerAdvancementsIn );
}
}
}
@Override
public void removeAllListeners(PlayerAdvancements playerAdvancementsIn) {
this.listeners.remove(playerAdvancementsIn);
}
@Override
public void removeAllListeners( PlayerAdvancements playerAdvancementsIn )
{
this.listeners.remove( playerAdvancementsIn );
}
@Override
public AppEngAdvancementTrigger.Instance deserializeInstance(JsonObject json, JsonDeserializationContext context) {
return new AppEngAdvancementTrigger.Instance(this.getId());
}
@Override
public AppEngAdvancementTrigger.Instance deserializeInstance( JsonObject json, JsonDeserializationContext context )
{
return new AppEngAdvancementTrigger.Instance( this.getId() );
}
@Override
public void trigger(ServerPlayerEntity parPlayer) {
AppEngAdvancementTrigger.Listeners l = this.listeners.get(parPlayer.getAdvancements());
@Override
public void trigger( ServerPlayerEntity parPlayer )
{
AppEngAdvancementTrigger.Listeners l = this.listeners.get( parPlayer.getAdvancements() );
if (l != null) {
l.trigger(parPlayer);
}
}
if( l != null )
{
l.trigger( parPlayer );
}
}
public static class Instance extends CriterionInstance {
public Instance(ResourceLocation parID) {
super(parID);
}
public static class Instance extends CriterionInstance
{
public Instance( ResourceLocation parID )
{
super( parID );
}
public boolean test() {
return true;
}
}
public boolean test()
{
return true;
}
}
static class Listeners {
private final PlayerAdvancements playerAdvancements;
private final Set<ICriterionTrigger.Listener<AppEngAdvancementTrigger.Instance>> listeners = new HashSet<>();
static class Listeners
{
private final PlayerAdvancements playerAdvancements;
private final Set<ICriterionTrigger.Listener<AppEngAdvancementTrigger.Instance>> listeners = new HashSet<>();
Listeners(PlayerAdvancements playerAdvancementsIn) {
this.playerAdvancements = playerAdvancementsIn;
}
Listeners( PlayerAdvancements playerAdvancementsIn )
{
this.playerAdvancements = playerAdvancementsIn;
}
public boolean isEmpty() {
return this.listeners.isEmpty();
}
public boolean isEmpty()
{
return this.listeners.isEmpty();
}
public void add(ICriterionTrigger.Listener<AppEngAdvancementTrigger.Instance> listener) {
this.listeners.add(listener);
}
public void add( ICriterionTrigger.Listener<AppEngAdvancementTrigger.Instance> listener )
{
this.listeners.add( listener );
}
public void remove(ICriterionTrigger.Listener<AppEngAdvancementTrigger.Instance> listener) {
this.listeners.remove(listener);
}
public void remove( ICriterionTrigger.Listener<AppEngAdvancementTrigger.Instance> listener )
{
this.listeners.remove( listener );
}
public void trigger(PlayerEntity player) {
List<ICriterionTrigger.Listener<AppEngAdvancementTrigger.Instance>> list = null;
public void trigger( PlayerEntity player )
{
List<ICriterionTrigger.Listener<AppEngAdvancementTrigger.Instance>> list = null;
for (ICriterionTrigger.Listener<AppEngAdvancementTrigger.Instance> listener : this.listeners) {
if (listener.getCriterionInstance().test()) {
if (list == null) {
list = new ArrayList<>();
}
for( ICriterionTrigger.Listener<AppEngAdvancementTrigger.Instance> listener : this.listeners )
{
if( listener.getCriterionInstance().test() )
{
if( list == null )
{
list = new ArrayList<>();
}
list.add(listener);
}
}
list.add( listener );
}
}
if( list != null )
{
for( ICriterionTrigger.Listener<AppEngAdvancementTrigger.Instance> l : list )
{
l.grantCriterion( this.playerAdvancements );
}
}
}
}
if (list != null) {
for (ICriterionTrigger.Listener<AppEngAdvancementTrigger.Instance> l : list) {
l.grantCriterion(this.playerAdvancements);
}
}
}
}
}
src/main/java/appeng/core/stats/IAdvancementTrigger.java
+2 -5
View File
@@ -18,13 +18,10 @@
package appeng.core.stats;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.entity.player.ServerPlayerEntity;
@FunctionalInterface
public interface IAdvancementTrigger
{
void trigger( ServerPlayerEntity parPlayer );
public interface IAdvancementTrigger {
void trigger(ServerPlayerEntity parPlayer);
}
src/main/java/appeng/core/stats/PartItemPredicate.java
+23 -34
View File
@@ -18,7 +18,6 @@
package appeng.core.stats;
import com.google.gson.JsonObject;
import net.minecraft.advancements.criterion.ItemPredicate;
@@ -30,41 +29,31 @@ import appeng.core.AppEng;
import appeng.items.parts.ItemPart;
import appeng.items.parts.PartType;
public class PartItemPredicate extends ItemPredicate {
private final PartType partType;
public class PartItemPredicate extends ItemPredicate
{
private final PartType partType;
public PartItemPredicate(String partName) {
this.partType = PartType.valueOf(partName.toUpperCase());
}
public PartItemPredicate( String partName )
{
this.partType = PartType.valueOf( partName.toUpperCase() );
}
@Override
public boolean test(ItemStack item) {
if (item.getItem() instanceof ItemPart) {
ItemPart<?> itemPart = (ItemPart<?>) item.getItem();
return itemPart.getType() == partType;
}
return false;
}
@Override
public boolean test( ItemStack item )
{
if( item.getItem() instanceof ItemPart )
{
ItemPart<?> itemPart = (ItemPart<?>) item.getItem();
return itemPart.getType() == partType;
}
return false;
}
public static ItemPredicate deserialize(JsonObject jsonobject) {
if (jsonobject.has("part")) {
return new PartItemPredicate(JSONUtils.getString(jsonobject, "part"));
} else {
return ItemPredicate.ANY;
}
}
public static ItemPredicate deserialize( JsonObject jsonobject )
{
if( jsonobject.has( "part" ) )
{
return new PartItemPredicate( JSONUtils.getString( jsonobject, "part" ) );
}
else
{
return ItemPredicate.ANY;
}
}
public static void register()
{
ItemPredicate.register( new ResourceLocation( AppEng.MOD_ID, "part" ), PartItemPredicate::deserialize );
}
public static void register() {
ItemPredicate.register(new ResourceLocation(AppEng.MOD_ID, "part"), PartItemPredicate::deserialize);
}
}