Skip to content

Commit 8895558

Browse files
DJtheRedstonerDJtheRedstoner
committed
Rebrand to "Essential Partner Mod Integration"
The package will be changed in the next commit to keep this diff readable.
1 parent 919df43 commit 8895558

23 files changed

+110
-110
lines changed

‎build.gradle.kts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ loom.mixin.useLegacyMixinAp.set(false)
2121
loom.runs {
2222
named("client") {
2323
if (platform.mcVersion <= 11202) {
24-
property("fml.coreMods.load", "gg.essential.ad.asm.EssentialAdCoreMod")
24+
property("fml.coreMods.load", "gg.essential.ad.asm.EssentialPartnerCoreMod")
2525
}
2626
if (platform.mcVersion >= 11600 && platform.isForge) {
2727
programArgs("--mixin", "gg/essential/ad/mixins.json")
@@ -93,7 +93,7 @@ tasks.processResources {
9393
tasks.jar {
9494
manifest.attributes(
9595
"Implementation-Vendor" to "ModCore Inc.",
96-
"Implementation-Title" to "EssentialAd",
96+
"Implementation-Title" to "EssentialPartnerModIntegration",
9797
"Implementation-Version" to version,
9898
)
9999
if (platform.isModLauncher) {
@@ -103,7 +103,7 @@ tasks.jar {
103103
}
104104
if (platform.mcVersion <= 11202) {
105105
manifest.attributes(
106-
"FMLCorePlugin" to "gg.essential.ad.asm.EssentialAdCoreMod",
106+
"FMLCorePlugin" to "gg.essential.ad.asm.EssentialPartnerModCoreMod",
107107
"FMLCorePluginContainsFMLMod" to "Yes",
108108
)
109109
}
@@ -112,7 +112,7 @@ tasks.jar {
112112
publishing {
113113
publications {
114114
named<MavenPublication>("maven") {
115-
artifactId = "ad-$platform"
115+
artifactId = "partner-mod-integration-$platform"
116116
}
117117
}
118118
}

‎src/main/java/gg/essential/ad/EssentialAPI.java‎

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package gg.essential.ad;
22

3-
import gg.essential.ad.data.AdData;
3+
import gg.essential.ad.data.PartnerModData;
44
import gg.essential.ad.data.ModalData;
5-
import gg.essential.ad.loader.EssentialAdLoader;
5+
import gg.essential.ad.loader.EssentialPartnerLoader;
66
import org.apache.commons.io.IOUtils;
77

88
import java.io.BufferedReader;
@@ -24,32 +24,32 @@ public class EssentialAPI {
2424
"essential.ad.api",
2525
"https://api.essential.gg"
2626
);
27-
private static final String AD_DATA_URL = API_BASE_URL + "/v1/mod-partner";
27+
private static final String MOD_PARTNER_DATA_URL = API_BASE_URL + "/v1/mod-partner";
2828

29-
private static final String USER_AGENT = "EssentialAd/" + EssentialAdLoader.OUR_VERSION + " (" + EssentialAdLoader.OUR_PKG + ")";
29+
private static final String USER_AGENT = "EssentialPartnerMod/" + EssentialPartnerLoader.OUR_VERSION + " (" + EssentialPartnerLoader.OUR_PKG + ")";
3030

31-
private static final Path API_CACHE_FILE = AdConfig.CONFIG_FOLDER.resolve("data.cache.json");
31+
private static final Path API_CACHE_FILE = PartnerModConfig.CONFIG_FOLDER.resolve("data.cache.json");
3232

33-
private static final Path API_OVERRIDE_FILE = AdConfig.CONFIG_FOLDER.resolve("data.override.json");
34-
private static final Path MODAL_OVERRIDE_FOLDER = AdConfig.CONFIG_FOLDER.resolve("override");
33+
private static final Path API_OVERRIDE_FILE = PartnerModConfig.CONFIG_FOLDER.resolve("data.override.json");
34+
private static final Path MODAL_OVERRIDE_FOLDER = PartnerModConfig.CONFIG_FOLDER.resolve("override");
3535
private static final Path MODAL_OVERRIDE_FILE = MODAL_OVERRIDE_FOLDER.resolve("mod-partner-modal-metadata.json");
3636

37-
public static CompletableFuture<AdData> fetchAdData() {
38-
CompletableFuture<AdData> future = new CompletableFuture<>();
37+
public static CompletableFuture<PartnerModData> fetchPartnerModData() {
38+
CompletableFuture<PartnerModData> future = new CompletableFuture<>();
3939
CompletableFuture.runAsync(() -> {
4040
try {
4141
if (Files.exists(API_OVERRIDE_FILE)) {
42-
EssentialAd.LOGGER.info("Using API override file");
42+
EssentialPartner.LOGGER.info("Using API override file");
4343
try (BufferedReader reader = Files.newBufferedReader(API_OVERRIDE_FILE)) {
44-
AdData data = EssentialAd.GSON.fromJson(reader, AdData.class);
44+
PartnerModData data = EssentialPartner.GSON.fromJson(reader, PartnerModData.class);
4545
future.complete(data);
4646
return;
4747
} catch (Exception e) {
48-
EssentialAd.LOGGER.error("Failed to load api override", e);
48+
EssentialPartner.LOGGER.error("Failed to load api override", e);
4949
}
5050
}
5151

52-
HttpURLConnection connection = (HttpURLConnection) URI.create(AD_DATA_URL).toURL().openConnection();
52+
HttpURLConnection connection = (HttpURLConnection) URI.create(MOD_PARTNER_DATA_URL).toURL().openConnection();
5353
connection.setConnectTimeout(10_000);
5454
connection.setReadTimeout(10_000);
5555
connection.addRequestProperty("User-Agent", USER_AGENT);
@@ -64,15 +64,15 @@ public static CompletableFuture<AdData> fetchAdData() {
6464
try (BufferedWriter writer = Files.newBufferedWriter(API_CACHE_FILE)) {
6565
writer.write(response);
6666
} catch (Exception e) {
67-
EssentialAd.LOGGER.error("Failed to write cached response", e);
67+
EssentialPartner.LOGGER.error("Failed to write cached response", e);
6868
}
6969

70-
AdData data = EssentialAd.GSON.fromJson(response, AdData.class);
70+
PartnerModData data = EssentialPartner.GSON.fromJson(response, PartnerModData.class);
7171

7272
if (Files.exists(MODAL_OVERRIDE_FILE)) {
73-
EssentialAd.LOGGER.info("Using modal override folder");
73+
EssentialPartner.LOGGER.info("Using modal override folder");
7474
try (BufferedReader reader = Files.newBufferedReader(MODAL_OVERRIDE_FILE)) {
75-
ModalData modalData = EssentialAd.GSON.fromJson(reader, ModalData.class);
75+
ModalData modalData = EssentialPartner.GSON.fromJson(reader, ModalData.class);
7676
// Replace image paths with base64 representation
7777
for (ModalData.Feature feature : modalData.getFeatures()) {
7878
Path iconPath = MODAL_OVERRIDE_FOLDER.resolve(feature.getIcon());
@@ -81,46 +81,46 @@ public static CompletableFuture<AdData> fetchAdData() {
8181
String base64 = Base64.getEncoder().encodeToString(bytes);
8282
feature.setIcon(base64);
8383
} catch (IOException e) {
84-
EssentialAd.LOGGER.error("Failed to load icon {}", iconPath, e);
84+
EssentialPartner.LOGGER.error("Failed to load icon {}", iconPath, e);
8585
}
8686
}
8787

88-
data = new AdData(modalData, data.getPartneredMods());
88+
data = new PartnerModData(modalData, data.getPartneredMods());
8989
} catch (Exception e) {
90-
EssentialAd.LOGGER.error("Failed to load modal override", e);
90+
EssentialPartner.LOGGER.error("Failed to load modal override", e);
9191
}
9292
}
9393

9494
future.complete(data);
9595
} catch (Exception e) {
96-
EssentialAd.LOGGER.error("Failed to fetch modal data", e);
96+
EssentialPartner.LOGGER.error("Failed to fetch modal data", e);
9797

9898
try {
9999
future.complete(getFallbackData());
100100
} catch (Exception e2) {
101-
EssentialAd.LOGGER.error("Failed to load fallback modal data", e2);
101+
EssentialPartner.LOGGER.error("Failed to load fallback modal data", e2);
102102
future.completeExceptionally(e2);
103103
}
104104
}
105105
});
106106
return future;
107107
}
108108

109-
private static AdData getFallbackData() throws IOException {
109+
private static PartnerModData getFallbackData() throws IOException {
110110
if (Files.exists(API_CACHE_FILE)) {
111111
try (BufferedReader reader = Files.newBufferedReader(API_CACHE_FILE)) {
112-
AdData data = EssentialAd.GSON.fromJson(reader, AdData.class);
113-
EssentialAd.LOGGER.info("Loaded cached response");
112+
PartnerModData data = EssentialPartner.GSON.fromJson(reader, PartnerModData.class);
113+
EssentialPartner.LOGGER.info("Loaded cached response");
114114
return data;
115115
} catch (Exception e) {
116-
EssentialAd.LOGGER.error("Failed to load cached response", e);
116+
EssentialPartner.LOGGER.error("Failed to load cached response", e);
117117
}
118118
}
119119

120-
try (InputStream is = EssentialAd.class.getResourceAsStream("assets/data.fallback.json")) {
120+
try (InputStream is = EssentialPartner.class.getResourceAsStream("assets/data.fallback.json")) {
121121
Objects.requireNonNull(is, "Fallback data missing!");
122-
AdData data = EssentialAd.GSON.fromJson(IOUtils.toString(is, StandardCharsets.UTF_8), AdData.class);
123-
EssentialAd.LOGGER.info("Loaded fallback data");
122+
PartnerModData data = EssentialPartner.GSON.fromJson(IOUtils.toString(is, StandardCharsets.UTF_8), PartnerModData.class);
123+
EssentialPartner.LOGGER.info("Loaded fallback data");
124124
return data;
125125
}
126126
}

src/main/java/gg/essential/ad/EssentialAd.java renamed to src/main/java/gg/essential/ad/EssentialPartner.java

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import com.google.gson.Gson;
44
import com.google.gson.GsonBuilder;
5-
import gg.essential.ad.data.AdData;
5+
import gg.essential.ad.data.PartnerModData;
66
import gg.essential.ad.modal.AdModal;
77
import gg.essential.ad.modal.ModalManager;
88
import gg.essential.ad.modal.TwoButtonModal;
@@ -51,11 +51,11 @@
5151
//$$ import net.fabricmc.fabric.api.client.screen.v1.Screens;
5252
//#endif
5353

54-
public class EssentialAd {
54+
public class EssentialPartner {
5555

5656
public static final Logger LOGGER = LogManager.getLogger("EssentialAd");
5757
public static final Gson GSON = new GsonBuilder().setPrettyPrinting().create();
58-
public static final AdConfig CONFIG = AdConfig.load();
58+
public static final PartnerModConfig CONFIG = PartnerModConfig.load();
5959

6060
private static final Set<String> FABRIC_SUPPORTED_VERSIONS = new HashSet<>(Arrays.asList(
6161
"1.16.5",
@@ -88,10 +88,10 @@ public class EssentialAd {
8888
//#endif
8989
));
9090

91-
private CompletableFuture<AdData> adDataFuture = null;
92-
private List<AdData.PartnerMod> partnerMods = null;
91+
private CompletableFuture<PartnerModData> partnerModDataFuture = null;
92+
private List<PartnerModData.PartnerMod> partnerMods = null;
9393

94-
public EssentialAd() {
94+
public EssentialPartner() {
9595
if (EssentialUtil.isEssentialOrContainerLoaded()) return;
9696
if (CONFIG.shouldHideButtons()) return;
9797

@@ -113,7 +113,7 @@ public EssentialAd() {
113113
//#else
114114
if (!FORGE_SUPPORTED_VERSIONS.contains(version)) {
115115
//#endif
116-
LOGGER.info("Minecraft version {} is not supported by Essential, disabling Ad Mod", version);
116+
LOGGER.info("Minecraft version {} is not supported by Essential, disabling Partner Mod", version);
117117
return;
118118
}
119119

@@ -125,7 +125,7 @@ public EssentialAd() {
125125
//$$ ModalManager.INSTANCE.registerEvents();
126126
//#endif
127127

128-
adDataFuture = EssentialAPI.fetchAdData();
128+
partnerModDataFuture = EssentialAPI.fetchPartnerModData();
129129
}
130130

131131
private void createButton(
@@ -236,9 +236,9 @@ private void createButton(
236236
if (EssentialUtil.installationCompleted()) {
237237
ModalManager.INSTANCE.setModal(TwoButtonModal.postInstall());
238238
} else {
239-
AdData data;
239+
PartnerModData data;
240240
try {
241-
data = adDataFuture.join();
241+
data = partnerModDataFuture.join();
242242
} catch (CompletionException e) {
243243
// This should only happen if the fallback data fails to load, which shouldn't happen.
244244
ModalManager.INSTANCE.setModal(TwoButtonModal.installFailed());
@@ -302,7 +302,7 @@ public void buttonPressed(GuiScreenEvent.ActionPerformedEvent.Post event) {
302302
}
303303
//#endif
304304

305-
private List<AdData.PartnerMod> getPartnerMods(AdData data) {
305+
private List<PartnerModData.PartnerMod> getPartnerMods(PartnerModData data) {
306306
if (partnerMods != null) return partnerMods;
307307
return partnerMods = data.getPartneredMods().stream()
308308
.filter(mod -> ModLoaderUtil.isModLoaded(mod.getId()))

src/main/java/gg/essential/ad/EssentialAdMod.java renamed to src/main/java/gg/essential/ad/EssentialPartnerMod.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99
import net.minecraftforge.fml.common.Mod;
1010

1111
//#if MC>=11600
12-
//$$ @Mod("essentialad")
12+
//$$ @Mod("essential-partner-mod")
1313
//#else
14-
@Mod(modid = "essentialad")
14+
@Mod(modid = "essential-partner-mod")
1515
//#endif
1616
//#endif
17-
public class EssentialAdMod {
17+
public class EssentialPartnerMod {
1818
}

‎src/main/java/gg/essential/ad/EssentialUtil.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,11 @@ public static boolean installContainer() {
5353
if (is == null) throw new IllegalStateException("No bundled container jar found!");
5454
Files.copy(is, destination);
5555
}
56-
EssentialAd.LOGGER.info("Successfully installed essential container to {}", destination.toRealPath());
56+
EssentialPartner.LOGGER.info("Successfully installed essential container to {}", destination.toRealPath());
5757
installationCompleted = true;
5858
return true;
5959
} catch (Exception e) {
60-
EssentialAd.LOGGER.error("Failed to install essential container", e);
60+
EssentialPartner.LOGGER.error("Failed to install essential container", e);
6161
return false;
6262
}
6363
}

src/main/java/gg/essential/ad/AdConfig.java renamed to src/main/java/gg/essential/ad/PartnerModConfig.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,24 +6,24 @@
66
import java.nio.file.Path;
77
import java.nio.file.Paths;
88

9-
public class AdConfig {
9+
public class PartnerModConfig {
1010

11-
public static final Path CONFIG_FOLDER = Paths.get("config", "essentialad");
11+
public static final Path CONFIG_FOLDER = Paths.get("config", "essential-mod-partner");
1212
private static final Path CONFIG_FILE = CONFIG_FOLDER.resolve("config.json");
1313
private static final Path HIDE_BUTTONS_FILE = CONFIG_FOLDER.resolve("hide_buttons.txt");
1414

1515
private boolean buttonsHidden;
1616
private final transient boolean buttonsHiddenByFile = Files.exists(HIDE_BUTTONS_FILE);
1717

18-
public static AdConfig load() {
18+
public static PartnerModConfig load() {
1919
if (Files.exists(CONFIG_FILE)) {
2020
try (BufferedReader reader = Files.newBufferedReader(CONFIG_FILE)) {
21-
return EssentialAd.GSON.fromJson(reader, AdConfig.class);
21+
return EssentialPartner.GSON.fromJson(reader, PartnerModConfig.class);
2222
} catch (Exception e) {
23-
EssentialAd.LOGGER.error("Failed to read config", e);
23+
EssentialPartner.LOGGER.error("Failed to read config", e);
2424
}
2525
}
26-
AdConfig config = new AdConfig();
26+
PartnerModConfig config = new PartnerModConfig();
2727
config.write();
2828
return config;
2929
}
@@ -33,9 +33,9 @@ public void write() {
3333
if (!Files.exists(CONFIG_FOLDER)) {
3434
Files.createDirectories(CONFIG_FOLDER);
3535
}
36-
Files.write(CONFIG_FILE, EssentialAd.GSON.toJson(this).getBytes(StandardCharsets.UTF_8));
36+
Files.write(CONFIG_FILE, EssentialPartner.GSON.toJson(this).getBytes(StandardCharsets.UTF_8));
3737
} catch (Exception e) {
38-
EssentialAd.LOGGER.info("Failed to write config", e);
38+
EssentialPartner.LOGGER.info("Failed to write config", e);
3939
}
4040
}
4141

‎src/main/java/gg/essential/ad/Resources.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@ public class Resources {
2525
private static final AtomicInteger counter = new AtomicInteger(0);
2626

2727
public static ResourceLocation load(String name) {
28-
try (InputStream stream = EssentialAd.class.getResourceAsStream("assets/" + name)) {
28+
try (InputStream stream = EssentialPartner.class.getResourceAsStream("assets/" + name)) {
2929
if (stream == null) throw new RuntimeException("Texture not found " + name);
3030
try (BufferedInputStream bis = new BufferedInputStream(stream)) {
3131
return load(bis);
3232
}
3333
} catch (Exception e) {
34-
EssentialAd.LOGGER.error("Failed to load texture {}", name, e);
34+
EssentialPartner.LOGGER.error("Failed to load texture {}", name, e);
3535
return MISSINGNO;
3636
}
3737
}
@@ -42,15 +42,15 @@ public static ResourceLocation load(InputStream is) {
4242
//$$ try {
4343
//$$ image = NativeImage.read(is);
4444
//$$ } catch (IOException e) {
45-
//$$ EssentialAd.LOGGER.error("Failed to load texture", e);
45+
//$$ EssentialPartner.LOGGER.error("Failed to load texture", e);
4646
//$$ return MISSINGNO;
4747
//$$ }
4848
//#else
4949
BufferedImage image;
5050
try {
5151
image = ImageIO.read(is);
5252
} catch (IOException e) {
53-
EssentialAd.LOGGER.error("Failed to load texture", e);
53+
EssentialPartner.LOGGER.error("Failed to load texture", e);
5454
return MISSINGNO;
5555
}
5656
//#endif

‎src/main/java/gg/essential/ad/UDesktop.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public static void browse(String uri) {
2525
return;
2626
}
2727
} catch (Throwable t) {
28-
EssentialAd.LOGGER.error("Failed to browse via AWT to {}", uri, t);
28+
EssentialPartner.LOGGER.error("Failed to browse via AWT to {}", uri, t);
2929
}
3030
}
3131
String os = System.getProperty("os.name").toLowerCase(Locale.ROOT);
@@ -44,7 +44,7 @@ public static void browse(String uri) {
4444
}
4545
//#endif
4646
} catch (Exception e) {
47-
EssentialAd.LOGGER.error("Failed to browse to {}", uri, e);
47+
EssentialPartner.LOGGER.error("Failed to browse to {}", uri, e);
4848
}
4949
}
5050

src/main/java/gg/essential/ad/asm/EssentialAdClassTransformer.java renamed to src/main/java/gg/essential/ad/asm/EssentialPartnerClassTransformer.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,14 @@
2222
import java.util.ListIterator;
2323
import java.util.Objects;
2424

25-
public class EssentialAdClassTransformer implements IClassTransformer {
25+
public class EssentialPartnerClassTransformer implements IClassTransformer {
2626
private static final String PKG;
2727
static {
28-
String pkg = EssentialAdClassTransformer.class.getName();
29-
pkg = pkg.substring(0, pkg.length() - ".asm.EssentialAdClassTransformer".length());
28+
String pkg = EssentialPartnerClassTransformer.class.getName();
29+
pkg = pkg.substring(0, pkg.length() - ".asm.EssentialPartnerClassTransformer".length());
3030
PKG = pkg.replace('.', '/');
3131
}
32-
private static final String EssentialAd = PKG + "/EssentialAd";
32+
private static final String EssentialPartner = PKG + "/EssentialPartner";
3333
private static final String ModalManager = PKG + "/modal/ModalManager";
3434
private static final String DrawEvent = PKG + "/modal/ModalManager$DrawEvent";
3535

@@ -44,8 +44,8 @@ public byte[] transform(String name, String transformedName, byte[] basicClass)
4444
String methodName = FMLDeobfuscatingRemapper.INSTANCE.mapMethodName(classNode.name, method.name, method.desc);
4545
if (methodName.equals("init") || methodName.equals("func_71384_a")) {
4646
InsnList list = new InsnList();
47-
list.add(new TypeInsnNode(Opcodes.NEW, EssentialAd));
48-
list.add(new MethodInsnNode(Opcodes.INVOKESPECIAL, EssentialAd, "<init>", "()V", false));
47+
list.add(new TypeInsnNode(Opcodes.NEW, EssentialPartner));
48+
list.add(new MethodInsnNode(Opcodes.INVOKESPECIAL, EssentialPartner, "<init>", "()V", false));
4949
// Note: Must be after `beginMinecraftLoading` (because prior to that Forge's EventBus class will
5050
// complain) but before `displayGuiScreen` (because we want to react to that event)
5151
method.instructions.insertBefore(findConstant(method.instructions, "Post startup"), list);

0 commit comments

Comments
 (0)