Skip to content

Commit 3a3a5de

Browse files
committed
Clean up for 8.0.0 release
1 parent bb2c4a2 commit 3a3a5de

4 files changed

Lines changed: 4 additions & 33 deletions

File tree

cardinal-components-base/src/main/java/org/ladysnake/cca/api/v3/component/ComponentContainer.java

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -256,15 +256,6 @@ public Builder<T> factoryNameSuffix(String factoryNameSuffix) {
256256
public Factory<T> build() {
257257
return super.build();
258258
}
259-
260-
/**
261-
* @deprecated use {@link #factoryNameSuffix(String)}
262-
*/
263-
@Deprecated(forRemoval = true)
264-
public Factory<T> build(@Nullable String factoryNameSuffix) {
265-
if (factoryNameSuffix != null) this.factoryNameSuffix(factoryNameSuffix);
266-
return this.build();
267-
}
268259
}
269260
}
270261
}

cardinal-components-base/src/main/java/org/ladysnake/cca/internal/base/asm/CcaAsmHelper.java

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -198,27 +198,6 @@ private static IllegalArgumentException badFunctionalInterface(Class<?> callback
198198
return new IllegalArgumentException(callbackClass + " is not a functional interface!");
199199
}
200200

201-
/**
202-
* Defines an implementation of {@link ComponentContainer} that supports direct component access.
203-
*
204-
* <p>Instances of the returned class can be returned by {@link ComponentProvider#getComponentContainer()}.
205-
* <strong>This method must not be called before the static component container interface has been defined!</strong>
206-
*
207-
* @param componentFactoryType the interface implemented by the component factories used to initialize this container
208-
* @param componentFactories a map of {@link ComponentKey}s to factories for components of that type
209-
* @param componentImpls a map of {@link ComponentKey}s to their actual implementation classes for the container
210-
* @return the generated container class
211-
* @deprecated cannot remove in 1.17 because internal compatibility
212-
*/
213-
@Deprecated(forRemoval = true)
214-
public static <I> Class<? extends ComponentContainer> spinComponentContainer(Class<? super I> componentFactoryType, Map<ComponentKey<?>, I> componentFactories, Map<ComponentKey<?>, Class<? extends CardinalComponent>> componentImpls) throws IOException {
215-
Map<ComponentKey<?>, QualifiedComponentFactory<I>> merged = new LinkedHashMap<>();
216-
for (var entry : componentFactories.entrySet()) {
217-
merged.put(entry.getKey(), new QualifiedComponentFactory<>(entry.getValue(), componentImpls.get(entry.getKey()), Set.of()));
218-
}
219-
return spinComponentContainer(componentFactoryType, merged);
220-
}
221-
222201
/**
223202
* Defines an implementation of {@link ComponentContainer} that supports direct component access.
224203
*

changelog.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
------------------------------------------------------
2-
Version 8.0.0-alpha.5+26.1
2+
Version 8.0.0
33
------------------------------------------------------
44
Updated to 26.1
55

@@ -16,6 +16,7 @@ Starting with alpha-5, world data from previous minecraft versions should be mig
1616

1717
**Removed**
1818
- Components attached to a `LevelData` object (using the `cardinal-components-leveldata` module) can no longer use dynamic registries in serialization (vanilla limitation)
19+
- `ComponentContainer.Builder#build(String)` (had been deprecated for removal for a couple years now)
1920

2021
------------------------------------------------------
2122
Version 7.3.1

gradle.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@ elmendorf_version=0.17.0
1414
immersive_portals_version=v6.0.3-mc1.21.1
1515

1616
#Publishing
17-
mod_version = 8.0.0-alpha.5+26.1
17+
mod_version = 8.0.0
1818
curseforge_id = 318449
1919
modrinth_id = K01OU20C
2020
curseforge_versions = 26.1; 26.1.1
2121
modrinth_versions = 26.1; 26.1.1
22-
release_type = alpha
22+
release_type = release
2323
display_name = Cardinal-Components-API
2424
owners = Ladysnake
2525

0 commit comments

Comments
 (0)