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

Reformatted, and ported back some enhancements from the Forge version.

Browse Source
This commit is contained in:
Sebastian Hartte
2020-08-15 02:51:03 +02:00
parent 0a2f03aa92
commit 6c544f2211
358 changed files with 1124 additions and 1831 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/client/render/StackSizeRenderer.java
+1 -1
View File
@@ -70,7 +70,7 @@ public class StackSizeRenderer {
final int offset = AEConfig.instance().isUseLargeFonts() ? 0 : -1;
AffineTransformation tm = new AffineTransformation(new Vector3f(0, 0, 300), // Taken from
// ItemRenderer.renderItemOverlayIntoGUI
// ItemRenderer.renderItemOverlayIntoGUI
null, new Vector3f(scaleFactor, scaleFactor, scaleFactor), null);
RenderSystem.disableBlend();
src/main/java/appeng/client/render/TesrRenderHelper.java
+1
View File
@@ -77,6 +77,7 @@ public class TesrRenderHelper {
// TODO, A different approach will have to be used for this from TESRs, -covers,
// i have ideas.
/**
* Render an item in 2D.
*/
src/main/java/appeng/client/render/cablebus/CableBuilder.java
+2 -7
View File
@@ -18,12 +18,7 @@
package appeng.client.render.cablebus;
import java.util.ArrayList;
import java.util.Collections;
import java.util.EnumMap;
import java.util.EnumSet;
import java.util.List;
import java.util.Locale;
import java.util.*;
import java.util.function.Function;
import net.fabricmc.api.EnvType;
@@ -110,7 +105,7 @@ class CableBuilder {
/**
* Adds the core of a cable to the given list of quads.
*
* <p>
* The type of cable core is automatically deduced from the given cable type.
*/
public void addCableCore(AECableType cableType, AEColor color, QuadEmitter emitter) {
src/main/java/appeng/client/render/cablebus/CableBusBakedModel.java
+1 -7
View File
@@ -18,14 +18,8 @@
package appeng.client.render.cablebus;
import java.util.ArrayList;
import java.util.EnumMap;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.*;
import java.util.Map.Entry;
import java.util.Random;
import java.util.function.Supplier;
import javax.annotation.Nullable;
src/main/java/appeng/client/render/cablebus/CableBusRenderState.java
+1 -5
View File
@@ -19,11 +19,7 @@
package appeng.client.render.cablebus;
import java.lang.ref.WeakReference;
import java.util.ArrayList;
import java.util.EnumMap;
import java.util.EnumSet;
import java.util.List;
import java.util.Objects;
import java.util.*;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.Box;
src/main/java/appeng/client/render/cablebus/CubeBuilder.java
+3 -2
View File
@@ -18,14 +18,15 @@
package appeng.client.render.cablebus;
import java.util.*;
import java.util.EnumMap;
import java.util.EnumSet;
import com.google.common.base.Preconditions;
import net.fabricmc.api.EnvType;
import net.fabricmc.api.Environment;
import net.fabricmc.fabric.api.renderer.v1.mesh.QuadEmitter;
import net.minecraft.client.render.*;
import net.minecraft.client.render.LightmapTextureManager;
import net.minecraft.client.texture.Sprite;
import net.minecraft.client.util.math.Vector4f;
import net.minecraft.util.math.Direction;
src/main/java/appeng/client/render/cablebus/FacadeBuilder.java
+2 -12
View File
@@ -18,14 +18,8 @@
package appeng.client.render.cablebus;
import java.util.ArrayList;
import java.util.Collections;
import java.util.EnumMap;
import java.util.List;
import java.util.Map;
import java.util.*;
import java.util.Map.Entry;
import java.util.Random;
import java.util.Set;
import java.util.function.Function;
import java.util.function.Supplier;
@@ -59,11 +53,7 @@ import appeng.api.util.AEAxisAlignedBB;
import appeng.core.Api;
import appeng.mixins.MinecraftClientAccessor;
import appeng.parts.misc.CableAnchorPart;
import appeng.thirdparty.codechicken.lib.model.pipeline.transformers.QuadClamper;
import appeng.thirdparty.codechicken.lib.model.pipeline.transformers.QuadCornerKicker;
import appeng.thirdparty.codechicken.lib.model.pipeline.transformers.QuadFaceStripper;
import appeng.thirdparty.codechicken.lib.model.pipeline.transformers.QuadReInterpolator;
import appeng.thirdparty.codechicken.lib.model.pipeline.transformers.QuadTinter;
import appeng.thirdparty.codechicken.lib.model.pipeline.transformers.*;
/**
* The FacadeBuilder builds for facades..
src/main/java/appeng/client/render/cablebus/FacadeRenderState.java
-1
View File
@@ -1,4 +1,3 @@
package appeng.client.render.cablebus;
import net.minecraft.block.BlockState;
src/main/java/appeng/client/render/cablebus/P2PTunnelFrequencyBakedModel.java
-1
View File
@@ -1,4 +1,3 @@
package appeng.client.render.cablebus;
import java.util.Random;
src/main/java/appeng/client/render/effects/LightningArcFX.java
-1
View File
@@ -27,7 +27,6 @@ import net.minecraft.client.particle.ParticleFactory;
import net.minecraft.client.particle.SpriteBillboardParticle;
import net.minecraft.client.particle.SpriteProvider;
import net.minecraft.client.world.ClientWorld;
import net.minecraft.world.World;
@Environment(EnvType.CLIENT)
public class LightningArcFX extends LightningFX {
src/main/java/appeng/client/render/effects/ParticleTypes.java
-8
View File
@@ -1,16 +1,8 @@
package appeng.client.render.effects;
import net.fabricmc.api.EnvType;
import net.fabricmc.api.Environment;
import net.fabricmc.fabric.api.client.particle.v1.ParticleFactoryRegistry;
import net.fabricmc.fabric.api.particle.v1.FabricParticleTypes;
import net.minecraft.client.MinecraftClient;
import net.minecraft.client.particle.ParticleManager;
import net.minecraft.particle.DefaultParticleType;
import net.minecraft.particle.ParticleType;
import net.minecraft.util.registry.Registry;
import appeng.core.AppEng;
public final class ParticleTypes {
src/main/java/appeng/client/render/model/SkyCompassModel.java
-6
View File
@@ -19,21 +19,15 @@
package appeng.client.render.model;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.Set;
import java.util.function.Function;
import javax.annotation.Nullable;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
import com.mojang.datafixers.util.Pair;
import net.minecraft.client.render.model.BakedModel;
import net.minecraft.client.render.model.ModelBakeSettings;
import net.minecraft.client.render.model.ModelLoader;
import net.minecraft.client.render.model.UnbakedModel;
import net.minecraft.client.texture.Sprite;
import net.minecraft.client.util.SpriteIdentifier;
import net.minecraft.util.Identifier;
src/main/java/appeng/client/render/spatial/SpatialPylonBakedModel.java
+2 -6
View File
@@ -92,9 +92,7 @@ class SpatialPylonBakedModel implements BakedModel, FabricBakedModel {
builder.setUvRotation(Direction.UP, 1);
builder.setUvRotation(Direction.DOWN, 1);
}
}
else if (displayAxis == SpatialPylonBlockEntity.DISPLAY_Y) {
} else if (displayAxis == SpatialPylonBlockEntity.DISPLAY_Y) {
ori = Direction.UP;
if ((flags & SpatialPylonBlockEntity.DISPLAY_MIDDLE) == SpatialPylonBlockEntity.DISPLAY_END_MAX) {
builder.setUvRotation(Direction.NORTH, 3);
@@ -102,9 +100,7 @@ class SpatialPylonBakedModel implements BakedModel, FabricBakedModel {
builder.setUvRotation(Direction.EAST, 3);
builder.setUvRotation(Direction.WEST, 3);
}
}
else if (displayAxis == SpatialPylonBlockEntity.DISPLAY_Z) {
} else if (displayAxis == SpatialPylonBlockEntity.DISPLAY_Z) {
ori = Direction.NORTH;
if ((flags & SpatialPylonBlockEntity.DISPLAY_MIDDLE) == SpatialPylonBlockEntity.DISPLAY_END_MAX) {
builder.setUvRotation(Direction.EAST, 2);
src/main/java/appeng/client/render/tesr/InscriberTESR.java
-1
View File
@@ -1,4 +1,3 @@
package appeng.client.render.tesr;
import com.google.common.collect.ImmutableList;
src/main/java/appeng/client/render/tesr/SkyChestTESR.java
-1
View File
@@ -22,7 +22,6 @@ import com.google.common.collect.ImmutableList;
import net.fabricmc.api.EnvType;
import net.fabricmc.api.Environment;
import net.fabricmc.fabric.api.event.client.ClientSpriteRegistryCallback;
import net.minecraft.block.Block;
import net.minecraft.client.model.ModelPart;
import net.minecraft.client.render.RenderLayer;
src/main/java/appeng/client/render/tesr/SkyCompassTESR.java
-4
View File
@@ -18,12 +18,8 @@
package appeng.client.render.tesr;
import java.util.Random;
import net.fabricmc.api.EnvType;
import net.fabricmc.api.Environment;
import net.fabricmc.fabric.api.renderer.v1.RendererAccess;
import net.fabricmc.fabric.api.renderer.v1.mesh.MeshBuilder;
import net.minecraft.block.BlockState;
import net.minecraft.client.MinecraftClient;
import net.minecraft.client.render.RenderLayer;