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

API compiles

Browse Source
This commit is contained in:
Sebastian Hartte
2020-06-27 18:09:44 +02:00
parent ba71a82288
commit 80fbb58d4f
572 changed files with 2995 additions and 3037 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/client/render/effects/ChargedOreFX.java
+4 -6
View File
@@ -18,6 +18,7 @@
package appeng.client.render.effects;
import net.fabricmc.api.Environment;
import net.minecraft.client.particle.IAnimatedSprite;
import net.minecraft.client.particle.IParticleFactory;
import net.minecraft.client.particle.Particle;
@@ -25,12 +26,9 @@ import net.minecraft.client.particle.RedstoneParticle;
import net.minecraft.particles.BasicParticleType;
import net.minecraft.particles.RedstoneParticleData;
import net.minecraft.world.World;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
import net.fabricmc.api.EnvType;
import appeng.core.AppEng;
@OnlyIn(Dist.CLIENT)
@Environment(EnvType.CLIENT)
public class ChargedOreFX extends RedstoneParticle {
private static final RedstoneParticleData PARTICLE_DATA = new RedstoneParticleData(0.21f, 0.61f, 1.0f, 1.0f);
@@ -51,7 +49,7 @@ public class ChargedOreFX extends RedstoneParticle {
return j1 << 20 | j1 << 4;
}
@OnlyIn(Dist.CLIENT)
@Environment(EnvType.CLIENT)
public static class Factory implements IParticleFactory<BasicParticleType> {
private final IAnimatedSprite spriteSet;
src/main/java/appeng/client/render/effects/CraftingFx.java
+4 -6
View File
@@ -20,6 +20,7 @@ package appeng.client.render.effects;
import com.mojang.blaze3d.vertex.IVertexBuilder;
import net.fabricmc.api.EnvType;
import net.minecraft.client.particle.IAnimatedSprite;
import net.minecraft.client.particle.IParticleFactory;
import net.minecraft.client.particle.IParticleRenderType;
@@ -31,12 +32,9 @@ import net.minecraft.particles.BasicParticleType;
import net.minecraft.util.math.MathHelper;
import net.minecraft.util.math.Vec3d;
import net.minecraft.world.World;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
import net.fabricmc.api.Environment;
import appeng.core.AppEng;
@OnlyIn(Dist.CLIENT)
@Environment(EnvType.CLIENT)
public class CraftingFx extends SpriteTexturedParticle {
// Offset relative to center of block, is the starting point of the particle
@@ -127,7 +125,7 @@ public class CraftingFx extends SpriteTexturedParticle {
}
}
@OnlyIn(Dist.CLIENT)
@Environment(EnvType.CLIENT)
public static class Factory implements IParticleFactory<BasicParticleType> {
private final IAnimatedSprite spriteSet;
src/main/java/appeng/client/render/effects/EnergyFx.java
+4 -6
View File
@@ -20,16 +20,14 @@ package appeng.client.render.effects;
import com.mojang.blaze3d.vertex.IVertexBuilder;
import net.fabricmc.api.EnvType;
import net.fabricmc.api.Environment;
import net.minecraft.client.particle.*;
import net.minecraft.client.renderer.ActiveRenderInfo;
import net.minecraft.util.math.MathHelper;
import net.minecraft.world.World;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
import appeng.core.AppEng;
@OnlyIn(Dist.CLIENT)
@Environment(EnvType.CLIENT)
public class EnergyFx extends SpriteTexturedParticle {
private final int startBlkX;
@@ -98,7 +96,7 @@ public class EnergyFx extends SpriteTexturedParticle {
this.motionZ = motionZ;
}
@OnlyIn(Dist.CLIENT)
@Environment(EnvType.CLIENT)
public static class Factory implements IParticleFactory<EnergyParticleData> {
private final IAnimatedSprite spriteSet;
src/main/java/appeng/client/render/effects/EnergyParticleData.java
+3 -3
View File
@@ -23,7 +23,7 @@ import java.util.Locale;
import com.mojang.brigadier.StringReader;
import com.mojang.brigadier.exceptions.CommandSyntaxException;
import net.minecraft.network.PacketBuffer;
import net.minecraft.network.PacketByteBuf;
import net.minecraft.particles.IParticleData;
import net.minecraft.particles.ParticleType;
@@ -54,7 +54,7 @@ public class EnergyParticleData implements IParticleData {
}
@Override
public EnergyParticleData read(ParticleType<EnergyParticleData> particleTypeIn, PacketBuffer buffer) {
public EnergyParticleData read(ParticleType<EnergyParticleData> particleTypeIn, PacketByteBuf buffer) {
boolean forItem = buffer.readBoolean();
AEPartLocation direction = AEPartLocation.values()[buffer.readByte()];
return new EnergyParticleData(forItem, direction);
@@ -67,7 +67,7 @@ public class EnergyParticleData implements IParticleData {
}
@Override
public void write(PacketBuffer buffer) {
public void write(PacketByteBuf buffer) {
buffer.writeBoolean(forItem);
buffer.writeByte((byte) direction.ordinal());
}
src/main/java/appeng/client/render/effects/LightningArcFX.java
+4 -6
View File
@@ -20,17 +20,15 @@ package appeng.client.render.effects;
import java.util.Random;
import net.fabricmc.api.Environment;
import net.minecraft.client.particle.IAnimatedSprite;
import net.minecraft.client.particle.IParticleFactory;
import net.minecraft.client.particle.Particle;
import net.minecraft.client.particle.SpriteTexturedParticle;
import net.minecraft.world.World;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
import net.fabricmc.api.EnvType;
import appeng.core.AppEng;
@OnlyIn(Dist.CLIENT)
@Environment(EnvType.CLIENT)
public class LightningArcFX extends LightningFX {
private static final Random RANDOM_GENERATOR = new Random();
@@ -68,7 +66,7 @@ public class LightningArcFX extends LightningFX {
}
}
@OnlyIn(Dist.CLIENT)
@Environment(EnvType.CLIENT)
public static class Factory implements IParticleFactory<LightningArcParticleData> {
private final IAnimatedSprite spriteSet;
src/main/java/appeng/client/render/effects/LightningArcParticleData.java
+3 -3
View File
@@ -5,7 +5,7 @@ import java.util.Locale;
import com.mojang.brigadier.StringReader;
import com.mojang.brigadier.exceptions.CommandSyntaxException;
import net.minecraft.network.PacketBuffer;
import net.minecraft.network.PacketByteBuf;
import net.minecraft.particles.IParticleData;
import net.minecraft.particles.ParticleType;
import net.minecraft.util.math.Vec3d;
@@ -37,7 +37,7 @@ public class LightningArcParticleData implements IParticleData {
@Override
public LightningArcParticleData read(ParticleType<LightningArcParticleData> particleTypeIn,
PacketBuffer buffer) {
PacketByteBuf buffer) {
float x = buffer.readFloat();
float y = buffer.readFloat();
float z = buffer.readFloat();
@@ -51,7 +51,7 @@ public class LightningArcParticleData implements IParticleData {
}
@Override
public void write(PacketBuffer buffer) {
public void write(PacketByteBuf buffer) {
buffer.writeFloat((float) target.x);
buffer.writeFloat((float) target.y);
buffer.writeFloat((float) target.z);
src/main/java/appeng/client/render/effects/LightningFX.java
+4 -6
View File
@@ -22,6 +22,8 @@ import java.util.Random;
import com.mojang.blaze3d.vertex.IVertexBuilder;
import net.fabricmc.api.EnvType;
import net.fabricmc.api.Environment;
import net.minecraft.client.Minecraft;
import net.minecraft.client.particle.IAnimatedSprite;
import net.minecraft.client.particle.IParticleFactory;
@@ -34,12 +36,8 @@ import net.minecraft.particles.BasicParticleType;
import net.minecraft.util.math.MathHelper;
import net.minecraft.util.math.Vec3d;
import net.minecraft.world.World;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
import appeng.core.AppEng;
@OnlyIn(Dist.CLIENT)
@Environment(EnvType.CLIENT)
public class LightningFX extends SpriteTexturedParticle {
private static final Random RANDOM_GENERATOR = new Random();
@@ -246,7 +244,7 @@ public class LightningFX extends SpriteTexturedParticle {
return this.precomputedSteps;
}
@OnlyIn(Dist.CLIENT)
@Environment(EnvType.CLIENT)
public static class Factory implements IParticleFactory<BasicParticleType> {
private final IAnimatedSprite spriteSet;
src/main/java/appeng/client/render/effects/MatterCannonFX.java
+3 -4
View File
@@ -18,14 +18,13 @@
package appeng.client.render.effects;
import net.fabricmc.api.EnvType;
import net.minecraft.client.particle.*;
import net.minecraft.particles.BasicParticleType;
import net.minecraft.world.World;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
import net.fabricmc.api.Environment;
import appeng.api.util.AEPartLocation;
import appeng.core.AppEng;
public class MatterCannonFX extends SpriteTexturedParticle {
@@ -73,7 +72,7 @@ public class MatterCannonFX extends SpriteTexturedParticle {
this.particleAlpha *= 0.59f;
}
@OnlyIn(Dist.CLIENT)
@Environment(EnvType.CLIENT)
public static class Factory implements IParticleFactory<BasicParticleType> {
private final IAnimatedSprite spriteSet;
src/main/java/appeng/client/render/effects/VibrantFX.java
+4 -6
View File
@@ -18,6 +18,8 @@
package appeng.client.render.effects;
import net.fabricmc.api.EnvType;
import net.fabricmc.api.Environment;
import net.minecraft.client.particle.IAnimatedSprite;
import net.minecraft.client.particle.IParticleFactory;
import net.minecraft.client.particle.IParticleRenderType;
@@ -25,12 +27,8 @@ import net.minecraft.client.particle.Particle;
import net.minecraft.client.particle.SpriteTexturedParticle;
import net.minecraft.particles.BasicParticleType;
import net.minecraft.world.World;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
import appeng.core.AppEng;
@OnlyIn(Dist.CLIENT)
@Environment(EnvType.CLIENT)
public class VibrantFX extends SpriteTexturedParticle {
public VibrantFX(final World par1World, final double x, final double y, final double z, final double par8,
@@ -81,7 +79,7 @@ public class VibrantFX extends SpriteTexturedParticle {
this.maxAge--;
}
@OnlyIn(Dist.CLIENT)
@Environment(EnvType.CLIENT)
public static class Factory implements IParticleFactory<BasicParticleType> {
private final IAnimatedSprite spriteSet;