Skip to content

Commit

Permalink
Finalize 2.0.0
Browse files Browse the repository at this point in the history
- Remove unnecessary local capture in SpriteAtlasTextureMixin
- Remove unused Maven repository
- Remove unnecessary TODO
- Fix French translation file
- Update mod description and README
  • Loading branch information
PepperCode1 committed Jun 8, 2022
1 parent 20a9d9f commit 9686d62
Show file tree
Hide file tree
Showing 8 changed files with 9 additions and 12 deletions.
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
# Continuity

Continuity is a Fabric mod built around modern APIs to allow for the most efficient connected textures experience possible. It is designed to provide full Optifine parity for all resource packs that use the Optifine/MCPatcher CTM format.
Continuity is a Fabric mod built around modern APIs to allow for the most efficient connected textures experience possible. It is designed to provide full Optifine parity for all resource packs that use the Optifine CTM format. Continuity also supports Optifine-format emissive textures for block and item models.

Continuity depends on the Fabric API and is client-side only. It includes two built-in resource packs - one provides default connected textures, similar to Optifine, and the other provides a fix for glass pane culling.

## Forge Version

Forge version of Continuity will not be made for the following reasons.
A Forge version of Continuity will not be made for the following reasons.

- Forge's model API: It is vastly different from Fabric's model API (FRAPI), which is readily utilized by Continuity, and switching to it would not only require an incredible amount of effort, but also result in the mod being extremely inefficient.
- Optifine: Optifine has native support for Forge and provides the same features as Continuity.
- Optifine: It has native support for Forge and provides the same features as Continuity.

### Links

Expand Down
3 changes: 0 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,6 @@ repositories {
name 'Shedaniel'
url 'https://maven.shedaniel.me'
}
maven {
url 'https://server.bbkr.space/artifactory/libs-release'
}
}

dependencies {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
import org.spongepowered.asm.mixin.injection.callback.LocalCapture;

import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
import it.unimi.dsi.fastutil.objects.ObjectOpenHashSet;
Expand Down Expand Up @@ -47,7 +46,7 @@ private Identifier getTexturePath(Identifier id) {
return null;
}

@Inject(method = "loadSprites(Lnet/minecraft/resource/ResourceManager;Ljava/util/Set;)Ljava/util/Collection;", at = @At("TAIL"), locals = LocalCapture.CAPTURE_FAILHARD)
@Inject(method = "loadSprites(Lnet/minecraft/resource/ResourceManager;Ljava/util/Set;)Ljava/util/Collection;", at = @At("TAIL"))
private void onTailLoadSprites(ResourceManager resourceManager, Set<Identifier> ids, CallbackInfoReturnable<Collection<Sprite.Info>> cir) {
if (!loadingEmissiveSprites) {
loadingEmissiveSprites = true;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
public class CTMBakedModel extends ForwardingBakedModel {
public static final int MULTIPASS_LIMIT = 3;

// maybe TODO: convert to arrays
protected final List<QuadProcessor> processors;
@Nullable
protected final List<QuadProcessor> multipassProcessors;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ public static RenderLayer getLayer(BlockState state) {

private static void reload(ResourceManager manager) {
System.arraycopy(EMPTY_LAYER_PREDICATES, 0, LAYER_PREDICATES, 0, EMPTY_LAYER_PREDICATES.length);

try (Resource resource = manager.getResource(LOCATION)) {
Properties properties = new Properties();
properties.load(resource.getInputStream());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ public static String getEmissiveSuffix() {
@ApiStatus.Internal
public static void load(ResourceManager manager) {
emissiveSuffix = null;

try (Resource resource = manager.getResource(LOCATION)) {
Properties properties = new Properties();
properties.load(resource.getInputStream());
Expand Down
4 changes: 2 additions & 2 deletions src/main/resources/assets/continuity/lang/fr_fr.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@
"options.continuity.emissive_textures": "Textures Émissives",
"options.continuity.emissive_textures.tooltip": "Active ou désactive les textures émissives des modèles de blocs et d'objets.",
"options.continuity.custom_block_layers": "Couches Personnalisées",
"options.continuity.custom_block_layers.tooltip": "Active ou désactive les couches de blocs personnalisées",
}
"options.continuity.custom_block_layers.tooltip": "Active ou désactive les couches de blocs personnalisées"
}
2 changes: 1 addition & 1 deletion src/main/resources/fabric.mod.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"version": "${version}",

"name": "Continuity",
"description": "Continuity is a Fabric mod built around modern APIs to allow for the most efficient connected textures experience possible. It is designed to provide full Optifine parity for all resource packs that use the Optifine/MCPatcher CTM format.",
"description": "Continuity is a Fabric mod built around modern APIs to allow for the most efficient connected textures experience possible. It is designed to provide full Optifine parity for all resource packs that use the Optifine CTM format. Continuity also supports Optifine-format emissive textures for block and item models.",
"authors": [
"Pepper_Bell"
],
Expand Down

0 comments on commit 9686d62

Please sign in to comment.