Skip to content

Commit 8e114ee

Browse files
MaidThatProgramsMaidThatPrograms
committed
Fix Apache HttpClient Mime embedding
1 parent 93db953 commit 8e114ee

15 files changed

+568
-546
lines changed

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ This is the source code for the CMSC 389E Circuitry mod, created for UMD class C
44

55
However, having this code available is not to be used to cheat or take advantage of. It is only here for academic purposes, debugging, and a means to effectively collaborate on this project.
66

7-
More information on the class and what you are expected to do can be found <a href="https://cs.umd.edu/class/fall2020/cmsc389E">here</a>.
7+
More information on the class and what you are expected to do can be found [here](https://cs.umd.edu/class/fall2020/cmsc389E).

‎build.gradle

+27-18
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,26 @@
11
buildscript {
22
repositories {
33
maven {
4-
url = 'https://files.minecraftforge.net/maven'
4+
url 'https://files.minecraftforge.net/maven'
55
}
66

77
jcenter()
8-
mavenCentral()
98
}
109

1110
dependencies {
12-
classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '+', changing: true
11+
classpath 'net.minecraftforge.gradle:ForgeGradle:+'
1312
}
1413
}
1514

15+
plugins {
16+
id 'com.github.johnrengelman.shadow' version '4.0.4'
17+
}
1618
apply plugin: 'net.minecraftforge.gradle'
17-
apply plugin: 'eclipse'
18-
version = '1.15.2-1.0.0.0'
19-
group = 'cmsc389e.circuitry'
19+
2020
archivesBaseName = 'circuitry'
21+
group = 'cmsc389e.circuitry'
22+
version = '1.15.2-1.0.0.0'
23+
2124
sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = '1.8'
2225
compileJava.options.compilerArgs << '-proc:none'
2326

@@ -27,15 +30,15 @@ minecraft {
2730
runs {
2831
client {
2932
workingDirectory project.file('run')
30-
33+
3134
mods {
3235
circuitry.source sourceSets.main
3336
}
3437
}
3538

3639
server {
3740
workingDirectory project.file('run')
38-
41+
3942
mods {
4043
circuitry.source sourceSets.main
4144
}
@@ -45,15 +48,21 @@ minecraft {
4548

4649
dependencies {
4750
minecraft 'net.minecraftforge:forge:1.15.2-31.2.0'
48-
compile 'org.apache.httpcomponents:httpmime:+'
51+
compile 'org.apache.httpcomponents:httpmime:4.3.3'
52+
}
53+
54+
reobf {
55+
shadowJar {
56+
}
4957
}
5058

51-
jar.manifest.attributes (
52-
'Implementation-Timestamp': new Date().format("yyyy-MM-dd'T'HH:mm:ssZ"),
53-
'Implementation-Title': project.name,
54-
'Implementation-Vendor': project.archivesBaseName,
55-
'Implementation-Version': "${version}",
56-
'Specification-Title': project.name,
57-
'Specification-Vendor': project.archivesBaseName,
58-
'Specification-Version': "${version}"
59-
)
59+
shadowJar {
60+
dependencies {
61+
include(dependency(':httpmime'))
62+
}
63+
64+
classifier = ''
65+
manifest.attributes 'Implementation-Version': "${version}"
66+
minimize()
67+
relocate 'org.apache.http.entity.mime', project.group + '.org.apache.http.entity.mime'
68+
}

‎src/main/java/cmsc389e/circuitry/Circuitry.java

+37-37
Original file line numberDiff line numberDiff line change
@@ -30,49 +30,49 @@
3030
@Mod(Circuitry.MODID)
3131
@EventBusSubscriber(bus = Bus.MOD)
3232
public class Circuitry {
33-
public static final String MODID = "circuitry";
33+
public static final String MODID = "circuitry";
3434

35-
private static final DeferredRegister<Block> BLOCKS = new DeferredRegister<>(ForgeRegistries.BLOCKS, MODID);
36-
private static final DeferredRegister<TileEntityType<?>> TES = new DeferredRegister<>(ForgeRegistries.TILE_ENTITIES,
37-
MODID);
35+
private static final DeferredRegister<Block> BLOCKS = new DeferredRegister<>(ForgeRegistries.BLOCKS, MODID);
36+
private static final DeferredRegister<TileEntityType<?>> TES = new DeferredRegister<>(ForgeRegistries.TILE_ENTITIES,
37+
MODID);
3838

39-
public static final RegistryObject<Block> IN_NODE = BLOCKS.register("in_node", InNodeBlock::new),
40-
OUT_NODE = BLOCKS.register("out_node", OutNodeBlock::new);
41-
public static final RegistryObject<TileEntityType<?>> NODE = TES.register("node",
42-
() -> Builder.create(NodeTileEntity::new, IN_NODE.get(), OUT_NODE.get()).build(null));
39+
public static final RegistryObject<Block> IN_NODE = BLOCKS.register("in_node", InNodeBlock::new),
40+
OUT_NODE = BLOCKS.register("out_node", OutNodeBlock::new);
41+
public static final RegistryObject<TileEntityType<?>> NODE = TES.register("node",
42+
() -> Builder.create(NodeTileEntity::new, IN_NODE.get(), OUT_NODE.get()).build(null));
4343

44-
@SuppressWarnings("resource")
45-
@SubscribeEvent
46-
public static void onClientSetup(FMLClientSetupEvent event) {
47-
ObfuscationReflectionHelper.setPrivateValue(NewChatGui.class,
48-
event.getMinecraftSupplier().get().ingameGUI.getChatGUI(), new ArrayList<ChatLine>() {
49-
private boolean frozen;
44+
@SuppressWarnings("resource")
45+
@SubscribeEvent
46+
public static void onClientSetup(FMLClientSetupEvent event) {
47+
ObfuscationReflectionHelper.setPrivateValue(NewChatGui.class,
48+
event.getMinecraftSupplier().get().ingameGUI.getChatGUI(), new ArrayList<ChatLine>() {
49+
private boolean frozen;
5050

51-
@Override
52-
public ChatLine remove(int index) {
53-
frozen = true;
54-
return get(index);
55-
}
51+
@Override
52+
public ChatLine remove(int index) {
53+
frozen = true;
54+
return get(index);
55+
}
5656

57-
@Override
58-
public int size() {
59-
int size = frozen ? 0 : super.size();
60-
frozen = false;
61-
return size;
62-
}
63-
}, "field_146253_i"); // drawnChatLines
64-
}
57+
@Override
58+
public int size() {
59+
int size = frozen ? 0 : super.size();
60+
frozen = false;
61+
return size;
62+
}
63+
}, "field_146253_i"); // drawnChatLines
64+
}
6565

66-
public Circuitry() {
67-
DeferredRegister<Item> items = new DeferredRegister<>(ForgeRegistries.ITEMS, MODID);
68-
BLOCKS.getEntries().forEach(block -> items.register(block.getId().getPath(),
69-
() -> new BlockItem(block.get(), new Properties().group(ItemGroup.REDSTONE))));
66+
public Circuitry() {
67+
DeferredRegister<Item> items = new DeferredRegister<>(ForgeRegistries.ITEMS, MODID);
68+
BLOCKS.getEntries().forEach(block -> items.register(block.getId().getPath(),
69+
() -> new BlockItem(block.get(), new Properties().group(ItemGroup.REDSTONE))));
7070

71-
IEventBus bus = FMLJavaModLoadingContext.get().getModEventBus();
72-
BLOCKS.register(bus);
73-
TES.register(bus);
74-
items.register(bus);
71+
IEventBus bus = FMLJavaModLoadingContext.get().getModEventBus();
72+
BLOCKS.register(bus);
73+
TES.register(bus);
74+
items.register(bus);
7575

76-
Config.register();
77-
}
76+
Config.register();
77+
}
7878
}

‎src/main/java/cmsc389e/circuitry/client/EventHandler.java

+49-47
Original file line numberDiff line numberDiff line change
@@ -44,57 +44,59 @@
4444

4545
@EventBusSubscriber(Dist.CLIENT)
4646
public class EventHandler {
47-
private final static Minecraft MINECRAFT = Minecraft.getInstance();
48-
private final static Field WORLD_SEED = ObfuscationReflectionHelper.findField(CreateWorldScreen.class,
49-
"field_146329_I"); // worldSeed
50-
private final static WorldSettings WORLD_SETTINGS = new WorldSettings(0, GameType.CREATIVE, false, false,
51-
WorldType.FLAT)
52-
.enableCommands()
53-
.setGeneratorOptions(FlatGenerationSettings
54-
.createFlatGeneratorFromString(
55-
"minecraft:bedrock,3*minecraft:stone,52*minecraft:sandstone;minecraft:desert")
56-
.func_210834_a(JsonOps.INSTANCE).getValue());
47+
private final static Minecraft MINECRAFT = Minecraft.getInstance();
48+
private final static Field WORLD_SEED = ObfuscationReflectionHelper.findField(CreateWorldScreen.class,
49+
"field_146329_I"); // worldSeed
50+
private final static WorldSettings WORLD_SETTINGS = new WorldSettings(0, GameType.CREATIVE, false, false,
51+
WorldType.FLAT)
52+
.enableCommands()
53+
.setGeneratorOptions(FlatGenerationSettings
54+
.createFlatGeneratorFromString(
55+
"minecraft:bedrock,3*minecraft:stone,52*minecraft:sandstone;minecraft:desert")
56+
.func_210834_a(JsonOps.INSTANCE).getValue());
5757

58-
private static void alert(String line1, String line2, String line3, String button, Consumer<OS> consumer) {
59-
MINECRAFT
60-
.displayGuiScreen(new AlertScreen(() -> consumer.accept(Util.getOSType()),
61-
new StringTextComponent(line1).setStyle(new Style().setColor(TextFormatting.RED)),
62-
new StringTextComponent(line2 + "\n\n").appendSibling(
63-
new StringTextComponent(line3).setStyle(new Style().setColor(TextFormatting.AQUA))),
64-
button));
65-
}
58+
private static void alert(String line1, String line2, String line3, String button, Consumer<OS> consumer) {
59+
MINECRAFT
60+
.displayGuiScreen(new AlertScreen(() -> consumer.accept(Util.getOSType()),
61+
new StringTextComponent(line1).setStyle(new Style().setColor(TextFormatting.RED)),
62+
new StringTextComponent(line2 + "\n\n").appendSibling(
63+
new StringTextComponent(line3).setStyle(new Style().setColor(TextFormatting.AQUA))),
64+
button));
65+
}
6666

67-
@SubscribeEvent
68-
public static void onHighlightBlock(HighlightBlock event) {
69-
TileEntity te = MINECRAFT.world.getTileEntity(event.getTarget().getPos());
70-
MINECRAFT.ingameGUI.setOverlayMessage(
71-
te != null && te.getType() == Circuitry.NODE.get() ? ((NodeTileEntity) te).getTag() : "", false);
72-
}
67+
@SubscribeEvent
68+
public static void onHighlightBlock(HighlightBlock event) {
69+
TileEntity te = MINECRAFT.world.getTileEntity(event.getTarget().getPos());
70+
MINECRAFT.ingameGUI.setOverlayMessage(
71+
te != null && te.getType() == Circuitry.NODE.get() ? ((NodeTileEntity) te).getTag() : "", false);
72+
}
7373

74-
@SubscribeEvent
75-
public static void onPostInitGui(InitGuiEvent.Post event) throws IllegalAccessException {
76-
Screen screen = event.getGui();
77-
if (screen instanceof CreateWorldScreen && WORLD_SEED.get(screen).equals(""))
78-
((CreateWorldScreen) screen)
79-
.recreateFromExistingWorld(new WorldInfo(WORLD_SETTINGS, I18n.format("selectWorld.newWorld")));
80-
else if (event.getGui() instanceof MainMenuScreen) {
81-
ModList list = ModList.get();
74+
@SubscribeEvent
75+
public static void onPostInitGui(InitGuiEvent.Post event) throws IllegalAccessException {
76+
Screen screen = event.getGui();
77+
if (screen instanceof CreateWorldScreen && WORLD_SEED.get(screen).equals(""))
78+
((CreateWorldScreen) screen)
79+
.recreateFromExistingWorld(new WorldInfo(WORLD_SETTINGS, I18n.format("selectWorld.newWorld")));
80+
else if (event.getGui() instanceof MainMenuScreen) {
81+
ModList list = ModList.get();
8282

83-
Set<String> allowed = ImmutableSet.of(Circuitry.MODID, ForgeVersion.MOD_ID, "minecraft");
84-
Object[] mods = list.applyForEachModContainer(ModContainer::getModInfo).parallel()
85-
.filter(info -> !allowed.contains(info.getModId())).map(IModInfo::getDisplayName).toArray();
86-
if (mods.length != 0)
87-
alert("Illegal mods are installed.", "You must delete the following mods before proceeding:",
88-
Arrays.toString(mods), "fml.button.open.mods.folder",
89-
os -> os.openFile(FMLPaths.MODSDIR.get().toFile()));
83+
Set<String> allowed = ImmutableSet.of(Circuitry.MODID, ForgeVersion.MOD_ID, "minecraft");
84+
Object[] mods = list.applyForEachModContainer(ModContainer::getModInfo).parallel()
85+
.filter(info -> !allowed.contains(info.getModId())).map(IModInfo::getDisplayName).toArray();
86+
if (mods.length != 0)
87+
alert("Illegal mods are installed.", "You must delete the following mods before proceeding:",
88+
Arrays.toString(mods), "fml.button.open.mods.folder",
89+
os -> os.openFile(FMLPaths.MODSDIR.get().toFile()));
9090

91-
IModInfo info = list.getModContainerById(Circuitry.MODID).get().getModInfo();
92-
CheckResult result = VersionChecker.getResult(info);
93-
if (result.status == Status.OUTDATED)
94-
alert(info.getDisplayName() + " is out of date.",
95-
"You must update to version " + result.target
96-
+ " before proceeding.\nOpen Link will bring you to the below page:",
97-
result.url, "Open Link", os -> os.openURI(result.url));
91+
IModInfo info = list.getModContainerById(Circuitry.MODID).get().getModInfo();
92+
if (!info.getVersion().getQualifier().equals("NONE")) {
93+
CheckResult result = VersionChecker.getResult(info);
94+
if (result.status == Status.OUTDATED)
95+
alert(info.getDisplayName() + " is out of date.",
96+
"You must update to version " + result.target
97+
+ " before proceeding.\nOpen Link will bring you to the below page:",
98+
result.url, "Open Link", os -> os.openURI(result.url));
99+
}
100+
}
98101
}
99-
}
100102
}

‎src/main/java/cmsc389e/circuitry/common/Config.java

+33-33
Original file line numberDiff line numberDiff line change
@@ -14,42 +14,42 @@
1414
import net.minecraftforge.fml.config.ModConfig.Type;
1515

1616
public class Config {
17-
public static ConfigValue<String> cvsAccount, oneTimePassword;
18-
public static ConfigValue<Integer> projectNumber;
17+
public static ConfigValue<String> cvsAccount, oneTimePassword;
18+
public static ConfigValue<Integer> projectNumber;
1919

20-
public static boolean loaded;
21-
public static String[] inTags, outTags;
22-
public static Boolean[][] inTests, outTests;
20+
public static boolean loaded;
21+
public static String[] inTags, outTags;
22+
public static Boolean[][] inTests, outTests;
2323

24-
public static void load() throws IOException {
25-
loaded = false;
26-
try (InputStream in = new URL("https://cs.umd.edu/~abrassel/proj" + projectNumber.get() + "tests.txt")
27-
.openStream()) {
28-
List<String> lines = IOUtils.readLines(in, (Charset) null);
29-
String[] tags = lines.get(1).split("\t(?=o)", 2);
30-
inTags = tags[0].split("\t");
31-
outTags = tags[1].split("\t");
32-
inTests = new Boolean[lines.size() - 2][inTags.length];
33-
outTests = new Boolean[inTests.length][outTags.length];
34-
for (int i = 0; i < inTests.length; i++) {
35-
tags = lines.get(i + 2).split("\t");
36-
for (int j = 0; j < tags.length; j++) {
37-
Boolean value = tags[j].equals("1");
38-
if (j < inTags.length)
39-
inTests[i][j] = value;
40-
else
41-
outTests[i][j - inTags.length] = value;
24+
public static void load() throws IOException {
25+
loaded = false;
26+
try (InputStream in = new URL("https://cs.umd.edu/~abrassel/proj" + projectNumber.get() + "tests.txt")
27+
.openStream()) {
28+
List<String> lines = IOUtils.readLines(in, (Charset) null);
29+
String[] tags = lines.get(1).split("\t(?=o)", 2);
30+
inTags = tags[0].split("\t");
31+
outTags = tags[1].split("\t");
32+
inTests = new Boolean[lines.size() - 2][inTags.length];
33+
outTests = new Boolean[inTests.length][outTags.length];
34+
for (int i = 0; i < inTests.length; i++) {
35+
tags = lines.get(i + 2).split("\t");
36+
for (int j = 0; j < tags.length; j++) {
37+
Boolean value = tags[j].equals("1");
38+
if (j < inTags.length)
39+
inTests[i][j] = value;
40+
else
41+
outTests[i][j - inTags.length] = value;
42+
}
43+
}
4244
}
43-
}
45+
loaded = true;
4446
}
45-
loaded = true;
46-
}
4747

48-
public static void register() {
49-
Builder builder = new Builder();
50-
cvsAccount = builder.define("CVS Account", "");
51-
oneTimePassword = builder.define("One-Time Password", "");
52-
projectNumber = builder.defineInRange("Project Number", 0, 0, 9);
53-
ModLoadingContext.get().registerConfig(Type.SERVER, builder.build());
54-
}
48+
public static void register() {
49+
Builder builder = new Builder();
50+
cvsAccount = builder.define("CVS Account", "");
51+
oneTimePassword = builder.define("One-Time Password", "");
52+
projectNumber = builder.defineInRange("Project Number", 0, 0, Integer.MAX_VALUE);
53+
ModLoadingContext.get().registerConfig(Type.SERVER, builder.build());
54+
}
5555
}

0 commit comments

Comments
 (0)